X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2FenvSalome.py;h=adfddac2ecbdbc9595ddfc01cfe29416acf4f938;hb=2dd308e0979e7af5e505bb076772161eae76b9a4;hp=348c0a4606a9d3e3c59610f949ee2928f0721ca7;hpb=7d2fe213bdf5bf962ce11e253020c9d3e0bc1cce;p=modules%2Fkernel.git

diff --git a/bin/envSalome.py b/bin/envSalome.py
index 348c0a460..adfddac2e 100755
--- a/bin/envSalome.py
+++ b/bin/envSalome.py
@@ -1,45 +1,59 @@
-#!/usr/bin/env python
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#! /usr/bin/env python3
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 #
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 #
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
+
+###############################################
+############### IMPORTANT NOTE ################
+###############################################
+# The runConsole script is obsolete.          #
+# Please consider the new salome.py launcher. #
+###############################################
+
+
 import os
 import sys
 import setenv
 
 kernel_root=os.getenv("KERNEL_ROOT_DIR")
-sys.path[:0]=[kernel_root+"/bin/salome"]
-
-#import runSalome
+kernel_root = os.path.realpath(kernel_root)
+sys.path[:0]=[os.path.join(kernel_root,"bin","salome")]
 
 argv = sys.argv[1:]
 sys.argv = argv[1:]
 
-#sys.argv = [sys.argv[0]]
-#if len(argv) > 3:
-#    sys.argv += argv[3:]
-#if len(argv) > 2:
-#    sys.argv = argv[2:]
-    
-#args, modules_list, modules_root_dir = setenv.get_config()
-#runSalome.set_env(args, modules_list, modules_root_dir)
+if argv[0] == "-exec":
+  #keep options only for execution
+  del argv[0]
+  sys.argv = []
+
 setenv.main(True);
 
+if sys.platform == "win32":
+    if len(argv) >= 2:
+        # Fix a problem of spaces in argv[1]
+        argv[1] = '"%s"'%(argv[1])
+        pass
+    pass
+
 os.execvp(argv[0],argv)