Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Associate ports to application path to prevent from killing *all* applications
[modules/kernel.git]
/
bin
/
setenv.py
diff --git
a/bin/setenv.py
b/bin/setenv.py
index 15482951385c34bc2ecc5dcffb87bcce87594da7..693a51feb09365dfcd52bab439c2f341c3846b62 100755
(executable)
--- a/
bin/setenv.py
+++ b/
bin/setenv.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-201
6
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
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-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.
"""
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
#*** 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])
#*** Test additional option
#*** args = launchConfigureParser.get_env([o_j])
@@
-177,6
+177,9
@@
def set_env(args, modules_list, modules_root_dir, silent=False):
if sys.platform == "win32":
add_path(os.path.join(module_root_dir,get_lib_dir(),salome_subdir),
"PATH")
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")
else:
add_path(os.path.join(module_root_dir,get_lib_dir(),salome_subdir),
"LD_LIBRARY_PATH")
@@
-242,8
+245,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
set_env(args, modules_list, modules_root_dir, silent=silent)
return args