#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2014 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
def get_config(silent=False):
"""
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
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")
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']: