0020303: Install some .py in the correct way - integrate patch from E.Adam.

diff --git a/bin/Makefile.am b/bin/Makefile.am
index a62a38534e961474c521903137cecd93fc26d36e..d27e5379bf28d64f0460a57e2c2894a637302e77 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -42,11 +42,20 @@ nodist_salomescript_DATA =  \
 
 # These files are executable scripts
 dist_salomescript_SCRIPTS =            \
-       addToKillList.py                \
        appli_clean.sh                  \
-       appli_gen.py                    \
        appli_install.sh                \
        createAppli.sh                  \
+       runIDLparser                    \
+       runNS.sh                        \
+       runSalome                       \
+       runSalome.csh                   \
+       runSalome.ksh                   \
+       waitNS.sh
+
+# These files are python files
+dist_salomescript_PYTHON =             \
+       addToKillList.py                \
+       appli_gen.py                    \
        envSalome.py                    \
        killSalome.py                   \
        killSalomeWithPort.py           \
@@ -55,12 +64,7 @@ dist_salomescript_SCRIPTS =          \
        nameserver.py                   \
        NSparam.py                      \
        orbmodule.py                    \
-       runIDLparser                    \
        runNS.py                        \
-       runNS.sh                        \
-       runSalome                       \
-       runSalome.csh                   \
-       runSalome.ksh                   \
        runSalome.py                    \
        salomeConsole.py                \
        salome_session.py               \
@@ -71,8 +75,7 @@ dist_salomescript_SCRIPTS =           \
        shutdownSalome.py               \
        virtual_salome.py               \
        waitContainers.py               \
-       waitNS.py                       \
-       waitNS.sh
+       waitNS.py
 
 EXTRA_DIST = appliskel
 

diff --git a/src/Batch_SWIG/Makefile.am b/src/Batch_SWIG/Makefile.am
index 3f4539a2b5d2bff1da3cb03dd815c7900b36ab26..5cb81ec2c8cb1c5ad36d99c089f6dbbc773ee158 100644 (file)
--- a/src/Batch_SWIG/Makefile.am
+++ b/src/Batch_SWIG/Makefile.am
@@ -80,7 +80,7 @@ EXTRA_DIST = $(SWIGSOURCES)
 #
 
 # Scripts to be installed.
-dist_salomescript_SCRIPTS = Batch_test.py
+dist_salomescript_PYTHON = Batch_test.py
 
 # You don't need to specify libBatch_Swig.py. It is automatically
 # installed by means of the swig target salomepython_PYTHON.

diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am
index 5f8172cff83bad609ce0e7e3ee4a0158f7669f2e..cf28c9b0fd729f6d86df8662831f32fb353f0a66 100644 (file)
--- a/src/Container/Makefile.am
+++ b/src/Container/Makefile.am
@@ -44,7 +44,7 @@ salomeinclude_HEADERS = \
        Salome_file_i.hxx
 
 # Scripts to be installed
-dist_salomescript_DATA =\
+dist_salomescript_PYTHON =\
        SALOME_ComponentPy.py \
        SALOME_Container.py
 

diff --git a/src/LifeCycleCORBA_SWIG/Makefile.am b/src/LifeCycleCORBA_SWIG/Makefile.am
index b0cd8a4995651a53290e6621cf09bd47a460258e..0b5126cbe2019a2d252c768bab992dffa7f9d6f4 100644 (file)
--- a/src/LifeCycleCORBA_SWIG/Makefile.am
+++ b/src/LifeCycleCORBA_SWIG/Makefile.am
@@ -88,7 +88,7 @@ EXTRA_DIST = $(SWIGSOURCES)
 #
 
 # Scripts to be installed.
-dist_salomescript_DATA =\
+dist_salomescript_PYTHON =\
        LifeCycleCORBA.py \
        TestLifeCycleCORBA.py
 

diff --git a/src/LifeCycleCORBA_SWIG/Test/Makefile.am b/src/LifeCycleCORBA_SWIG/Test/Makefile.am
index d9614245ef0d00e5c32d63e3737d313eff745c72..4618b5a2aa39e0cc666b88fb45b83dad74e44fa7 100644 (file)
--- a/src/LifeCycleCORBA_SWIG/Test/Makefile.am
+++ b/src/LifeCycleCORBA_SWIG/Test/Makefile.am
@@ -36,7 +36,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 salomeinclude_HEADERS=
 
 # Scripts to be installed
-dist_salomescript_SCRIPTS = \
+dist_salomescript_PYTHON = \
        LifeCycleCORBA_SWIGTest.py \
        TestLifeCycleCORBA_SWIG.py
 

