X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2Fappli_gen.py;h=4c64c7a79b8a234254d55d6ee4ba961521a7ad48;hb=acde82d9a3d34c28032d80123aa654197f7c26a4;hp=cd64c5f87f5ed8b4e18f03307206540e181bae48;hpb=309d4eee23b39959d125501a57691a0d8d235dec;p=modules%2Fkernel.git diff --git a/bin/appli_gen.py b/bin/appli_gen.py index cd64c5f87..4c64c7a79 100644 --- a/bin/appli_gen.py +++ b/bin/appli_gen.py @@ -1,6 +1,6 @@ #! /usr/bin/env python # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 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 @@ -8,7 +8,7 @@ # 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 @@ -25,25 +25,30 @@ ## \file appli_gen.py # Create a %SALOME application (virtual Salome installation) # -usage="""usage: %prog [options] +usage = """%(prog)s [options] Typical use is: - python appli_gen.py + python %(prog)s Typical use with options is: - python appli_gen.py --verbose --prefix= --config= + python %(prog)s --verbose --prefix= --config= """ -import os, glob, string, sys, re +import os +import sys import shutil +import virtual_salome import xml.sax import optparse -import virtual_salome # --- names of tags in XML configuration file appli_tag = "application" prereq_tag = "prerequisites" +context_tag = "context" +system_conf_tag = "system_conf" modules_tag = "modules" module_tag = "module" samples_tag = "samples" +extra_tests_tag = "extra_tests" +extra_test_tag = "extra_test" resources_tag = "resources" # --- names of attributes in XML configuration file @@ -62,18 +67,19 @@ class xml_parser: self.config = {} self.config["modules"] = [] self.config["guimodules"] = [] + self.config["extra_tests"] = [] parser = xml.sax.make_parser() parser.setContentHandler(self) parser.parse(fileName) pass - def boolValue( self, str ): - if str in ("yes", "y", "1"): + def boolValue( self, text): + if text in ("yes", "y", "1"): return 1 - elif str in ("no", "n", "0"): + elif text in ("no", "n", "0"): return 0 else: - return str + return text pass def startElement(self, name, attrs): @@ -83,6 +89,14 @@ class xml_parser: if self.space == [appli_tag, prereq_tag] and path_att in attrs.getNames(): self.config["prereq_path"] = attrs.getValue( path_att ) pass + # --- if we are analyzing "context" element then store its "path" attribute + if self.space == [appli_tag, context_tag] and path_att in attrs.getNames(): + self.config["context_path"] = attrs.getValue( path_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 ) + pass # --- if we are analyzing "resources" element then store its "path" attribute if self.space == [appli_tag, resources_tag] and path_att in attrs.getNames(): self.config["resources_path"] = attrs.getValue( path_att ) @@ -107,10 +121,19 @@ class xml_parser: self.config["guimodules"].append(nam) pass 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 \ + path_att in attrs.getNames(): + nam = attrs.getValue( nam_att ) + path = attrs.getValue( path_att ) + self.config["extra_tests"].append(nam) + self.config[nam]=path + pass pass def endElement(self, name): - p = self.space.pop() + self.space.pop() self.current = None pass @@ -140,20 +163,20 @@ class params: def makedirs(namedir): if os.path.exists(namedir): - dirbak=namedir+".bak" + dirbak = namedir+".bak" if os.path.exists(dirbak): shutil.rmtree(dirbak) - os.rename(namedir,dirbak) + os.rename(namedir, dirbak) os.listdir(dirbak) #sert seulement a mettre a jour le systeme de fichier sur certaines machines os.makedirs(namedir) -def install(prefix,config_file,verbose=0): - home_dir=os.path.abspath(os.path.expanduser(prefix)) - filename=os.path.abspath(os.path.expanduser(config_file)) - _config={} +def install(prefix, config_file, verbose=0): + home_dir = os.path.abspath(os.path.expanduser(prefix)) + filename = os.path.abspath(os.path.expanduser(config_file)) + _config = {} try: - p = xml_parser(filename) - _config = p.config + parser = xml_parser(filename) + _config = parser.config except xml.sax.SAXParseException, inst: print inst.getMessage() print "Configure parser: parse error in configuration file %s" % filename @@ -167,81 +190,149 @@ def install(prefix,config_file,verbose=0): pass if verbose: - for cle in _config.keys(): - print cle, _config[cle] + for cle,val in _config.items(): + print cle, val pass - for module in _config["modules"]: - print "--- add module ", module, _config[module] - options = params() - options.verbose=verbose - options.clear=0 - options.prefix=home_dir - options.module=_config[module] - virtual_salome.link_module(options) + # Remove CTestTestfile.cmake; this file will be filled by successive calls to link_module and link_extra_test + try: + ctest_file = os.path.join(home_dir, 'bin', 'salome', 'test', "CTestTestfile.cmake") + os.remove(ctest_file) + except: + pass + + for module in _config.get("modules", []): + if _config.has_key(module): + print "--- add module ", module, _config[module] + options = params() + options.verbose = verbose + options.clear = 0 + options.prefix = home_dir + options.module_name = module + options.module_path = _config[module] + virtual_salome.link_module(options) + pass pass - appliskel_dir=os.path.join(home_dir,'bin','salome','appliskel') + for extra_test in _config.get("extra_tests", []): + if _config.has_key(extra_test): + print "--- add extra test ", extra_test, _config[extra_test] + options = params() + options.verbose = verbose + options.clear = 0 + options.prefix = home_dir + options.extra_test_name = extra_test + options.extra_test_path = _config[extra_test] + virtual_salome.link_extra_test(options) + pass + pass + + # 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') for fn in ('envd', 'getAppliPath.py', 'kill_remote_containers.py', - 'runAppli', # OBSOLETE (replaced by salome) - 'runConsole', # OBSOLETE (replaced by salome) 'runRemote.sh', - 'runSalomeScript', - 'runSession', # OBSOLETE (replaced by salome) 'salome', 'update_catalogs.py', '.bashrc', ): - virtual_salome.symlink("./bin/salome/appliskel/"+fn,os.path.join(home_dir, fn)) + virtual_salome.symlink( os.path.join( appliskel_dir, fn ), os.path.join( home_dir, fn) ) pass if filename != os.path.join(home_dir,"config_appli.xml"): - command = "cp -p " + filename + ' ' + os.path.join(home_dir,"config_appli.xml") - os.system(command) + shutil.copyfile(filename, os.path.join(home_dir,"config_appli.xml")) pass + + # Add .salome-completion.sh file + shutil.copyfile(os.path.join(appliskel_dir, ".salome-completion.sh"), + os.path.join(home_dir, ".salome-completion.sh")) + + + # Creation of env.d directory virtual_salome.mkdir(os.path.join(home_dir,'env.d')) - if os.path.isfile(_config["prereq_path"]): - command='cp -p ' + _config["prereq_path"] + ' ' + os.path.join(home_dir,'env.d','envProducts.sh') - os.system(command) + + if _config.has_key("prereq_path") and os.path.isfile(_config["prereq_path"]): + shutil.copyfile(_config["prereq_path"], + os.path.join(home_dir, 'env.d', 'envProducts.sh')) pass else: print "WARNING: prerequisite file does not exist" pass - #environment file: configSalome.sh - f =open(os.path.join(home_dir,'env.d','configSalome.sh'),'w') - for module in _config["modules"]: - command='export '+ module + '_ROOT_DIR=${HOME}/${APPLI}\n' - f.write(command) + if _config.has_key("context_path") and os.path.isfile(_config["context_path"]): + shutil.copyfile(_config["context_path"], + os.path.join(home_dir, 'env.d', 'envProducts.cfg')) pass - if _config.has_key("samples_path"): - command='export DATA_DIR=' + _config["samples_path"] +'\n' - f.write(command) + else: + print "WARNING: context file does not exist" pass - if _config.has_key("resources_path") and os.path.isfile(_config["resources_path"]): - command='export USER_CATALOG_RESOURCES_FILE=' + os.path.abspath(_config["resources_path"]) +'\n' - f.write(command) - f.close() + if _config.has_key("system_conf_path") and os.path.isfile(_config["system_conf_path"]): + shutil.copyfile(_config["system_conf_path"], + os.path.join(home_dir, 'env.d', 'envConfSystem.sh')) + pass + + # Create environment file: configSalome.sh + 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' + f.write(command) + pass + if _config.has_key("samples_path"): + command = 'export DATA_DIR=' + _config["samples_path"] +'\n' + f.write(command) + pass + if _config.has_key("resources_path") and os.path.isfile(_config["resources_path"]): + command = 'export USER_CATALOG_RESOURCES_FILE=' + os.path.abspath(_config["resources_path"]) +'\n' + f.write(command) + + # Create configuration file: configSalome.cfg + with open(os.path.join(home_dir, 'env.d', 'configSalome.cfg'),'w') as f: + command = "[SALOME ROOT_DIR (modules) Configuration]\n" + f.write(command) + for module in _config.get("modules", []): + command = module + '_ROOT_DIR=${HOME}/${APPLI}\n' + f.write(command) + pass + if _config.has_key("samples_path"): + command = 'DATA_DIR=' + _config["samples_path"] +'\n' + f.write(command) + pass + if _config.has_key("resources_path") and os.path.isfile(_config["resources_path"]): + command = 'USER_CATALOG_RESOURCES_FILE=' + os.path.abspath(_config["resources_path"]) +'\n' + f.write(command) - #environment file: configGUI.sh - f =open(os.path.join(home_dir,'env.d','configGUI.sh'),'w') - command = """export SalomeAppConfig=${HOME}/${APPLI} + # Create environment file: configGUI.sh + 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 export DISABLE_FPE=1 export MMGT_REENTRANT=1 """ - f.write(command) - f.close() + f.write(command) + + # Create configuration file: configGUI.cfg + 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 +DISABLE_FPE=1 +MMGT_REENTRANT=1 +""" + f.write(command) #SalomeApp.xml file - f =open(os.path.join(home_dir,'SalomeApp.xml'),'w') - command=""" + with open(os.path.join(home_dir,'SalomeApp.xml'),'w') as f: + command = """
@@ -257,20 +348,20 @@ export MMGT_REENTRANT=1 - +
""" - mods=[] - #Keep all modules except KERNEL and GUI - for m in _config["modules"]: - if m in ("KERNEL","GUI"):continue - mods.append(m) - f.write(command % ",".join(mods)) - f.close() + mods = [] + #Keep all modules except KERNEL and GUI + for module in _config.get("modules", []): + if module in ("KERNEL","GUI"): + continue + mods.append(module) + f.write(command % ",".join(mods)) #Add USERS directory with 777 permission to store users configuration files - users_dir=os.path.join(home_dir,'USERS') + users_dir = os.path.join(home_dir,'USERS') makedirs(users_dir) os.chmod(users_dir, 0777) @@ -288,10 +379,10 @@ def main(): options, args = parser.parse_args() if not os.path.exists(options.config): - print "ERROR: config file %s does not exist. It is mandatory." % options.config - sys.exit(1) + print "ERROR: config file %s does not exist. It is mandatory." % options.config + sys.exit(1) - install(prefix=options.prefix,config_file=options.config,verbose=options.verbose) + install(prefix=options.prefix, config_file=options.config, verbose=options.verbose) pass # -----------------------------------------------------------------------------