#! /usr/bin/env python3
-# Copyright (C) 2007-2017 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2020 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
import virtual_salome
import xml.sax
import optparse
+import subprocess
# --- names of tags in XML configuration file
appli_tag = "application"
extra_tests_tag = "extra_tests"
extra_test_tag = "extra_test"
resources_tag = "resources"
+env_modules_tag = "env_modules"
+env_module_tag = "env_module"
+python_tag = "python"
# --- names of attributes in XML configuration file
nam_att = "name"
path_att = "path"
gui_att = "gui"
+version_att = "version"
# -----------------------------------------------------------------------------
self.config["modules"] = []
self.config["guimodules"] = []
self.config["extra_tests"] = []
+ self.config["env_modules"] = []
parser = xml.sax.make_parser()
parser.setContentHandler(self)
parser.parse(fileName)
if self.space == [appli_tag, sha1_collect_tag] and path_att in attrs.getNames():
self.config["sha1_collect_path"] = attrs.getValue( path_att )
pass
+ # --- if we are analyzing "python" element then store its "version" attribute
+ if self.space == [appli_tag, python_tag] and version_att in attrs.getNames():
+ self.config["python_version"] = attrs.getValue( version_att )
+ pass
# --- if we are analyzing "system_conf" element then store its "path" attribute
if self.space == [appli_tag, system_conf_tag] and path_att in attrs.getNames():
self.config["system_conf_path"] = attrs.getValue( path_att )
self.config["guimodules"].append(nam)
pass
pass
+ # --- if we are analyzing "env_module" element then store its "name" attribute
+ elif self.space == [appli_tag, env_modules_tag, env_module_tag] and \
+ nam_att in attrs.getNames():
+ nam = attrs.getValue( nam_att )
+ self.config["env_modules"].append(nam)
+ pass
# --- if we are analyzing "extra_test" element then store its "name" and "path" attributes
elif self.space == [appli_tag,extra_tests_tag,extra_test_tag] and \
nam_att in attrs.getNames() and \
pass
if verbose:
- for cle,val in list(_config.items()):
+ for cle,val in _config.items():
print(cle, val)
pass
options.module_name = module
options.module_path = _config[module]
virtual_salome.link_module(options)
+ # To fix GEOM_TestXAO issue https://codev-tuleap.cea.fr/plugins/tracker/?aid=16599
+ if module == "GEOM":
+ # link <appli_path>/bin/salome/test/<module> to <module_path>/bin/salome/test
+ test_dir=os.path.join(home_dir,'bin','salome', 'test')
+ module_dir=os.path.abspath(options.module_path)
+ xao_link=os.path.join(module_dir,'bin','salome', 'test', "xao")
+ print("link %s --> %s"%(os.path.join(test_dir, "xao"), xao_link))
+ virtual_salome.symlink(xao_link, os.path.join(test_dir, "xao"))
pass
pass
pass
pass
+ # Sort test labels by name in generated CTestTestfile.cmake
+ with open(ctest_file) as f:
+ lines = f.readlines()
+ lines.sort()
+ with open(ctest_file, "w") as f:
+ f.write("".join(lines))
+
# Generate CTestCustom.cmake to handle long output
ctest_custom = os.path.join(home_dir, 'bin', 'salome', 'test', "CTestCustom.cmake")
with open(ctest_custom, 'w') as f:
f.write("SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 1048576) # 1MB\n")
f.write("SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 1048576) # 1MB\n")
- appliskel_dir = os.path.join(home_dir, 'bin', 'salome', 'appliskel')
+ appliskel_dir = os.path.join(prefix, 'bin', 'salome', 'appliskel')
for fn in ('envd',
'getAppliPath.py',
'kill_remote_containers.py',
'runRemote.sh',
- 'salome',
+ '.salome_run',
'update_catalogs.py',
'.bashrc',
):
pass
+ # Copy salome / salome_mesa scripts:
+
+ for scripts in ('salome', 'salome_mesa'):
+ salome_script = open(os.path.join(appliskel_dir, scripts)).read()
+ salome_file = os.path.join(home_dir, scripts)
+ try:
+ os.remove(salome_file)
+ except:
+ pass
+ env_modules = _config.get('env_modules', [])
+ with open(salome_file, 'w') as fd:
+ fd.write(salome_script.replace('MODULES = []', 'MODULES = {}'.format(env_modules)))
+ os.chmod(salome_file, 0o755)
+
# Add .salome-completion.sh file
shutil.copyfile(os.path.join(appliskel_dir, ".salome-completion.sh"),
os.path.join(home_dir, ".salome-completion.sh"))
pass
# Create environment file: configSalome.sh
+
+ if "python_version" in _config:
+ versionPython_split = _config["python_version"].split('.')
+ versionPython = versionPython_split[0] + "." + versionPython_split[1]
+ else:
+ cmd='source %s && python3 -c "import sys ; sys.stdout.write(\\"{}.{}\\".format(sys.version_info.major,sys.version_info.minor))"' %(_config["prereq_path"])
+ versionPython=subprocess.check_output(['/bin/bash', '-l' ,'-c',cmd]).decode("utf-8")
+
with open(os.path.join(home_dir, 'env.d', 'configSalome.sh'),'w') as f:
for module in _config.get("modules", []):
command = 'export '+ module + '_ROOT_DIR=${HOME}/${APPLI}\n'
if "resources_path" in _config and os.path.isfile(_config["resources_path"]):
command = 'export USER_CATALOG_RESOURCES_FILE=' + os.path.abspath(_config["resources_path"]) +'\n'
f.write(command)
+ # Note: below, PYTHONPATH should not be extended to bin/salome! Python modules must be installed in lib/pythonX.Y, to be fixed (e.g. Kernel SALOME_Container.py)
+ command ="""export PATH=${HOME}/${APPLI}/bin/salome:$PATH
+export PYTHONPATH=${HOME}/${APPLI}/lib/python%s/site-packages/salome:$PYTHONPATH
+export PYTHONPATH=${HOME}/${APPLI}/lib/salome:$PYTHONPATH
+export PYTHONPATH=${HOME}/${APPLI}/bin/salome:$PYTHONPATH
+export LD_LIBRARY_PATH=${HOME}/${APPLI}/lib/salome:$LD_LIBRARY_PATH
+""" %versionPython
+ f.write(command)
+ # Create environment variable for the salome test
+ for module in _config.get("modules", []):
+ command = "export LD_LIBRARY_PATH=${HOME}/${APPLI}/bin/salome/test/" + module + "/lib:$LD_LIBRARY_PATH\n"
+ f.write(command)
+ pass
+ # Create environment for plugins GEOM
+ command = "export GEOM_PluginsList=BREPPlugin:STEPPlugin:IGESPlugin:STLPlugin:XAOPlugin:VTKPlugin:AdvancedGEOM\n"
+ f.write(command)
+ # Create environment for Healing
+ command = "export CSF_ShHealingDefaults=${HOME}/${APPLI}/share/salome/resources/geom\n"
+ f.write(command)
+ # Create environment for Meshers
+ command = "export SMESH_MeshersList=StdMeshers:HYBRIDPlugin:HexoticPLUGIN:GMSHPlugin:GHS3DPlugin:NETGENPlugin:HEXABLOCKPlugin:BLSURFPlugin:GHS3DPRLPlugin\nexport SALOME_StdMeshersResources=${HOME}/${APPLI}/share/salome/resources/smesh\n"
+ f.write(command)
# Create configuration file: configSalome.cfg
with open(os.path.join(home_dir, 'env.d', 'configSalome.cfg'),'w') as f:
if "resources_path" in _config and os.path.isfile(_config["resources_path"]):
command = 'USER_CATALOG_RESOURCES_FILE=' + os.path.abspath(_config["resources_path"]) +'\n'
f.write(command)
+ command ="""ADD_TO_PATH: ${HOME}/${APPLI}/bin/salome
+ADD_TO_PYTHONPATH: ${HOME}/${APPLI}/lib/python%s/site-packages/salome
+ADD_TO_PYTHONPATH: ${HOME}/${APPLI}/lib/salome
+ADD_TO_LD_LIBRARY_PATH: ${HOME}/${APPLI}/lib/salome
+"""%versionPython
+ f.write(command)
+ for module in _config.get("modules", []):
+ command = "ADD_TO_LD_LIBRARY_PATH: ${HOME}/${APPLI}/bin/salome/test/" + module + "/lib\n"
+ f.write(command)
+ pass
+ # Create environment for plugins GEOM
+ command = "GEOM_PluginsList=BREPPlugin:STEPPlugin:IGESPlugin:STLPlugin:XAOPlugin:VTKPlugin:AdvancedGEOM\n"
+ f.write(command)
+ # Create environment for Healing
+ command = "CSF_ShHealingDefaults=${HOME}/${APPLI}/share/salome/resources/geom\n"
+ f.write(command)
+ # Create environment for Meshers
+ command = "SMESH_MeshersList=StdMeshers:HYBRIDPlugin:HexoticPLUGIN:GMSHPlugin:GHS3DPlugin:NETGENPlugin:HEXABLOCKPlugin:BLSURFPlugin:GHS3DPRLPlugin\nSALOME_StdMeshersResources=${HOME}/${APPLI}/share/salome/resources/smesh\n"
+ f.write(command)
# Create environment file: configGUI.sh
+ dirs_ress_icon = []
+ salomeappname = "SalomeApp"
with open(os.path.join(home_dir, 'env.d', 'configGUI.sh'),'w') as f:
- command = """export SalomeAppConfig=${HOME}/${APPLI}
-export SUITRoot=${HOME}/${APPLI}/share/salome
+ for module in _config.get("modules", []):
+ if module not in ["KERNEL", "GUI", ""]:
+ d = os.path.join(_config[module],"share","salome","resources",module.lower())
+ d_appli = os.path.join("${HOME}","${APPLI}","share","salome","resources",module.lower())
+ if os.path.exists( os.path.join(d,"{0}.xml".format(salomeappname)) ):
+ dirs_ress_icon.append( d_appli )
+ AppConfig="export SalomeAppConfig=${HOME}/${APPLI}:${HOME}/${APPLI}/share/salome/resources/gui/"
+ for dir_module in dirs_ress_icon:
+ AppConfig=AppConfig+":"+dir_module
+ f.write(AppConfig+"\n")
+ command = """export SUITRoot=${HOME}/${APPLI}/share/salome
export DISABLE_FPE=1
export MMGT_REENTRANT=1
"""
f.write(command)
# Create configuration file: configGUI.cfg
+ dirs_ress_icon = []
with open(os.path.join(home_dir, 'env.d', 'configGUI.cfg'),'w') as f:
- command = """[SALOME GUI Configuration]
-SalomeAppConfig=${HOME}/${APPLI}
-SUITRoot=${HOME}/${APPLI}/share/salome
+ command = """[SALOME GUI Configuration]\n"""
+ f.write(command)
+ for module in _config.get("modules", []):
+ if module not in ["KERNEL", "GUI", ""]:
+ d = os.path.join(_config[module],"share","salome","resources",module.lower())
+ d_appli = os.path.join("${HOME}","${APPLI}","share","salome","resources",module.lower())
+ if os.path.exists( os.path.join(d,"{0}.xml".format(salomeappname)) ):
+ dirs_ress_icon.append( d_appli )
+ AppConfig="SalomeAppConfig=${HOME}/${APPLI}:${HOME}/${APPLI}/share/salome/resources/gui/"
+ for dir_module in dirs_ress_icon:
+ AppConfig=AppConfig+":"+dir_module
+ f.write(AppConfig+"\n")
+ command = """SUITRoot=${HOME}/${APPLI}/share/salome
DISABLE_FPE=1
MMGT_REENTRANT=1
"""