diff --git a/src/Logger/Makefile.am b/src/Logger/Makefile.am
index db56c6be81faefcbac5fdc46d03f883995166d71..e763aa4f69353ceb22555b0f3c02da9cfb8c0985 100644 (file)
--- a/src/Logger/Makefile.am
+++ b/src/Logger/Makefile.am
@@ -68,4 +68,4 @@ libSalomeLoggerServer_la_LIBADD  = \
        @CORBA_LIBS@
 
 # Scripts target
-dist_salomescript_DATA = SALOME_Trace.py
+dist_salomescript_PYTHON = SALOME_Trace.py

diff --git a/src/Logger/Test/Makefile.am b/src/Logger/Test/Makefile.am
index 074eb6039ac285ae66ff1a7b0aacf976bcd462cf..d24a8db43d2379656c57de652a15eb2580a3cc05 100644 (file)
--- a/src/Logger/Test/Makefile.am
+++ b/src/Logger/Test/Makefile.am
@@ -34,4 +34,4 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 #
 
 # Executable scripts to be installed
-dist_salomescript_SCRIPTS = TestKiller.py 
+dist_salomescript_PYTHON = TestKiller.py 

diff --git a/src/ModuleCatalog/Makefile.am b/src/ModuleCatalog/Makefile.am
index 7cdd4073a25a6b77a0d19f23c4ab1d707b0e04b3..99160e72e961bdd7e147cb5d9861c8fd1dbe4d1c 100644 (file)
--- a/src/ModuleCatalog/Makefile.am
+++ b/src/ModuleCatalog/Makefile.am
@@ -43,7 +43,7 @@ salomeinclude_HEADERS = \
                SALOME_ModuleCatalog.hxx
 
 # Scripts to be installed
-dist_salomescript_DATA = TestModuleCatalog.py
+dist_salomescript_PYTHON = TestModuleCatalog.py
 
 
 #

diff --git a/src/ModuleGenerator/Makefile.am b/src/ModuleGenerator/Makefile.am
index 453e87b5a3729e45b5d500300f57ee28c29b7e4f..d54d421a6c1bf3441bf6625fc4d22c32a2d31a77 100644 (file)
--- a/src/ModuleGenerator/Makefile.am
+++ b/src/ModuleGenerator/Makefile.am
@@ -26,6 +26,6 @@
 #
 include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
-dist_salomescript_DATA = IDLparser.py
+dist_salomescript_PYTHON = IDLparser.py
 
 EXTRA_DIST = tests

diff --git a/src/NamingService/Makefile.am b/src/NamingService/Makefile.am
index 8b65147555dfafa0edd477289f031b4dcf6509b2..474f5f02e5ce51e3230b1c6193728f513d217b12 100644 (file)
--- a/src/NamingService/Makefile.am
+++ b/src/NamingService/Makefile.am
@@ -35,7 +35,7 @@ salomeinclude_HEADERS =\
        SALOME_NamingService_defs.hxx
 
 # Scripts to be exported
-dist_salomescript_DATA =\
+dist_salomescript_PYTHON =\
        SALOME_NamingServicePy.py
 
 

diff --git a/src/NamingService/Test/Makefile.am b/src/NamingService/Test/Makefile.am
index ba1403d9b8e265beecf29fb750833779a4be09ee..166fd338840551bb04a26d104e12623ed3e45501 100644 (file)
--- a/src/NamingService/Test/Makefile.am
+++ b/src/NamingService/Test/Makefile.am
@@ -36,7 +36,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 salomeinclude_HEADERS= NamingServiceTest.hxx
 
 # Scripts to be installed
-dist_salomescript_SCRIPTS = TestNamingService.py
+dist_salomescript_PYTHON = TestNamingService.py
 
 
 #

diff --git a/src/SALOMEDS/Makefile.am b/src/SALOMEDS/Makefile.am
index c56b7455311024e34f44a5c160914a62b9caf2b4..73c36db8d9d3813bcb6824430c2714c0ec2181b3 100644 (file)
--- a/src/SALOMEDS/Makefile.am
+++ b/src/SALOMEDS/Makefile.am
@@ -47,7 +47,7 @@ salomeinclude_HEADERS= \
        SALOMEDS_Defines.hxx
 
 # Scripts to be installed
-dist_salomescript_DATA = SALOME_DriverPy.py
+dist_salomescript_PYTHON = SALOME_DriverPy.py
 
 #
 # ===============================================================

diff --git a/src/SALOMEDS/Test/Makefile.am b/src/SALOMEDS/Test/Makefile.am
index c052e3b705c7703eca0b4c3ce902716f558fdf3b..f1c35770767b7a3573920fc464bf52109f0db1d5 100644 (file)
--- a/src/SALOMEDS/Test/Makefile.am
+++ b/src/SALOMEDS/Test/Makefile.am
@@ -35,7 +35,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 salomeinclude_HEADERS= SALOMEDSTest.hxx
 
 # Scripts to be installed
-dist_salomescript_SCRIPTS = TestSALOMEDS.py
+dist_salomescript_PYTHON = TestSALOMEDS.py
 
 #
 # ===============================================================

