From: Serge Rehbinder Date: Wed, 7 Sep 2016 09:34:32 +0000 (+0200) Subject: Do not compile a product if it has the property compilable to no X-Git-Tag: 5.0.0a1~147 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=941eef63102ae0968d7133997c76b34d53457612;p=tools%2Fsat.git Do not compile a product if it has the property compilable to no --- diff --git a/commands/compile.py b/commands/compile.py index 78530a8..3543d38 100644 --- a/commands/compile.py +++ b/commands/compile.py @@ -289,7 +289,14 @@ def compile_all_products(sat, config, options, products_infos, logger): 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) + continue + # Clean the build and the install directories # if the corresponding options was called if options.clean_all: diff --git a/commands/configure.py b/commands/configure.py index a65a5e7..2fe672c 100644 --- a/commands/configure.py +++ b/commands/configure.py @@ -117,7 +117,14 @@ def configure_product(p_name_info, conf_option, config, logger): 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) diff --git a/commands/make.py b/commands/make.py index 745a81e..a3b77ca 100644 --- a/commands/make.py +++ b/commands/make.py @@ -121,7 +121,14 @@ def make_product(p_name_info, make_option, config, logger): 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) diff --git a/commands/makeinstall.py b/commands/makeinstall.py index ab31dd2..22409ab 100644 --- a/commands/makeinstall.py +++ b/commands/makeinstall.py @@ -113,7 +113,14 @@ def makeinstall_product(p_name_info, config, logger): 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)