[PortManager] Separate ports according to their owner (this or other application)

[modules/yacs.git] / bin / launchConfigureParser.py

diff --git a/bin/launchConfigureParser.py b/bin/launchConfigureParser.py
index 2c91b69d159508678a9760cd196ad25085d38edf..57c492797c978a1bb50f293b790b5fdb32688f70 100755 (executable)
--- a/bin/launchConfigureParser.py
+++ b/bin/launchConfigureParser.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# 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
@@ -60,6 +60,7 @@ pinter_nam     = "pinter"
 batch_nam      = "batch"
 test_nam       = "test"
 play_nam       = "play"
+lang_nam       = "language"
 gdb_session_nam = "gdb_session"
 ddd_session_nam = "ddd_session"
 valgrind_session_nam = "valgrind_session"
@@ -330,7 +331,7 @@ class xml_parser:
         # either "launch" or module name -- set section_name
         if self.space == [doc_tag, sec_tag] and nam_att in attrs.getNames():
             section_name = attrs.getValue( nam_att )
-            if section_name == lanch_nam:
+            if section_name in [lanch_nam, lang_nam]:
                 self.section = section_name # launch section
             elif self.opts.has_key( modules_nam ) and \
                  section_name in self.opts[ modules_nam ]:
@@ -793,6 +794,14 @@ def CreateOptionParser (theAdditionalOptions=None, exeName=None):
                              dest="use_port",
                                    help=help_str)
 
+    help_str  = "Force application language. By default, a language specified in "
+    help_str += "the user's preferences is used."
+    o_lang = optparse.Option("-a",
+                             "--language",
+                             action="store",
+                             dest="language",
+                             help=help_str)
+
     # All options
     opt_list = [o_t,o_g, # GUI/Terminal
                 o_d,o_o, # Desktop
@@ -822,6 +831,7 @@ def CreateOptionParser (theAdditionalOptions=None, exeName=None):
                 o_wake_up,
                 o_slm,   # Server launch mode
                 o_port,  # Use port
+                o_lang,  # Language
                 ]
 
     #std_options = ["gui", "desktop", "log_file", "resources",
@@ -1197,6 +1207,13 @@ def get_env(theAdditionalOptions=None, appname=salomeappname, cfgname=salomecfgn
             sys.exit(1)
         args[useport_nam] = cmd_opts.use_port
 
+    if cmd_opts.language is not None:
+        langs = args["language_languages"] if "language_languages" in args else []
+        if cmd_opts.language not in langs:
+            print "Error: unsupported language: %s" % cmd_opts.language
+            sys.exit(1)
+        args[lang_nam] = cmd_opts.language
+
     # return arguments
     os.environ[config_var] = os.pathsep.join(dirs)
     #print "Args: ", args