# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013 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
# values passed as arguments, NOT read from XML config file, but set from within this script
appname_nam = "appname"
port_nam = "port"
+useport_nam = "useport"
salomecfgname = "salome"
salomeappname = "SalomeApp"
script_nam = "pyscript"
# possible choices for the "embedded" and "standalone" parameters
embedded_choices = [ "registry", "study", "moduleCatalog", "cppContainer", "SalomeAppEngine" ]
-standalone_choices = [ "registry", "study", "moduleCatalog", "cppContainer", "pyContainer"]
+standalone_choices = [ "registry", "study", "moduleCatalog", "cppContainer"]
# values of boolean type (must be '0' or '1').
# xml_parser.boolValue() is used for correct setting
if len(vers) > 0: major = int(vers[0])
if len(vers) > 1: minor = int(vers[1])
if len(vers) > 2:
- mr = re.search(r'^([0-9]+)([A-Za-z]?)([0-9]*)',vers[2])
+ mr = re.search(r'^([0-9]+)([A-Z]|RC)?([0-9]*)',vers[2], re.I)
if mr:
release = int(mr.group(1))
- if mr.group(2).strip(): dev1 = ord(mr.group(2).strip())
- if mr.group(3).strip(): dev2 = int(mr.group(3).strip())
+ if mr.group(2):
+ tag = mr.group(2).strip().lower()
+ if tag == "rc":
+ dev1 = 49 # release candidate
+ elif tag:
+ dev1 = ord(tag)-ord('a')+1
+ pass
+ if mr.group(3):
+ dev2 = int(mr.group(3).strip())
pass
pass
dev = dev1 * 100 + dev2
ver = ver * 100 + minor
ver = ver * 100 + release
ver = ver * 10000
- if dev > 0: ver = ver - 10000 + dev
+ if dev > 0: ver = ver - dev
return ver
###
# Get default user configuration file name
# For SALOME, it is:
-# - on Linux: ~/.config/salome/.SalomeApprc.[version]
-# - on Windows: ~/SalomeApp.xml.[version]
-# where [version] is a version number
+# - on Linux: ~/.config/salome/SalomeApprc[.<version>]
+# - on Windows: ~/SalomeApp.xml[.<version>]
+# where <version> is an optional version number
###
def defaultUserFile(appname=salomeappname, cfgname=salomecfgname):
v = version()
filename = os.path.join(getHomeDir(), "%s.xml%s" % (appname, v))
else:
if cfgname:
- filename = os.path.join(getHomeDir(), ".config", cfgname, ".%src%s" % (appname, v))
+ filename = os.path.join(getHomeDir(), ".config", cfgname, "%src%s" % (appname, v))
pass
else:
filename = os.path.join(getHomeDir(), ".%src%s" % (appname, v))
# get app version
v = version()
if not v: return None # unknown version
-
+
# get default user file name
filename = defaultUserFile(appname, cfgname)
if not filename: return None # default user file name is bad
-
+
# check that default user file exists
if os.path.exists(filename): return filename # user file is found
# ... calculate default version id
id0 = version_id(v)
if not id0: return None # bad version id -> can't detect appropriate file
-
+
# ... get all existing user preferences files
if sys.platform == "win32":
files = glob.glob(os.path.join(getHomeDir(), "%s.xml.*" % appname))
else:
files = []
- if cfgname: files += glob.glob(os.path.join(getHomeDir(), ".config", cfgname, ".%src.*" % appname))
- files += glob.glob(os.path.join(getHomeDir(), ".%src.*" % appname))
+ if cfgname:
+ # Since v6.6.0 - in ~/.config/salome directory, without dot prefix
+ files += glob.glob(os.path.join(getHomeDir(), ".config", cfgname, "%src.*" % appname))
+ # Since v6.5.0 - in ~/.config/salome directory, dot-prefixed (backward compatibility)
+ files += glob.glob(os.path.join(getHomeDir(), ".config", cfgname, ".%src.*" % appname))
+ pass
+ # old style (before v6.5.0) - in ~ directory, dot-prefixed
+ files += glob.glob(os.path.join(getHomeDir(), ".%src.*" % appname))
pass
# ... loop through all files and find most appopriate file (with closest id)
appr_id = -1
appr_file = ""
for f in files:
+ ff = os.path.basename( f )
if sys.platform == "win32":
- match = re.search( r'%s\.xml\.([a-zA-Z0-9.]+)$'%appname, f )
+ match = re.search( r'^%s\.xml\.([a-zA-Z0-9.]+)$'%appname, ff )
else:
- match = re.search( r'\.%src\.([a-zA-Z0-9.]+)$'%appname, f )
+ match = re.search( r'^\.?%src\.([a-zA-Z0-9.]+)$'%appname, ff )
if match:
ver = version_id(match.group(1))
if not ver: continue # bad version id -> skip file
appr_id = ver
appr_file = f
pass
+ elif abs(appr_id-id0) == abs(ver-id0):
+ if not os.path.basename(f).startswith("."): appr_file = f
+ pass
pass
pass
return appr_file
def startElement(self, name, attrs):
self.space.append(name)
self.current = None
-
+
# if we are importing file
if self.space == [doc_tag, import_tag] and nam_att in attrs.getNames():
self.importFile( attrs.getValue(nam_att) )
-
+
# if we are analyzing "section" element and its "name" attribute is
# either "launch" or module name -- set section_name
if self.space == [doc_tag, sec_tag] and nam_att in attrs.getNames():
def endDocument(self):
self.read = None
pass
-
+
def importFile(self, fname):
# get absolute name
if os.path.isabs (fname) :
absfname = fname
else:
absfname = os.path.join(os.path.dirname(self.fileName), fname)
-
+
# check existing and registry file
for ext in ["", ".xml", ".XML"] :
if os.path.exists(absfname + ext) :
else:
if verbose(): print "Configure parser: Error : file %s does not exist" % absfname
return
-
+
# importing file
try:
# copy current options
except:
if verbose(): print "Configure parser: Error : can not read configuration file %s" % absfname
pass
-
+
# -----------------------------------------------------------------------------
dest="server_launch_mode",
help=help_str)
+ # use port
+ help_str = "Preferable port SALOME to be started on. "
+ help_str += "If specified port is not busy, SALOME session will start on it; "
+ help_str += "otherwise, any available port will be searched and used."
+ o_port = optparse.Option("--port",
+ metavar="<port>",
+ type="int",
+ action="store",
+ dest="use_port",
+ help=help_str)
+
# All options
opt_list = [o_t,o_g, # GUI/Terminal
o_d,o_o, # Desktop
o_foreground,
o_wake_up,
o_slm, # Server launch mode
+ o_port, # Use port
]
#std_options = ["gui", "desktop", "log_file", "py_scripts", "resources",
# Process --print-port option
if cmd_opts.print_port:
- from runSalome import searchFreePort
+ from searchFreePort import searchFreePort
searchFreePort({})
print "port:%s"%(os.environ['NSPORT'])
sys.exit(0)
# Server launch command
if cmd_opts.server_launch_mode is not None:
- args["server_launch_mode"] = cmd_opts.server_launch_mode
+ args["server_launch_mode"] = cmd_opts.server_launch_mode
+
+ # Server launch command
+ if cmd_opts.use_port is not None:
+ min_port = 2810
+ max_port = min_port + 100
+ if cmd_opts.use_port not in xrange(min_port, max_port+1):
+ print "Error: port number should be in range [%d, %d])" % (min_port, max_port)
+ sys.exit(1)
+ args[useport_nam] = cmd_opts.use_port
# return arguments
os.environ[config_var] = separator.join(dirs)
