From a02d9e33d535095ca2e4d10c5561fcefa0eb020e Mon Sep 17 00:00:00 2001 From: Serge Rehbinder Date: Thu, 25 Feb 2016 10:59:42 +0100 Subject: [PATCH] Finalization of source command with commentaries --- commands/source.py | 343 +++++++++++++++++++++++++---- data/modules/KERNEL.pyconf | 28 +++ data/modules/MODULE_ARCHIVE.pyconf | 32 +++ data/modules/MODULE_CVS.pyconf | 39 ++++ data/modules/MODULE_DIR.pyconf | 41 ++++ data/modules/MODULE_SVN.pyconf | 37 ++++ data/modules/softA.pyconf | 36 +++ data/modules/softB.pyconf | 36 +++ src/logger.py | 2 + src/module.py | 37 +++- src/system.py | 62 +++++- 11 files changed, 644 insertions(+), 49 deletions(-) create mode 100644 data/modules/KERNEL.pyconf create mode 100644 data/modules/MODULE_ARCHIVE.pyconf create mode 100644 data/modules/MODULE_CVS.pyconf create mode 100644 data/modules/MODULE_DIR.pyconf create mode 100644 data/modules/MODULE_SVN.pyconf create mode 100644 data/modules/softA.pyconf create mode 100644 data/modules/softB.pyconf diff --git a/commands/source.py b/commands/source.py index c3e4dbf..7d07578 100644 --- a/commands/source.py +++ b/commands/source.py @@ -30,90 +30,301 @@ parser.add_option('', 'no_sample', 'boolean', 'no_sample', _("do not prepare sample modules.")) def prepare_for_dev(config, module_info, source_dir, logger, pad): + '''The method called if the module is in development mode + :param config Config: The global configuration + :param module_info Config: The configuration specific to + the module to be prepared + :param source_dir Path: The Path instance corresponding to the + directory where to put the sources + :param logger Logger: The logger instance to use for the display and logging + :param pad int: The gap to apply for the terminal display + :return: True if it succeed, else False + :rtype: boolean + ''' retcode = 'N\A' - # if module sources dir does not exists in dev, - # get it in checkout mode + # if the module source directory does not exist, + # get it in checkout mode, else, do not do anything if not os.path.exists(module_info.source_dir): - retcode = get_module_sources(config, module_info, True, source_dir, logger, pad, checkout=True) + # Call the function corresponding to get the sources with True checkout + retcode = get_module_sources(config, + module_info, + True, + source_dir, + logger, + pad, + checkout=True) logger.write("\n", 3, False) - logger.write(" " * (pad+2), 3, False) # +2 because module name is followed by ': ' + # +2 because module name is followed by ': ' + logger.write(" " * (pad+2), 3, False) - logger.write('dev: %s ... ' % src.printcolors.printcInfo(module_info.source_dir), 3, False) + logger.write('dev: %s ... ' % + src.printcolors.printcInfo(module_info.source_dir), 3, False) logger.flush() return retcode -def prepare_from_git(module_info, source_dir, logger, pad, is_dev=False): - '''Prepares a module from git +def get_sources_from_git(module_info, source_dir, logger, pad, is_dev=False): + '''The method called if the module is to be get in git mode + + :param module_info Config: The configuration specific to + the module to be prepared + :param source_dir Path: The Path instance corresponding to the + directory where to put the sources + :param logger Logger: The logger instance to use for the display and logging + :param pad int: The gap to apply for the terminal display + :param is_dev boolean: True if the module is in development mode + :return: True if it succeed, else False + :rtype: boolean ''' + # The str to display coflag = 'git' + # Get the repository address. (from repo_dev key if the module is + # in dev mode. if is_dev and 'repo_dev' in module_info.git_info: coflag = src.printcolors.printcHighlight(coflag.upper()) repo_git = module_info.git_info.repo_dev else: repo_git = module_info.git_info.repo - - logger.write('%s:%s' % (coflag, src.printcolors.printcInfo(repo_git)), 3, False) + # Display informations + logger.write('%s:%s' % (coflag, src.printcolors.printcInfo(repo_git)), 3, + False) logger.write(' ' * (pad + 50 - len(repo_git)), 3, False) - logger.write(' tag:%s' % src.printcolors.printcInfo(module_info.git_info.tag), 3, False) - logger.write(' %s. ' % ('.' * (10 - len(module_info.git_info.tag))), 3, False) + logger.write(' tag:%s' % src.printcolors.printcInfo( + module_info.git_info.tag), + 3, + False) + logger.write(' %s. ' % ('.' * (10 - len(module_info.git_info.tag))), 3, + False) logger.flush() logger.write('\n', 5, False) + # Call the system function that do the extraction in git mode retcode = src.system.git_extract(repo_git, module_info.git_info.tag, source_dir, logger) return retcode -def prepare_from_archive(module_info, source_dir, logger): +def get_sources_from_archive(module_info, source_dir, logger): + '''The method called if the module is to be get in archive mode + + :param module_info Config: The configuration specific to + the module to be prepared + :param source_dir Path: The Path instance corresponding to the + directory where to put the sources + :param logger Logger: The logger instance to use for the display and logging + :return: True if it succeed, else False + :rtype: boolean + ''' # check archive exists if not os.path.exists(module_info.archive_info.archive_name): - raise src.SatException(_("Archive not found: '%s'") % module_info.archive_info.archive_name) + raise src.SatException(_("Archive not found: '%s'") % + module_info.archive_info.archive_name) - logger.write('arc:%s ... ' % src.printcolors.printcInfo(module_info.archive_info.archive_name), 3, False) + logger.write('arc:%s ... ' % + src.printcolors.printcInfo(module_info.archive_info.archive_name), + 3, + False) logger.flush() - retcode, NameExtractedDirectory = src.system.archive_extract(module_info.archive_info.archive_name, - source_dir.dir(), logger) + # Call the system function that do the extraction in archive mode + retcode, NameExtractedDirectory = src.system.archive_extract( + module_info.archive_info.archive_name, + source_dir.dir(), logger) + + # Rename the source directory if + # it does not match with module_info.source_dir + if (NameExtractedDirectory.replace('/', '') != + os.path.basename(module_info.source_dir)): + shutil.move(os.path.join(os.path.dirname(module_info.source_dir), + NameExtractedDirectory), + module_info.source_dir) - # Rename the source directory if it does not match with module_info.source_dir - if NameExtractedDirectory.replace('/', '') != os.path.basename(module_info.source_dir): - shutil.move(os.path.join(os.path.dirname(module_info.source_dir), NameExtractedDirectory), module_info.source_dir) + return retcode + +def get_sources_from_cvs(user, module_info, source_dir, checkout, logger, pad): + '''The method called if the module is to be get in cvs mode + + :param user str: The user to use in for the cvs command + :param module_info Config: The configuration specific to + the module to be prepared + :param source_dir Path: The Path instance corresponding to the + directory where to put the sources + :param checkout boolean: If True, get the source in checkout mode + :param logger Logger: The logger instance to use for the display and logging + :param pad int: The gap to apply for the terminal display + :return: True if it succeed, else False + :rtype: boolean + ''' + # Get the protocol to use in the command + if "protocol" in module_info.cvs_info: + protocol = module_info.cvs_info.protocol + else: + protocol = "pserver" + + # Construct the line to display + if "protocol" in module_info.cvs_info: + cvs_line = "%s:%s@%s:%s" % \ + (protocol, user, module_info.cvs_info.server, + module_info.cvs_info.module_base) + else: + cvs_line = "%s / %s" % (module_info.cvs_info.server, + module_info.cvs_info.module_base) + + coflag = 'cvs' + if checkout: coflag = src.printcolors.printcHighlight(coflag.upper()) + + logger.write('%s:%s' % (coflag, src.printcolors.printcInfo(cvs_line)), + 3, + False) + logger.write(' ' * (pad + 50 - len(cvs_line)), 3, False) + logger.write(' src:%s' % + src.printcolors.printcInfo(module_info.cvs_info.source), + 3, + False) + logger.write(' ' * (pad + 1 - len(module_info.cvs_info.source)), 3, False) + logger.write(' tag:%s' % + src.printcolors.printcInfo(module_info.cvs_info.tag), + 3, + False) + # at least one '.' is visible + logger.write(' %s. ' % ('.' * (10 - len(module_info.cvs_info.tag))), + 3, + False) + logger.flush() + logger.write('\n', 5, False) + + # Call the system function that do the extraction in cvs mode + retcode = src.system.cvs_extract(protocol, user, + module_info.cvs_info.server, + module_info.cvs_info.module_base, + module_info.cvs_info.tag, + module_info.cvs_info.source, + source_dir, logger, checkout) + return retcode + +def get_sources_from_svn(user, module_info, source_dir, checkout, logger): + '''The method called if the module is to be get in svn mode + + :param user str: The user to use in for the svn command + :param module_info Config: The configuration specific to + the module to be prepared + :param source_dir Path: The Path instance corresponding to the + directory where to put the sources + :param checkout boolean: If True, get the source in checkout mode + :param logger Logger: The logger instance to use for the display and logging + :return: True if it succeed, else False + :rtype: boolean + ''' + coflag = 'svn' + if checkout: coflag = src.printcolors.printcHighlight(coflag.upper()) + + logger.write('%s:%s ... ' % (coflag, + src.printcolors.printcInfo( + module_info.svn_info.repo)), + 3, + False) + logger.flush() + logger.write('\n', 5, False) + # Call the system function that do the extraction in svn mode + retcode = src.system.svn_extract(user, + module_info.svn_info.repo, + module_info.svn_info.tag, + source_dir, + logger, + checkout) + return retcode + +def get_sources_from_dir(module_info, source_dir, logger): + '''The method called if the module is to be get in dir mode + :param module_info Config: The configuration specific to + the module to be prepared + :param source_dir Path: The Path instance corresponding to the + directory where to put the sources + :param logger Logger: The logger instance to use for the display and logging + :return: True if it succeed, else False + :rtype: boolean + ''' + # Check if it is a symlink? + use_link = ('symlink' in module_info.dir_info and + module_info.dir_info.symlink) + dirflag = 'dir' + if use_link: dirflag = 'lnk' + + # check that source exists if it is not a symlink + if (not use_link) and (not os.path.exists(module_info.dir_info.dir)): + raise src.SatException(_("Source directory not found: '%s'") % + module_info.dir_info.dir) + + logger.write('%s:%s ... ' % + (dirflag, src.printcolors.printcInfo(module_info.dir_info.dir)), + 3, + False) + logger.flush() + + if use_link: + retcode = src.Path(source_dir).symlink(module_info.dir_info.dir) + else: + retcode = src.Path(module_info.dir_info.dir).copy(source_dir) + return retcode -def get_module_sources(config, module_info, is_dev, source_dir, logger, pad, checkout=False): +def get_module_sources(config, + module_info, + is_dev, + source_dir, + logger, + pad, + checkout=False): '''Get the module sources. + :param config Config: The global configuration + :param module_info Config: The configuration specific to + the module to be prepared + :param is_dev boolean: True if the module is in development mode + :param source_dir Path: The Path instance corresponding to the + directory where to put the sources + :param logger Logger: The logger instance to use for the display and logging + :param pad int: The gap to apply for the terminal display + :param checkout boolean: If True, get the source in checkout mode + :return: True if it succeed, else False + :rtype: boolean ''' if not checkout and is_dev: return prepare_for_dev(config, module_info, source_dir, logger, pad) if module_info.get_method == "git": - return prepare_from_git(module_info, source_dir, logger, pad, is_dev) + return get_sources_from_git(module_info, source_dir, logger, pad, + is_dev) if module_info.get_method == "archive": - return prepare_from_archive(module_info, source_dir, logger) - ''' + return get_sources_from_archive(module_info, source_dir, logger) + if module_info.get_method == "cvs": - cvs_user = common.get_cfg_param(module_info.cvs_info, "cvs_user", config.USER.cvs_user) - return prepare_from_cvs(cvs_user, module_info, source_dir, checkout, logger, pad) + cvs_user = config.USER.cvs_user + return get_sources_from_cvs(cvs_user, + module_info, + source_dir, + checkout, + logger, + pad) if module_info.get_method == "svn": - svn_user = common.get_cfg_param(module_info.svn_info, "svn_user", config.USER.svn_user) - return prepare_from_svn(svn_user, module_info, source_dir, checkout, logger) - + svn_user = config.USER.svn_user + return get_sources_from_svn(svn_user, module_info, source_dir, + checkout, + logger) + if module_info.get_method == "dir": - return prepare_from_dir(module_info, source_dir, logger) - ''' + return get_sources_from_dir(module_info, source_dir, logger) if len(module_info.get_method) == 0: # skip logger.write('%s ...' % _("ignored"), 3, False) return True - # + # if the get_method is not in [git, archive, cvs, svn, dir] logger.write(_("Unknown get_mehtod %(get)s for module %(module)s") % \ { 'get': module_info.get_method, 'module': module_info.name }, 3, False) logger.write(" ... ", 3, False) @@ -123,30 +334,52 @@ def get_module_sources(config, module_info, is_dev, source_dir, logger, pad, che def get_all_module_sources(config, modules, logger): '''Get all the module sources. + :param config Config: The global configuration + :param modules List: The list of tuples (module name, module informations) + :param logger Logger: The logger instance to be used for the logging + :return: the tuple (number of success, dictionary module_name/success_fail) + :rtype: (int,dict) ''' + # Initialize the variables that will count the fails and success results = dict() good_result = 0 + # Get the maximum name length in order to format the terminal display max_module_name_len = 1 if len(modules) > 0: max_module_name_len = max(map(lambda l: len(l), modules[0])) + 4 + + # The loop on all the modules from which to get the sources for module in modules: + # get module name, module informations and the directory where to put + # the sources module_name = module[0] module_info = module[1] source_dir = src.Path(module_info.source_dir) + # display and log logger.write('%s: ' % src.printcolors.printcLabel(module_name), 3) logger.write(' ' * (max_module_name_len - len(module_name)), 3, False) logger.write("\n", 4, False) - is_dev = "dev_modules" in config.APPLICATION and module_name in config.APPLICATION.dev_modules + # Remove the existing source directory if + # the module is not in development mode + is_dev = ("dev_modules" in config.APPLICATION and + module_name in config.APPLICATION.dev_modules) if source_dir.exists() and not is_dev: logger.write(" " + _('remove %s') % source_dir, 4) logger.write("\n ", 4, False) source_dir.rm() - retcode = get_module_sources(config, module_info, is_dev, source_dir, logger, max_module_name_len, checkout=False) + # Call to the function that get the sources for one module + retcode = get_module_sources(config, + module_info, + is_dev, + source_dir, + logger, + max_module_name_len, + checkout=False) ''' if 'no_rpath' in module_info.keys(): @@ -157,14 +390,21 @@ def get_all_module_sources(config, modules, logger): # show results results[module_name] = retcode if retcode == 'N\A': - res =src.printcolors.printc(src.OK_STATUS) + src.printcolors.printcWarning(_(' source directory already exists')) + # The case where the module was not prepared because it is + # in development mode + res =(src.printcolors.printc(src.OK_STATUS) + + src.printcolors.printcWarning(_( + ' source directory already exists'))) good_result = good_result + 1 elif retcode: + # The case where it succeed res = src.OK_STATUS good_result = good_result + 1 else: + # The case where it failed res = src.KO_STATUS - + + # print the result logger.write('%s\n' % src.printcolors.printc(res), 3, False) return good_result, results @@ -178,30 +418,43 @@ def run(args, runner, logger): # check that the command has been called with an application src.check_config_has_application( runner.cfg ) - logger.write(_('Preparing sources of product %s\n') % - src.printcolors.printcLabel(runner.cfg.VARS.application), 1) + # Print some informations + logger.write(_('Preparing sources of application %s\n') % + src.printcolors.printcLabel(runner.cfg.VARS.application), 1) src.printcolors.print_value(logger, 'out_dir', runner.cfg.APPLICATION.out_dir, 2) logger.write("\n", 2, False) + # Get the modules to be prepared, regarding the options if options.modules is None: + # No options, get all modules sources modules = runner.cfg.APPLICATION.modules else: + # if option --modules, check that all modules of the command line + # are present in the application. modules = options.modules for m in modules: if m not in runner.cfg.APPLICATION.modules: - raise src.SatException(_("Module %(module)s not defined in product %(product)s") % - { 'module': m, 'product': runner.cfg.VARS.product} ) + raise src.SatException(_("Module %(module)s " + "not defined in appplication %(application)s") % + { 'module': m, 'application': runner.cfg.VARS.application} ) + # Construct the list of tuple containing + # the modules name and their definition modules_infos = src.module.get_modules_infos(modules, runner.cfg) - + # if the --no_sample option is invoked, supress the sample modules from + # the list if options.no_sample: - modules_infos = filter(lambda l: not src.module.module_is_sample(l[1]), + modules_infos = filter(lambda l: not src.module.module_is_sample(l[1]), modules_infos) + + # Call to the function that gets all the sources + good_result, results = get_all_module_sources(runner.cfg, + modules_infos, + logger) - good_result, results = get_all_module_sources(runner.cfg, modules_infos, logger) - + # Display the results (how much passed, how much failed, etc...) status = src.OK_STATUS details = [] @@ -219,12 +472,12 @@ def run(args, runner, logger): result = len(modules) - good_result # write results - logger.write(_("Preparing of product's sources:"), 1) + logger.write(_("Getting sources of application:"), 1) logger.write(" " + src.printcolors.printc(status), 1, False) logger.write(" (%s)\n" % res_count, 1, False) if len(details) > 0: - logger.write(_("Following sources haven't been prepared:\n"), 2) + logger.write(_("Following sources haven't been get:\n"), 2) logger.write(" ".join(details), 2) logger.write("\n", 2, False) diff --git a/data/modules/KERNEL.pyconf b/data/modules/KERNEL.pyconf new file mode 100644 index 0000000..973037f --- /dev/null +++ b/data/modules/KERNEL.pyconf @@ -0,0 +1,28 @@ +MODULES : +{ + KERNEL_7_7_1 : + { + name : "KERNEL" + has_gui : "no" + compile_method : "cmake" + get_method : "git" + git_info: + { + repo : "http://git.salome-platform.org/gitpub/modules/kernel.git" + repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name + tag : 'V7_7_1' + } + environ : + { + "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib" + "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib" + "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}" + "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"] + } + depend : [] + opt_depend : [] + module_type : "sample" + source_dir : $APPLICATION.out_dir + $VARS.sep + 'SOURCES' + $VARS.sep + $name + build_dir : $APPLICATION.out_dir + $VARS.sep + 'BUILD' + $VARS.sep + $name + } +} diff --git a/data/modules/MODULE_ARCHIVE.pyconf b/data/modules/MODULE_ARCHIVE.pyconf new file mode 100644 index 0000000..0c88156 --- /dev/null +++ b/data/modules/MODULE_ARCHIVE.pyconf @@ -0,0 +1,32 @@ +MODULES : +{ + MODULE_ARCHIVE : + { + name : "MODULE_ARCHIVE" + has_gui : "no" + compile_method : "cmake" + get_method : "archive" + git_info: + { + repo : "http://git.salome-platform.org/gitpub/modules/kernel.git" + repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name + tag : 'V7_7_1' + } + archive_info: + { + archive_name : '/data/tmpsalome/salome/prerequis/archives/tclx8.4.tar.bz2' + } + environ : + { + "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib" + "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib" + "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}" + "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"] + } + depend : [] + opt_depend : [] + module_type : "sample" + source_dir : $APPLICATION.out_dir + $VARS.sep + 'SOURCES' + $VARS.sep + $name + build_dir : $APPLICATION.out_dir + $VARS.sep + 'BUILD' + $VARS.sep + $name + } +} diff --git a/data/modules/MODULE_CVS.pyconf b/data/modules/MODULE_CVS.pyconf new file mode 100644 index 0000000..0f26867 --- /dev/null +++ b/data/modules/MODULE_CVS.pyconf @@ -0,0 +1,39 @@ +MODULES : +{ + MODULE_CVS_6_7_0 : + { + name : "MODULE_CVS" + has_gui : "no" + compile_method : "cmake" + get_method : "cvs" + git_info: + { + repo : "http://git.salome-platform.org/gitpub/modules/kernel.git" + repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name + tag : 'V7_7_1' + } + archive_info: + { + archive_name : '' + } + cvs_info: + { + server : "cvs.opencascade.com" + module_base : "/home/server/cvs/KERNEL" + source : 'KERNEL_SRC' + tag : "V6_7_0" + } + environ : + { + "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib" + "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib" + "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}" + "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"] + } + depend : [] + opt_depend : [] + module_type : "sample" + source_dir : $APPLICATION.out_dir + $VARS.sep + 'SOURCES' + $VARS.sep + $name + build_dir : $APPLICATION.out_dir + $VARS.sep + 'BUILD' + $VARS.sep + $name + } +} diff --git a/data/modules/MODULE_DIR.pyconf b/data/modules/MODULE_DIR.pyconf new file mode 100644 index 0000000..dccb512 --- /dev/null +++ b/data/modules/MODULE_DIR.pyconf @@ -0,0 +1,41 @@ +MODULES : +{ + MODULE_DIR : + { + name : "MODULE_DIR" + has_gui : "no" + compile_method : "cmake" + get_method : "dir" + git_info: + { + repo : "http://git.salome-platform.org/gitpub/modules/kernel.git" + repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name + tag : 'V7_7_1' + } + archive_info: + { + archive_name : '/data/tmpsalome/salome/prerequis/archives/tclx8.4.tar.bz2' + } + dir_info: + { + dir : '/data/tmpsalome/salome/prerequis/tmp/hdf5-1.8.8debug' + } + svn_info: + { + repo: 'https://www-svn-corpus.cea.fr/corpus/CORPUS' + tag: 'master' + } + environ : + { + "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib" + "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib" + "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}" + "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"] + } + depend : [] + opt_depend : [] + module_type : "sample" + source_dir : $APPLICATION.out_dir + $VARS.sep + 'SOURCES' + $VARS.sep + $name + build_dir : $APPLICATION.out_dir + $VARS.sep + 'BUILD' + $VARS.sep + $name + } +} diff --git a/data/modules/MODULE_SVN.pyconf b/data/modules/MODULE_SVN.pyconf new file mode 100644 index 0000000..3624f40 --- /dev/null +++ b/data/modules/MODULE_SVN.pyconf @@ -0,0 +1,37 @@ +MODULES : +{ + MODULE_SVN : + { + name : "MODULE_SVN" + has_gui : "no" + compile_method : "cmake" + get_method : "svn" + git_info: + { + repo : "http://git.salome-platform.org/gitpub/modules/kernel.git" + repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name + tag : 'V7_7_1' + } + archive_info: + { + archive_name : '/data/tmpsalome/salome/prerequis/archives/tclx8.4.tar.bz2' + } + svn_info: + { + repo: 'https://www-svn-corpus.cea.fr/corpus/CORPUS' + tag: 'master' + } + environ : + { + "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib" + "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib" + "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}" + "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"] + } + depend : [] + opt_depend : [] + module_type : "sample" + source_dir : $APPLICATION.out_dir + $VARS.sep + 'SOURCES' + $VARS.sep + $name + build_dir : $APPLICATION.out_dir + $VARS.sep + 'BUILD' + $VARS.sep + $name + } +} diff --git a/data/modules/softA.pyconf b/data/modules/softA.pyconf new file mode 100644 index 0000000..13ab39b --- /dev/null +++ b/data/modules/softA.pyconf @@ -0,0 +1,36 @@ +MODULES : +{ + softA : + { + name : "softA" + has_gui : "no" + compile_method : "cmake" # ou autotools, ou script + get_method : "git" # "archive", embedded", "native" "fixed" + cvs_info: + { + server : $SITE.prepare.default_cvs_server + module_base : $SITE.prepare.cvs_dir + $name + source : 'softA_SRC' + tag : '' + } + git_info: + { + repo : $SITE.prepare.default_git_server + $VARS.sep + $name + repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name + tag : $APPLICATION.default_version_to_download + } + archive_info: + { + archive_name : $SITE.prepare.archive_dir + $VARS.sep + $name + '.tar.gz' + } + environ : + { + "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib" + "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib" + "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}" + "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"] + } + depend : [] + opt_depend : [] + } +} \ No newline at end of file diff --git a/data/modules/softB.pyconf b/data/modules/softB.pyconf new file mode 100644 index 0000000..0d648c5 --- /dev/null +++ b/data/modules/softB.pyconf @@ -0,0 +1,36 @@ +MODULES : +{ + softB : + { + name : "softB" + has_gui : "no" + compile_method : "cmake" # ou autotools, ou script + get_method : "git" # "archive", embedded", "native" "fixed" + cvs_info: + { + server : $SITE.prepare.default_cvs_server + module_base : $SITE.prepare.cvs_dir + $name + source : 'softB_SRC' + tag : '' + } + git_info: + { + repo : $SITE.prepare.default_git_server + $VARS.sep + $name + repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name + tag : $APPLICATION.default_version_to_download + } + archive_info: + { + archive_name : $SITE.prepare.archive_dir + $VARS.sep + $name + '.tar.gz' + } + environ : + { + "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib" + "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib" + "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}" + "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"] + } + depend : ['softA'] + opt_depend : [] + } +} \ No newline at end of file diff --git a/src/logger.py b/src/logger.py index d686489..ee0ef40 100644 --- a/src/logger.py +++ b/src/logger.py @@ -15,6 +15,8 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +'''In this file are implemented the classes and method relative to the logging +''' import sys import os diff --git a/src/module.py b/src/module.py index da07bdd..ada190d 100644 --- a/src/module.py +++ b/src/module.py @@ -15,19 +15,32 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +'''In this file are implemented the classes and method + relative to the module notion of salomeTools +''' import src def get_module_config(config, module_name, version): + '''Get the specific configuration of a module from the global configuration + + :param config Config: The global configuration + :param module_name str: The name of the module + :param version str: The version of the module + :return: the specific configuration of the module + :rtype: Config + ''' vv = version - for c in ".-": vv = vv.replace(c, "_") # substitute some character with _ + # substitute some character with _ + for c in ".-": vv = vv.replace(c, "_") full_module_name = module_name + '_' + vv mod_info = None + # If it exists, get the information of the module_version if full_module_name in config.MODULES: # returns specific information for the given version mod_info = config.MODULES[full_module_name] - + # Get the standard informations elif module_name in config.MODULES: # returns the generic information (given version not found) mod_info = config.MODULES[module_name] @@ -40,9 +53,20 @@ def get_module_config(config, module_name, version): return mod_info def get_modules_infos(lmodules, config): + '''Get the specific configuration of a list of modules + + :param lmodules List: The list of module names + :param config Config: The global configuration + :return: the list of tuples + (module name, specific configuration of the module) + :rtype: [(str, Config)] + ''' modules_infos = [] + # Loop on module names for mod in lmodules: + # Get the version of the module from the application definition version_mod = config.APPLICATION.modules[mod][0] + # Get the specific configuration of the module mod_info = get_module_config(config, mod, version_mod) if mod_info is not None: modules_infos.append((mod, mod_info)) @@ -52,6 +76,13 @@ def get_modules_infos(lmodules, config): return modules_infos -def module_is_sample(module_info): +def module_is_sample(module_info): + '''Know if a module has the sample type + + :param module_info Config: The configuration specific to + the module to be prepared + :return: True if the module has the sample type, else False + :rtype: boolean + ''' mtype = module_info.module_type return mtype.lower() == 'sample' \ No newline at end of file diff --git a/src/system.py b/src/system.py index 24c0f69..7761cef 100644 --- a/src/system.py +++ b/src/system.py @@ -80,4 +80,64 @@ def archive_extract(from_what, where, logger): return True, os.path.commonprefix(archive.getnames()) except Exception as exc: logger.write("archive_extract: %s\n" % exc) - return False, None \ No newline at end of file + return False, None + +def cvs_extract(protocol, user, server, base, tag, module, where, + logger, checkout=False): + + opttag = '' + if tag is not None and len(tag) > 0: + opttag = '-r ' + tag + + cmd = 'export' + if checkout: + cmd = 'checkout' + elif len(opttag) == 0: + opttag = '-DNOW' + + if len(protocol) > 0: + root = "%s@%s:%s" % (user, server, base) + command = "cvs -d :%(protocol)s:%(root)s %(command)s -d %(where)s %(tag)s %(module)s" % \ + { 'protocol': protocol, 'root': root, 'where': str(where.base()), + 'tag': opttag, 'module': module, 'command': cmd } + else: + command = "cvs -d %(root)s %(command)s -d %(where)s %(tag)s %(base)s/%(module)s" % \ + { 'root': server, 'base': base, 'where': str(where.base()), + 'tag': opttag, 'module': module, 'command': cmd } + + logger.logTxtFile.write(command + "\n") + logger.write(command + "\n", 5) + + if not where.dir().exists(): + where.dir().make() + + res = subprocess.call(command, cwd=str(where.dir()), shell=True, + stdout=logger.logTxtFile, stderr=subprocess.STDOUT) + return (res == 0) + +def svn_extract(user, from_what, tag, where, logger, checkout=False): + if not where.exists(): + where.make() + + if checkout: + command = "svn checkout --username %(user)s %(remote)s %(where)s" % \ + { 'remote': from_what, 'user' : user, 'where': str(where) } + else: + command = "" + if os.path.exists(str(where)): + command = "/bin/rm -rf %(where)s && " % \ + { 'remote': from_what, 'where': str(where) } + + if tag == "master": + command += "svn export --username %(user)s %(remote)s %(where)s" % \ + { 'remote': from_what, 'user' : user, 'where': str(where) } + else: + command += "svn export -r %(tag)s --username %(user)s %(remote)s %(where)s" % \ + { 'tag' : tag, 'remote': from_what, 'user' : user, 'where': str(where) } + + logger.logTxtFile.write(command + "\n") + + logger.write(command + "\n", 5) + res = subprocess.call(command, cwd=str(where.dir()), shell=True, + stdout=logger.logTxtFile, stderr=subprocess.STDOUT) + return (res == 0) \ No newline at end of file -- 2.30.2