X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=commands%2Fmakeinstall.py;h=22409ab8dfe90235a8124adf9d82acdca12b0f33;hb=a7fc6fb910cec5f80e37071ed13e91d2493f29e8;hp=bff343148fc522ec393c4b4d27f66b83c800d470;hpb=2f38beaea8436fdb26d4f2516340cf33361d0b95;p=tools%2Fsat.git diff --git a/commands/makeinstall.py b/commands/makeinstall.py index bff3431..22409ab 100644 --- a/commands/makeinstall.py +++ b/commands/makeinstall.py @@ -20,7 +20,7 @@ import os import src -# Define all possible option for the makeinstall command : sat makeinstall +# Define all possible option for the makeinstall command : sat makeinstall parser = src.options.Options() parser.add_option('p', 'products', 'list2', 'products', _('products to configure. This option can be' @@ -108,12 +108,19 @@ def makeinstall_product(p_name_info, config, logger): # Logging logger.write("\n", 4, False) logger.write("################ ", 4) - header = _("Make of %s") % src.printcolors.printcLabel(p_name) + header = _("Make install of %s") % src.printcolors.printcLabel(p_name) header += " %s " % ("." * (20 - len(p_name))) logger.write(header, 3) logger.write("\n", 4, False) logger.flush() - + + # Do nothing if he product is not compilable + if ("properties" in p_info and "compilation" in p_info.properties and + p_info.properties.compilation == "no"): + log_step(logger, header, "ignored") + logger.write("\n", 3, False) + return 0 + # Instantiate the class that manages all the construction commands # like cmake, make, make install, make test, environment management, etc... builder = src.compilation.Builder(config, logger, p_info) @@ -169,7 +176,7 @@ def run(args, runner, logger): # check that the command has been called with an application src.check_config_has_application( runner.cfg ) - # Get the list of products to threat + # Get the list of products to treat products_infos = get_products_list(options, runner.cfg, logger) # Print some informations