X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2FsalomeContext.py;h=c5eda0a516aae432bd351660860b6baa6970c852;hb=f2d7bee74f47cd695b4c4b9b0921424837140d0c;hp=a9f643b4e8d7e27ee8041d6840b0da66ee88b7e1;hpb=aca97b87ea21fa376681bf2f3628be7c41c97cb4;p=modules%2Fkernel.git diff --git a/bin/salomeContext.py b/bin/salomeContext.py index a9f643b4e..c5eda0a51 100644 --- a/bin/salomeContext.py +++ b/bin/salomeContext.py @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -33,29 +33,32 @@ import platform from salomeContextUtils import SalomeContextException def usage(): - #exeName = os.path.splitext(os.path.basename(__file__))[0] - msg = '''\ Usage: salome [command] [options] [--config=] Commands: ========= - start Starts a SALOME session (through virtual application) - context Initializes SALOME context. - shell Initializes SALOME context, and executes scripts passed - as command arguments - connect Connects a Python console to the active SALOME session - killall Kill all SALOME running sessions for current user - info Display some information about SALOME - help Show this message - coffee Yes! SALOME can also make coffee!! + start Start a new SALOME instance. + context Initialize SALOME context. Current environment is extended. + shell Initialize SALOME context, attached to the last created SALOME + instance if any, and executes scripts passed as command arguments. + User works in a Shell terminal; SALOME environment is set but + application is not started. + connect Connect a Python console to the active SALOME instance. + kill Terminate SALOME instances running on given ports for current user. + Port numbers must be separated by blank characters. + killall Terminate *all* SALOME running instances for current user. + Do not start a new one. + test Run SALOME tests. + info Display some information about SALOME. + help Show this message. If no command is given, default to start. Command options: ================ - Use salome --help to show help on command ; available for start - and shell commands. + Use salome --help to show help on command ; available for commands: + start, shell, connect, test, info. --config= ========================== @@ -82,6 +85,7 @@ class SalomeContext: to .cfg format before setting the context. """ def __init__(self, configFileNames=0): + self.getLogger().setLevel(logging.INFO) #it could be None explicitely (if user use multiples setVariable...for standalone) if configFileNames is None: return @@ -89,7 +93,7 @@ class SalomeContext: if len(configFileNames) == 0: raise SalomeContextException("No configuration files given") - reserved=['PATH', 'DYLD_LIBRARY_PATH', 'LD_LIBRARY_PATH', 'PYTHONPATH', 'MANPATH', 'PV_PLUGIN_PATH'] + reserved=['PATH', 'DYLD_LIBRARY_PATH', 'LD_LIBRARY_PATH', 'PYTHONPATH', 'MANPATH', 'PV_PLUGIN_PATH', 'INCLUDE', 'LIBPATH', 'SALOME_PLUGINS_PATH'] for filename in configFileNames: basename, extension = os.path.splitext(filename) if extension == ".cfg": @@ -139,8 +143,8 @@ class SalomeContext: absoluteAppliPath = os.getenv('ABSOLUTE_APPLI_PATH','') env_copy = os.environ.copy() proc = subprocess.Popen(['python', os.path.join(absoluteAppliPath,"bin","salome","salomeContext.py"), pickle.dumps(self), pickle.dumps(args)], shell=False, close_fds=True, env=env_copy) - msg = proc.communicate() - return msg, proc.returncode + out, err = proc.communicate() + return out, err, proc.returncode # """Append value to PATH environment variable""" @@ -150,7 +154,10 @@ class SalomeContext: """Append value to LD_LIBRARY_PATH environment variable""" def addToLdLibraryPath(self, value): - self.addToVariable('LD_LIBRARY_PATH', value) + if platform.system() == 'Windows': + self.addToVariable('PATH', value) + else: + self.addToVariable('LD_LIBRARY_PATH', value) # """Append value to DYLD_LIBRARY_PATH environment variable""" @@ -210,14 +217,17 @@ class SalomeContext: options = args[1:] availableCommands = { - 'start' : '_runAppli', + 'start' : '_runAppli', 'context' : '_setContext', - 'shell' : '_runSession', + 'shell' : '_runSession', 'connect' : '_runConsole', - 'killall': '_killAll', - 'info': '_showInfo', - 'help': '_usage', - 'coffee' : '_makeCoffee' + 'kill' : '_kill', + 'killall' : '_killAll', + 'test' : '_runTests', + 'info' : '_showInfo', + 'help' : '_usage', + 'coffee' : '_makeCoffee', + 'car' : '_getCar', } if not command in availableCommands.keys(): @@ -233,13 +243,16 @@ class SalomeContext: See usage for details on commands. """ def _startSalome(self, args): + import os + import sys try: - import os + from setenv import add_path absoluteAppliPath = os.getenv('ABSOLUTE_APPLI_PATH') - import sys path = os.path.realpath(os.path.join(absoluteAppliPath, "bin", "salome")) - if not path in sys.path: - sys.path[:0] = [path] + add_path(path, "PYTHONPATH") + path = os.path.realpath(os.path.join(absoluteAppliPath, "bin", "salome", "appliskel")) + add_path(path, "PYTHONPATH") + except: pass @@ -281,7 +294,8 @@ class SalomeContext: file_base = os.path.basename(filename) base_no_ext, ext = os.path.splitext(file_base) sh_file = os.path.join(file_dir, base_no_ext+'.sh') - if ext == ".cfg" and os.path.isfile(sh_file): + #if ext == ".cfg" and os.path.isfile(sh_file): + if False: msg += "Found similar %s file; trying to parse this one instead..."%(base_no_ext+'.sh') temp = tempfile.NamedTemporaryFile(suffix='.cfg') try: @@ -309,7 +323,10 @@ class SalomeContext: a = filter(None, reservedDict[reserved]) # remove empty elements a = [ os.path.realpath(x) for x in a ] reformattedVals = os.pathsep.join(a) - self.addToVariable(reserved, reformattedVals) + if reserved in ["INCLUDE", "LIBPATH"]: + self.addToVariable(reserved, reformattedVals, separator=' ') + else: + self.addToVariable(reserved, reformattedVals) pass for key,val in configVars: @@ -324,10 +341,10 @@ class SalomeContext: def _runAppli(self, args=None): if args is None: args = [] - # Initialize SALOME context + # Initialize SALOME environment sys.argv = ['runSalome'] + args import setenv - setenv.main(True) + setenv.main(True, exeName="salome start") import runSalome runSalome.runSalome() @@ -370,19 +387,35 @@ class SalomeContext: def _runConsole(self, args=None): if args is None: args = [] - # Initialize SALOME context - sys.argv = ['runConsole'] + args + # Initialize SALOME environment + sys.argv = ['runConsole'] import setenv setenv.main(True) - cmd = ["python", "-c", "import runConsole\nrunConsole.connect()" ] - proc = subprocess.Popen(cmd, shell=False, close_fds=True) - return proc.communicate() + import runConsole + return runConsole.connect(args) # - def _killAll(self, args=None): + def _kill(self, args=None): if args is None: args = [] + ports = args + if not ports: + print "Port number(s) not provided to command: salome kill " + return + + from multiprocessing import Process + from killSalomeWithPort import killMyPort + import tempfile + for port in ports: + with tempfile.NamedTemporaryFile(): + p = Process(target = killMyPort, args=(port,)) + p.start() + p.join() + pass + # + + def _killAll(self, unused=None): try: import PortManager # mandatory from multiprocessing import Process @@ -397,22 +430,81 @@ class SalomeContext: p.start() p.join() except ImportError: + # :TODO: should be declared obsolete from killSalome import killAllPorts killAllPorts() pass + # + def _runTests(self, args=None): + if args is None: + args = [] + sys.argv = ['runTests'] + import setenv + setenv.main(True) + + import runTests + return runTests.runTests(args, exe="salome test") # + def _showSoftwareVersions(self): + config = ConfigParser.SafeConfigParser() + absoluteAppliPath = os.getenv('ABSOLUTE_APPLI_PATH') + filename = os.path.join(absoluteAppliPath, ".softwares_versions") + try: + config.read(filename) + sections = config.sections() + for section in sections: + entries = config.items(section, raw=True) # do not use interpolation + for key,val in entries: + version,text = [ x.strip() for x in val.split(',') ] + print "%s: %s"%(text, version) + except: + import traceback + traceback.print_exc() + return + pass + def _showInfo(self, args=None): - print "Running with python", platform.python_version() - self._runAppli(["--version"]) + if args is None: + args = [] + + usage = "Usage: salome info [options]" + epilog = """\n +Display some information about SALOME.\n +Available options are: + -p,--ports Show the list of busy ports (running SALOME instances). + -s,--softwares Show the list and versions of SALOME softwares. + -v,--version Show running SALOME version. + -h,--help Show this message. +""" + if not args: + args = ["--version"] + + if "-h" in args or "--help" in args: + print usage + epilog + return + + if "-p" in args or "--ports" in args: + import PortManager + ports = PortManager.getBusyPorts() + print "SALOME instances are running on ports:", ports + if ports: + print "Last started instance on port %s"%ports[-1] + + if "-s" in args or "--softwares" in args: + self._showSoftwareVersions() + + if "-v" in args or "--version" in args: + print "Running with python", platform.python_version() + self._runAppli(["--version"]) # def _usage(self, unused=None): usage() # - def _makeCoffee(self, args=None): + def _makeCoffee(self, unused=None): print " (" print " ) (" print " ___...(-------)-....___" @@ -423,9 +515,9 @@ class SalomeContext: print " | | | |" print " \\ \\ | |" print " `\\ `\\ | |" - print " `\\ `| |" - print " _/ /\\ /" - print " (__/ \\ /" + print " `\\ `| SALOME |" + print " _/ /\\ 4 EVER /" + print " (__/ \\ <3 /" print " _..---\"\"` \\ /`\"\"---.._" print " .-\' \\ / \'-." print " : `-.__ __.-\' :" @@ -435,6 +527,43 @@ class SalomeContext: print " \'._ \"\"\"----.....______.....----\"\"\" _.\'" print " `\"\"--..,,_____ _____,,..--\"\"`" print " `\"\"\"----\"\"\"`" + print "" + print " SALOME is working for you; what else?" + print "" + sys.exit(0) + # + + def _getCar(self, unused=None): + print " _____________" + print " ..---:::::::-----------. ::::;;." + print " .\'\"\"\"\"\"\" ;; \\ \":." + print " .\'\' ; \\ \"\\__." + print " .\' ;; ; \\\\\";" + print " .\' ; _____; \\\\/" + print " .\' :; ;\" \\ ___:\'." + print " .\'--........................... : = ____:\" \\ \\" + print " ..-\"\" \"\"\"\' o\"\"\" ; ; :" + print " .--\"\" .----- ..----... _.- --. ..-\" ; ; ; ;" + print " .\"\"_- \"--\"\"-----\'\"\" _-\" .-\"\" ; ; .-." + print " .\' .\' SALOME .\" .\" ; ; /. |" + print " /-./\' 4 EVER <3 .\" / _.. ; ; ;;;|" + print " : ;-.______ / _________==. /_ \\ ; ; ;;;;" + print " ; / | \"\"\"\"\"\"\"\"\"\"\".---.\"\"\"\"\"\"\" : /\" \". |; ; _; ;;;" + print " /\"-/ | / / / / ;|; ;-\" | ;\';" + print ":- : \"\"\"----______ / / ____. . .\"\'. ;; .-\"..T\" ." + print "\'. \" ___ \"\": \'\"\"\"\"\"\"\"\"\"\"\"\"\"\" . ; ; ;; ;.\" .\" \'--\"" + print " \", __ \"\"\" \"\"---... :- - - - - - - - - \' \' ; ; ; ;;\" .\"" + print " /. ; \"\"\"---___ ; ; ; ;|.\"\"" + print " : \": \"\"\"----. .-------. ; ; ; ;:" + print " \\ \'--__ \\ \\ \\ / | ; ;;" + print " \'-.. \"\"\"\"---___ : .______..\\ __/..-\"\"| ; ; ;" + print " \"\"--.. \"\"\"--\" m l s . \". . ;" + print " \"\"------... ..--\"\" \" :" + print " \"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\" \\ /" + print " \"------\"" + print "" + print " Drive your simulation properly with SALOME!" + print "" sys.exit(0) #