CA: Bug correction PAL2416

[modules/kernel.git] / bin / launchSalome.py

diff --git a/bin/launchSalome.py b/bin/launchSalome.py
index 387582eacc1ef74a2a4bcbbbac566710b17a9a3b..0998452da3e80ea305d9898bf59795df911c0013 100755 (executable)
--- a/bin/launchSalome.py
+++ b/bin/launchSalome.py
@@ -1,25 +1,25 @@
 #! /usr/bin/env python
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  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.
 #
-#  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
 #
 
 import socket
@@ -47,10 +47,10 @@ def findFreePort(startPort, step) :
         except Exception, inst:
             print str(currentPort) + ": " + str(inst.args);
             currentPort = currentPort+step;
-    
-    
-    
-    
+
+
+
+
     if (portFound != 1) :
         currentPort = -1;
     return currentPort;
@@ -68,9 +68,6 @@ hostName = socket.gethostname();
 if (len(sys.argv) > 1) and sys.argv[1] == "-nothing" :
     print "port:" + str(freePort);
     sys.exit(0)
-    
-
-        
 
 if freePort < 0 :
     print
@@ -78,15 +75,10 @@ if freePort < 0 :
     print "Try to kill the running servers and then launch SALOME again."
     print
     sys.exit(0)
-    
-else :
-    omniCfgFileContent = "InitRef = NameService=corbaname::" + str(hostName) + ":" + str(freePort);
-    omniCfgFilePath = os.environ.get('HOME') + "/" + ".omniORB_" + str(hostName) + "_" + str(freePort) + ".cfg";
 
-    omni_file = file(omniCfgFilePath,'w+');
-    omni_file.write(omniCfgFileContent);
-    omni_file.write("\n");
-    omni_file.close();
+else :
+    from ORBConfigFile import writeORBConfigFile
+    writeORBConfigFile(os.environ.get('HOME'), hostName, freePort)
 
     if (len(sys.argv) > 1) and sys.argv[1] == "--save-config" :
         omniCfgCurrent = os.environ.get('HOME') + "/.omniORB_current.cfg";
@@ -96,11 +88,9 @@ else :
         else :
             #copy the file
             shutil.copy(omniCfgFilePath, omniCfgCurrent);
-            
+
         omniCfgFilePath = omniCfgCurrent;
-            
-    
-    
+
 
     ## 2. Set the OMNIORB_CONFIG environment variable
     os.environ['OMNIORB_CONFIG']=omniCfgFilePath;
@@ -111,4 +101,3 @@ else :
 
     if os.path.isfile(runSalomePyFilePath) :
         execfile(runSalomePyFilePath);
-