From b593b8351666a4631be71c34d56e43fd91800497 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 3 Dec 2014 14:56:45 +0300 Subject: [PATCH] Issue 0022816: duplicated files Rename scripts, to avoid duplicated file names --- bin/CMakeLists.txt | 4 ++-- bin/{runAppli.in => runHELLO.in} | 2 +- bin/{myrunSalome.py => runHELLO.py} | 0 doc/input/index.doc | 24 ++++++++++++------------ 4 files changed, 15 insertions(+), 15 deletions(-) rename bin/{runAppli.in => runHELLO.in} (97%) rename bin/{myrunSalome.py => runHELLO.py} (100%) diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index 9a120f6..49b0b00 100755 --- a/bin/CMakeLists.txt +++ b/bin/CMakeLists.txt @@ -18,14 +18,14 @@ # SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) -SALOME_CONFIGURE_FILE(runAppli.in runAppli INSTALL ${SALOME_INSTALL_BINS}) +SALOME_CONFIGURE_FILE(runHELLO.in runHELLO INSTALL ${SALOME_INSTALL_BINS}) # =============================================================== # Files to be installed # =============================================================== SET(_bin_scripts - myrunSalome.py + runHELLO.py ) SALOME_INSTALL_SCRIPTS("${_bin_scripts}" ${SALOME_INSTALL_SCRIPT_SCRIPTS}) diff --git a/bin/runAppli.in b/bin/runHELLO.in similarity index 97% rename from bin/runAppli.in rename to bin/runHELLO.in index 86a7a08..24ccd8b 100755 --- a/bin/runAppli.in +++ b/bin/runHELLO.in @@ -62,4 +62,4 @@ searchFreePort() { searchFreePort -${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i $HELLO_ROOT_DIR/bin/salome/myrunSalome.py --modules=HELLO --killall +${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i $HELLO_ROOT_DIR/bin/salome/runHELLO.py --modules=HELLO --killall diff --git a/bin/myrunSalome.py b/bin/runHELLO.py similarity index 100% rename from bin/myrunSalome.py rename to bin/runHELLO.py diff --git a/doc/input/index.doc b/doc/input/index.doc index 23b2fdb..3811601 100644 --- a/doc/input/index.doc +++ b/doc/input/index.doc @@ -71,8 +71,8 @@ The following file structure is typical for the SALOME module: + bin + CMakeLists.txt + VERSION.in - + runAppli.in - + myrunSalome.py + + runHELLO.in + + runHELLO.py + idl + CMakeLists.txt + HELLO_Gen.idl @@ -190,8 +190,8 @@ least) and (optionally) compatibilities or incompatibilities with other modules. This file is strongly recommended but is not essential for operation of the module. -- \c bin/runAppli.in -- \c bin/myrunSalome.py +- \c bin/runHELLO.in +- \c bin/runHELLO.py These files are not essential but make the example easier to use. These are scripts that can be used to run SALOME session with @@ -864,11 +864,11 @@ version and (optionally) its compatibilities or incompatibilities with other modules. Therefore, it is strongly recommended but is not essential for correct operation of the module. -The \c runAppli.in file is the equivalent of the \c runSalome script +The \c runHELLO.in file is the equivalent of the \c runSalome script distributed by the KERNEL module but configured to start SALOME session with HELLO module only. -The \c myrunSalome.py file reuses part of functionality provided by the +The \c runHELLO.py file reuses part of functionality provided by the KERNEL's \c runSalome.py script. It is used to run SALOME session and start HELLO module in this session. @@ -943,7 +943,7 @@ and installed to the \c \ directory. Go to the the \c \ directory and type:
-[bash% ] ./bin/salome/runAppli
+[bash% ] ./bin/salome/runHELLO
 
This command runs SALOME session configured for KERNEL and the HELLO @@ -951,14 +951,14 @@ module. At the end of running, the user will be prompted by the Python interpreter command line configured for SALOME that provides access to SALOME Python API (including CORBA interfaces). -The \c runAppli file is a shell script that executes a Python commands +The \c runHELLO file is a shell script that executes a Python commands running SALOME session by passing arguments to it in a command line:
-${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i $HELLO_ROOT_DIR/bin/salome/myrunSalome.py --modules=HELLO --killall
+${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i $HELLO_ROOT_DIR/bin/salome/runHELLO.py --modules=HELLO --killall
 
-These arguments state that the \c myrunSalome.py script located in the +These arguments state that the \c runHELLO.py script located in the HELLO module will be used, that the HELLO component will be activated and all previously running SALOME sessions should be shutdowned. @@ -983,7 +983,7 @@ immediately afterwards will be successful. The \a HELLO_ORB module has to be imported before making a request to load the component into the container, to obtain access to methods of -the component. This container is made accessible in the \c myrunSalome.py +the component. This container is made accessible in the \c runHELLO.py by means of the \a container variable:
@@ -1027,7 +1027,7 @@ automatically generate XML description file from the IDL file.
 The method of loading the component is not very different from that
 is described above. The services of the LifeCycle module are used in
 this case instead of calling the container directly. The call sequence
-is contained in the \c myrunSalome.py \a test() function.
+is contained in the \c runHELLO.py \a test() function.
 
 
     import salome
-- 
2.39.2