#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2012 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
# 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.
+# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
newpath = string.join(newpath, splitsym)
os.environ[variable_name] = newpath
if variable_name == "PYTHONPATH":
- sys.path[:0] = [directory]
+ sys.path[:0] = [os.path.realpath(directory)]
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-def get_config(silent=False):
+def get_config(silent=False, exeName=None):
"""
Get list of modules, paths.
-
+
Read args from launch configure xml file and command line options.
Check variables <module>_ROOT_DIR and set list of used modules.
- Return args, modules_list, modules_root_dir
+ Return args, modules_list, modules_root_dir
"""
-
+
# read args from launch configure xml file and command line options
#*** Test additional option
#*** o_j = optparse.Option("-j", "--join", action="store_true", dest="join", help=help_str)
import launchConfigureParser
- args = launchConfigureParser.get_env()
+ args = launchConfigureParser.get_env(exeName=exeName)
#*** Test additional option
#*** args = launchConfigureParser.get_env([o_j])
modules_list = []
if args.has_key("modules"):
- modules_list += args["modules"]
+ modules_list += [a for a in args["modules"] if a.strip()]
# KERNEL must be last in the list to locate it at the first place in PATH
if args["gui"] :
modules_list[:0] = ["GUI"]
def set_env(args, modules_list, modules_root_dir, silent=False):
"""Add to the PATH-variables modules specific paths"""
-
+
import os
- from salome_utils import getTmpDir, generateFileName, makeTmpDir, getPortNumber
+ from salome_utils import getLogDir, generateFileName, makeTmpDir, getPortNumber
# create temporary directory for environment files needed by modules from the list
port = getPortNumber(False)
if port:
- tmp_dir = getTmpDir()
+ tmp_dir = getLogDir()
env_dir = generateFileName(tmp_dir, prefix="env", with_port=True)
makeTmpDir(env_dir)
pass
if os.getenv('SALOME_BATCH') == None:
os.putenv('SALOME_BATCH','0')
if args["gui"] :
- modules_list = modules_list[:] + ["GUI"]
- modules_list = modules_list[:] + ["KERNEL"]
+ modules_list = modules_list[:] + ["GUI"]
+ modules_list = modules_list[:] + ["KERNEL"]
for module in modules_list :
if modules_root_dir.has_key(module):
module_root_dir = modules_root_dir[module]
- modules_root_dir_list[:0] = [module_root_dir]
+ if module_root_dir not in modules_root_dir_list:
+ modules_root_dir_list[:0] = [module_root_dir]
if sys.platform == "win32":
add_path(os.path.join(module_root_dir,get_lib_dir(),salome_subdir),
"PATH")
+ elif sys.platform == "darwin":
+ add_path(os.path.join(module_root_dir,get_lib_dir(),salome_subdir),
+ "DYLD_LIBRARY_PATH")
else:
add_path(os.path.join(module_root_dir,get_lib_dir(),salome_subdir),
"LD_LIBRARY_PATH")
os.environ["SALOMEPATH"]=";".join(modules_root_dir_list)
else:
os.environ["SALOMEPATH"]=":".join(modules_root_dir_list)
-
+
# set trace environment variable
-
+
if not os.environ.has_key("SALOME_trace"):
os.environ["SALOME_trace"]="local"
if args['file']:
# -----------------------------------------------------------------------------
-def main(silent=False):
- args, modules_list, modules_root_dir = get_config(silent=silent)
+def main(silent=False, exeName=None):
+ args, modules_list, modules_root_dir = get_config(silent=silent, exeName=exeName)
set_env(args, modules_list, modules_root_dir, silent=silent)
return args