remove SalomeOnDemandTK

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index d1abff4092a357ea366639e13fabc4e3300080ac..924ee727f2a8f54cf68eb64e09a5266d0e64d229 100644 (file)
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -18,7 +18,6 @@
 #
 
 ADD_SUBDIRECTORY(appliskel)
-ADD_SUBDIRECTORY(SalomeOnDemandTK)
 
 SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS})
 SALOME_CONFIGURE_FILE(salomeContextUtils.py.in salomeContextUtils.py)

diff --git a/bin/runSalome.py b/bin/runSalome.py
index 8824d5381c89262517280b663e496e4efc64d441..e5b6e29b9efcfeb511d2ec8dd1645a051fae1d6d 100755 (executable)
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -32,7 +32,6 @@ from salomeContextUtils import ScriptAndArgsObjectEncoder
 import runSalomeNoServer
 import runSalomeCommon
 import platform
-import runSalomeOnDemand
 from launchConfigureParser import verbosity_nam, on_demand_nam
 import logging
 logger = logging.getLogger()
@@ -183,6 +182,7 @@ def main(exeName=None):
 
     # Setup extension's env in salome on demand case
     if args[on_demand_nam]:
+        import runSalomeOnDemand
         runSalomeOnDemand.set_ext_env()
         # Reset up module_list and modules_root_dir, if we dont want to define SalomeAppConfig on salome.py.
         # We must remove the "else" on "if os.sys.platform == 'win32':" in launcheConfigureParser.py too.