diff --git a/src/SALOMEDSImpl/Test/Makefile.am b/src/SALOMEDSImpl/Test/Makefile.am
index 3b02fb3c491871a2224fd1ff971cc666081751b6..3ac0c73a5bb96c7c3f50eb4778400df828aadc87 100644 (file)
--- a/src/SALOMEDSImpl/Test/Makefile.am
+++ b/src/SALOMEDSImpl/Test/Makefile.am
@@ -35,7 +35,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 salomeinclude_HEADERS= SALOMEDSImplTest.hxx
 
 # Scripts to be installed
-dist_salomescript_SCRIPTS = TestSALOMEDSImpl.py
+dist_salomescript_PYTHON = TestSALOMEDSImpl.py
 
 #
 # ===============================================================

diff --git a/src/SALOMELocalTrace/Test/Makefile.am b/src/SALOMELocalTrace/Test/Makefile.am
index e97bbb260b58d1ccccfac210d1cc6695eb6b259f..e5a8fd956cc2f207ebcbabedfc621df9e81e1ca0 100644 (file)
--- a/src/SALOMELocalTrace/Test/Makefile.am
+++ b/src/SALOMELocalTrace/Test/Makefile.am
@@ -39,7 +39,7 @@ SRCROOT=$(srcdir)/../..
 salomeinclude_HEADERS = SALOMELocalTraceTest.hxx
 
 # Executable scripts to be installed
-dist_salomescript_SCRIPTS = TestSALOMELocalTrace.py
+dist_salomescript_PYTHON = TestSALOMELocalTrace.py
 
 #
 # ===============================================================

diff --git a/src/SALOMETraceCollector/Test/Makefile.am b/src/SALOMETraceCollector/Test/Makefile.am
index 9ef92294df21e8022b16706e30e781b37cbd7374..fbe2bd53d6ff84ed9c2fc78360e52f7baeab108a 100644 (file)
--- a/src/SALOMETraceCollector/Test/Makefile.am
+++ b/src/SALOMETraceCollector/Test/Makefile.am
@@ -38,7 +38,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 salomeinclude_HEADERS= SALOMETraceCollectorTest.hxx
 
 # Scripts to be installed
-dist_salomescript_SCRIPTS = TestSALOMETraceCollector.py
+dist_salomescript_PYTHON = TestSALOMETraceCollector.py
 
 
 #

diff --git a/src/TestContainer/Makefile.am b/src/TestContainer/Makefile.am
index 144cbe3898526cb5ff5f342f8b177986b79cabe9..f69747c1c2555e67f1acad8122dc1ad8cb1d6516 100644 (file)
--- a/src/TestContainer/Makefile.am
+++ b/src/TestContainer/Makefile.am
@@ -34,7 +34,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 #
 # header files  
 # Scripts to be installed
-dist_salomescript_DATA = \
+dist_salomescript_PYTHON = \
        SALOME_TestComponentPy.py \
        TestComponentPy.py \
        TestLogger.py

diff --git a/src/UnitTests/Makefile.am b/src/UnitTests/Makefile.am
index 3e64bf5650716696b835650114d1370261317670..5a9efeced85df4cd392ec24ddebee9e87f9a3cb8 100644 (file)
--- a/src/UnitTests/Makefile.am
+++ b/src/UnitTests/Makefile.am
@@ -33,7 +33,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 #
 
 # Executable scripts to be installed
-dist_salomescript_SCRIPTS = UnitTests.py
+dist_salomescript_PYTHON = UnitTests.py
 
 #
 # ===============================================================

diff --git a/src/Utils/Makefile.am b/src/Utils/Makefile.am
index 7ef2a59e2a709c66cfc0b14af9e1e32afc05d215..7b73b10667479dde058f6b4baf4b1ac5e824df08 100644 (file)
--- a/src/Utils/Makefile.am
+++ b/src/Utils/Makefile.am
@@ -43,7 +43,7 @@ salomeinclude_HEADERS =\
        SALOME_Utils.hxx
 
 # Scripts to be exported
-dist_salomescript_DATA =\
+dist_salomescript_PYTHON =\
        Utils_Identity.py \
        SALOME_utilities.py
 

diff --git a/src/Utils/Test/Makefile.am b/src/Utils/Test/Makefile.am
index befa572ae8abf92efdd97cf4d541f590bca2da88..fe50c050135a714ee61debd8ec87611532970a78 100644 (file)
--- a/src/Utils/Test/Makefile.am
+++ b/src/Utils/Test/Makefile.am
@@ -37,7 +37,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 salomeinclude_HEADERS= UtilsTest.hxx
 
 # Scripts to be installed
-dist_salomescript_SCRIPTS = TestUtils.py
+dist_salomescript_PYTHON = TestUtils.py
 
 
 #