From 545af877c55c6333377bd3f35506f08dfd736e42 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 3 Dec 2014 15:00:43 +0300 Subject: [PATCH] Issue 0022816: duplicated files Rename scripts, to avoid duplicated file names --- bin/CMakeLists.txt | 4 ++-- bin/{runAppli.in => runPYHELLO.in} | 2 +- bin/{myrunSalome.py => runPYHELLO.py} | 0 doc/input/index.doc | 24 ++++++++++++------------ 4 files changed, 15 insertions(+), 15 deletions(-) rename bin/{runAppli.in => runPYHELLO.in} (97%) rename bin/{myrunSalome.py => runPYHELLO.py} (100%) diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index 9a120f6..127095d 100644 --- 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(runPYHELLO.in runPYHELLO INSTALL ${SALOME_INSTALL_BINS}) # =============================================================== # Files to be installed # =============================================================== SET(_bin_scripts - myrunSalome.py + runPYHELLO.py ) SALOME_INSTALL_SCRIPTS("${_bin_scripts}" ${SALOME_INSTALL_SCRIPT_SCRIPTS}) diff --git a/bin/runAppli.in b/bin/runPYHELLO.in similarity index 97% rename from bin/runAppli.in rename to bin/runPYHELLO.in index 1560f62..069674e 100755 --- a/bin/runAppli.in +++ b/bin/runPYHELLO.in @@ -62,6 +62,6 @@ searchFreePort() { searchFreePort -${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i $PYHELLO_ROOT_DIR/bin/salome/myrunSalome.py --modules=PYHELLO --killall +${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i $PYHELLO_ROOT_DIR/bin/salome/runPYHELLO.py --modules=PYHELLO --killall diff --git a/bin/myrunSalome.py b/bin/runPYHELLO.py similarity index 100% rename from bin/myrunSalome.py rename to bin/runPYHELLO.py diff --git a/doc/input/index.doc b/doc/input/index.doc index 7302ad4..3cfdc02 100644 --- a/doc/input/index.doc +++ b/doc/input/index.doc @@ -63,8 +63,8 @@ The following file structure is typical for the SALOME module: + bin + CMakeLists.txt + VERSION.in - + runAppli.in - + myrunSalome.py + + runPYHELLO.in + + runPYHELLO.py + idl + CMakeLists.txt + PYHELLO_Gen.idl @@ -162,8 +162,8 @@ least) and (optionally) compatibilities or incompatibilities with other modules. This file is strongly recommended but is not essential for operation of the module. -- bin/runAppli.in -- bin/myrunSalome.py +- bin/runPYHELLO.in +- bin/runPYHELLO.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 @@ -529,11 +529,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 runAppli.in file is the equivalent of the runSalome script +The runPYHELLO.in file is the equivalent of the runSalome script distributed by the KERNEL module but configured to start SALOME session with PYHELLO module only. -The myrunSalome.py file reuses part of functionality provided by the +The runPYHELLO.py file reuses part of functionality provided by the KERNEL's runSalome.py script. It is used to run SALOME session and start PYHELLO module in this session. @@ -609,7 +609,7 @@ and installed to the \c \ directory. Go to the the directory and type:
-[bash% ] ./bin/salome/runAppli
+[bash% ] ./bin/salome/runPYHELLO
 
This command runs SALOME session configured for KERNEL and the PYHELLO @@ -617,14 +617,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 runAppli file is a shell script that executes a Python commands +The runPYHELLO 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 $PYHELLO_ROOT_DIR/bin/salome/myrunSalome.py --modules=PYHELLO --killall
+${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i $PYHELLO_ROOT_DIR/bin/salome/runPYHELLO.py --modules=PYHELLO --killall
 
-These arguments state that the myrunSalome.py script located in the +These arguments state that the runPYHELLO.py script located in the PYHELLO module will be used, that the PYHELLO component will be activated and all previously running SALOME sessions should be shutdowned. @@ -649,7 +649,7 @@ immediately afterwards will be successful. The PYHELLO_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 myrunSalome.py +the component. This container is made accessible in the runPYHELLO.py by means of the \b container variable:
@@ -691,7 +691,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 myrunSalome.py \b test() function.
+is contained in the runPYHELLO.py \b test() function.
 
 
     c=test(clt)
-- 
2.39.2