From 77c0da0e72e4af226122e506c00dfca9971a34d3 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 13 Apr 2009 13:33:24 +0000 Subject: [PATCH] 0020303: Install some .py in the correct way - integrate patch from E.Adam. --- bin/Makefile.am | 21 ++++++++++++--------- src/Batch_SWIG/Makefile.am | 2 +- src/Container/Makefile.am | 2 +- src/LifeCycleCORBA_SWIG/Makefile.am | 2 +- src/LifeCycleCORBA_SWIG/Test/Makefile.am | 2 +- src/Logger/Makefile.am | 2 +- src/Logger/Test/Makefile.am | 2 +- src/ModuleCatalog/Makefile.am | 2 +- src/ModuleGenerator/Makefile.am | 2 +- src/NamingService/Makefile.am | 2 +- src/NamingService/Test/Makefile.am | 2 +- src/SALOMEDS/Makefile.am | 2 +- src/SALOMEDS/Test/Makefile.am | 2 +- src/SALOMEDSImpl/Test/Makefile.am | 2 +- src/SALOMELocalTrace/Test/Makefile.am | 2 +- src/SALOMETraceCollector/Test/Makefile.am | 2 +- src/TestContainer/Makefile.am | 2 +- src/UnitTests/Makefile.am | 2 +- src/Utils/Makefile.am | 2 +- src/Utils/Test/Makefile.am | 2 +- 20 files changed, 31 insertions(+), 28 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index a62a38534..d27e5379b 100644 --- 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 3f4539a2b..5cb81ec2c 100644 --- 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 5f8172cff..cf28c9b0f 100644 --- 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 b0cd8a499..0b5126cbe 100644 --- 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 d9614245e..4618b5a2a 100644 --- 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 db56c6be8..e763aa4f6 100644 --- 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 074eb6039..d24a8db43 100644 --- 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 7cdd4073a..99160e72e 100644 --- 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 453e87b5a..d54d421a6 100644 --- 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 8b6514755..474f5f02e 100644 --- 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 ba1403d9b..166fd3388 100644 --- 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 c56b74553..73c36db8d 100644 --- 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 c052e3b70..f1c357707 100644 --- 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 3b02fb3c4..3ac0c73a5 100644 --- 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 e97bbb260..e5a8fd956 100644 --- 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 9ef92294d..fbe2bd53d 100644 --- 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 144cbe389..f69747c1c 100644 --- 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 3e64bf565..5a9efeced 100644 --- 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 7ef2a59e2..7b73b1066 100644 --- 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 befa572ae..fe50c0501 100644 --- 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 # -- 2.39.2