Merge branch 'V9_6_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75146d6361de11404a5f220459b1333e1a0543a7..9d401f948cd3db80f383795d99a865c6022d7137 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ PROJECT(SalomeGUI C CXX)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 6)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})

diff --git a/src/SalomeApp/pluginsdemo/salome_plugins.py b/src/SalomeApp/pluginsdemo/salome_plugins.py
index c9f0eb7fdb0c9ceabc45633663ec92d516b48fbd..4dba5bcd9a8ad36bf97e4dc8171655913b70ef61 100644 (file)
--- a/src/SalomeApp/pluginsdemo/salome_plugins.py
+++ b/src/SalomeApp/pluginsdemo/salome_plugins.py
@@ -261,23 +261,34 @@ if DEMO_IS_ACTIVATED:
 def runSalomeShellSession(context):
     import os,subprocess
     import salome_version
+    import platform
+    from PyQt5.Qt import QMessageBox
+    from SalomePyQt import SalomePyQt
+
     version = salome_version.getVersion(full=True)
-    kernel_appli_dir = os.environ['KERNEL_ROOT_DIR']
-    command = ""
-    if os.path.exists("/usr/bin/gnome-terminal"):
-      command = 'gnome-terminal -t "SALOME %s - Shell session" -e "%s/salome shell" &'%(version,kernel_appli_dir)
-    elif os.path.exists("/usr/bin/konsole"):
-      command = 'PATH="/usr/bin:/sbin:/bin" LD_LIBRARY_PATH="" konsole -e "%s/salome shell" &'%(kernel_appli_dir)
-    elif os.path.exists("/usr/bin/xterm"):
-      command = 'xterm -T "SALOME %s - Shell session" -e "%s/salome shell" &'%(version,kernel_appli_dir)
-    else:
-      print("Neither xterm nor gnome-terminal nor konsole is installed.")
-
-    if command is not "":
+    runner = 'run_salome.exe' if platform.system() == 'Windows' else 'salome'
+
+    command = ''
+    for env_var in ('PRODUCT_ROOT_DIR', 'SALOME_ROOT_DIR', 'KERNEL_ROOT_DIR'):
+      script_dir = os.getenv(env_var)
+      if script_dir and os.path.isfile(os.path.join(script_dir, runner)):
+        command = os.path.join(script_dir, runner)
+        break
+
+    if command:
+      if platform.system() == 'Windows':
+        command = 'call "%s" shell' % command
+      else:
+        if os.path.exists("/usr/bin/xterm"):
+          command = 'xterm -T "SALOME %s - Shell session" -e "%s" shell &' % (version, command)
+        else:
+          QMessageBox.critical(SalomePyQt.getDesktop(), "Error", "xterm does not seem to be installed")
+          return
+
       try:
         subprocess.check_call(command, shell = True)
       except Exception as e:
-        print("Error: ",e)
+        print("Error: ", e)
 
 salome_pluginsmanager.AddFunction('SALOME shell session',
                                   'Execute a SALOME shell session in an external xterm',