X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2Fsetenv.py;h=b8eb466f8137327c7c2901b5d7b6fd1e141fc2a2;hb=acde82d9a3d34c28032d80123aa654197f7c26a4;hp=e302fd1dd9ea06ca84fccb8dbc063ae859209baf;hpb=cca750d0050e94eae9ea9ca05bee79a3ce454882;p=modules%2Fkernel.git diff --git a/bin/setenv.py b/bin/setenv.py index e302fd1dd..b8eb466f8 100755 --- a/bin/setenv.py +++ b/bin/setenv.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2014 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 @@ -64,7 +64,7 @@ def add_path(directory, variable_name): 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)] # ----------------------------------------------------------------------------- @@ -78,7 +78,7 @@ def get_lib_dir(): # ----------------------------------------------------------------------------- -def get_config(silent=False): +def get_config(silent=False, exeName=None): """ Get list of modules, paths. @@ -95,7 +95,7 @@ def get_config(silent=False): #*** 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]) @@ -242,8 +242,8 @@ def set_env(args, modules_list, modules_root_dir, silent=False): # ----------------------------------------------------------------------------- -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