#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2015 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
# -----------------------------------------------------------------------------
-def get_config(silent=False):
+def get_config(silent=False, exeName=None):
"""
Get list of modules, paths.
#*** 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"]
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")
# -----------------------------------------------------------------------------
-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