X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2Fappli_gen.py;h=4e04d1d3256f84712f93c8ac0c82fc4dbd295b5f;hb=d1cae124bfb0155567da286f2cfd738e3411cb3b;hp=b80ea2c29c349b995fcb297180ed517f7c60f3df;hpb=9a965a48d4bc1a6cd1f73229a91e77b10bffa881;p=modules%2Fkernel.git diff --git a/bin/appli_gen.py b/bin/appli_gen.py index b80ea2c29..4e04d1d32 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-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 @@ -32,21 +32,24 @@ Typical use with options is: python %(prog)s --verbose --prefix= --config= """ -import argparse import os import sys import shutil import virtual_salome import xml.sax +import optparse # --- names of tags in XML configuration file appli_tag = "application" prereq_tag = "prerequisites" context_tag = "context" +sha1_collect_tag = "sha1_collections" 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 @@ -65,6 +68,7 @@ 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) @@ -90,6 +94,10 @@ class xml_parser: 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 "sha1_collection" element then store its "path" attribute + 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 "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 ) @@ -118,6 +126,15 @@ 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): @@ -182,6 +199,13 @@ def install(prefix, config_file, verbose=0): print cle, val pass + # 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] @@ -189,21 +213,37 @@ def install(prefix, config_file, verbose=0): options.verbose = verbose options.clear = 0 options.prefix = home_dir - options.module = _config[module] + options.module_name = module + options.module_path = _config[module] virtual_salome.link_module(options) pass pass + 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', @@ -215,11 +255,17 @@ def install(prefix, config_file, verbose=0): 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 _config.has_key("prereq_path") and os.path.isfile(_config["prereq_path"]): - shutil.copyfile(_config["prereq_path"], + shutil.copyfile(_config["prereq_path"], os.path.join(home_dir, 'env.d', 'envProducts.sh')) pass else: @@ -234,12 +280,19 @@ def install(prefix, config_file, verbose=0): print "WARNING: context file does not exist" pass + if _config.has_key("sha1_collect_path") and os.path.isfile(_config["sha1_collect_path"]): + shutil.copyfile(_config["sha1_collect_path"], + os.path.join(home_dir, 'sha1_collections.txt')) + pass + else: + print "WARNING: context file does not exist" + pass + if _config.has_key("system_conf_path") and os.path.isfile(_config["system_conf_path"]): - shutil.copyfile(_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", []): @@ -326,19 +379,18 @@ MMGT_REENTRANT=1 os.chmod(users_dir, 0777) def main(): - parser = argparse.ArgumentParser(usage=usage) + parser = optparse.OptionParser(usage=usage) - parser.add_argument('--prefix', default='.', metavar="", - help="Installation directory (default %(default)s)") + parser.add_option('--prefix', dest="prefix", default='.', + help="Installation directory (default .)") - parser.add_argument('--config', default='config_appli.xml', - metavar="", - help="XML configuration file (default %(default)s)") + parser.add_option('--config', dest="config", default='config_appli.xml', + help="XML configuration file (default config_appli.xml)") - parser.add_argument('-v', '--verbose', action='count', + parser.add_option('-v', '--verbose', action='count', dest='verbose', default=0, help="Increase verbosity") - options = parser.parse_args() + 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)