import sys
from optparse import OptionParser
from NSparam import getNSparams
+import socket
# Use to display newlines (\n) in epilog
class MyParser(OptionParser):
#
def configureSession(args=[]):
- usage = "Usage: %prog [options]"
- epilog = """\nIf the command is not given a shell is opened.
+ usage = "Usage: %prog [options] [command]"
+ epilog = """\n
+If the command is not given a shell is opened; else execute the given command.
+Command may be a series of Python scripts with arguments: [PYTHON_FILE [args] [PYTHON_FILE [args]...]]
+Python file arguments, if any, must be comma-separated (without blank characters) and prefixed by "args:" (without quotes), e.g. myscript.py args:arg1,arg2=val,...
+\n
If PORT and MACHINE are not given, try to connect to the last active session on the local machine.
If PORT and MACHINE are given, try to connect to the remote session associated with PORT on MACHINE.
If MACHINE is not given, try to connect to the session associated to PORT on the local machine.
If PORT is not given, try to connect to the remote session associated to port 2810 on MACHINE.\n\n"""
parser = MyParser(usage=usage, epilog=epilog)
parser.add_option("-p", "--port", metavar="<port>", default=0,
- action="store", type="int", dest="port",
+ action="store", type="string", dest="port",
help="The port to connect to."
)
parser.add_option("-m", "--machine", metavar="<machine>", default=0,
- action="store", type="int", dest="machine",
+ action="store", type="string", dest="host",
help="The machine to connect to."
)
try:
return
port = options.port
- machine = options.machine
+ host = options.host
# :GLITCH: this code defines specific environment variables (OMNIORB_CONFIG, NSPORT,
# NSHOST) which are later used by other modules. Working, but not really "safe"...
if not port:
- if not machine:
+ if not host:
# neither MACHINE nor PORT are given
# --- set omniORB configuration to current session if any
- absoluteAppliPath = os.environ['ABSOLUTE_APPLI_PATH']
- fileOmniConfig = absoluteAppliPath + '/USERS/.omniORB_' + os.environ['USER'] + '_last.cfg'
+ omniorbUserPath = os.environ['OMNIORB_USER_PATH']
+ fileOmniConfig = omniorbUserPath + '/.omniORB_' + os.environ['USER'] + '_last.cfg'
if os.path.isfile(fileOmniConfig):
os.environ['OMNIORB_CONFIG'] = fileOmniConfig
# --- set environment variables for port and hostname of NamingService
host, port = getNSparams()
- os.environ['NSHOST'] = host
- os.environ['NSPORT'] = port
else:
# No running session
- os.environ['NSHOST'] = "no_host"
- os.environ['NSPORT'] = "no_port"
- pass
+ host = "no_host"
+ port = "no_port"
else:
# only MACHINE is given
- _writeConfigFile(2810, os.environ['NSHOST'])
+ port = '2810'
+ _writeConfigFile(port, host)
#
else:
- if not machine:
+ if not host:
# only PORT is given
- os.environ['NSHOST'] = `hostname`
- pass
+ host = socket.gethostname()
# both MACHINE and PORT are given
- _writeConfigFile(os.environ['NSPORT'], os.environ['NSHOST'])
+ _writeConfigFile(port, host)
#
+ os.environ['NSPORT'] = port
+ os.environ['NSHOST'] = host
#
# --- set the OMNIORB_CONFIG file and environment relative to this run of SALOME
def _writeConfigFile(port, host):
- os.environ['NSPORT'] = port
- os.environ['NSHOST'] = host
-
- absoluteAppliPath = os.environ['ABSOLUTE_APPLI_PATH']
- path = absoluteAppliPath + '/USERS'
+ path = os.environ['OMNIORB_USER_PATH']
kwargs = {'with_username' : os.environ['USER']}
from ORBConfigFile import writeORBConfigFile
