Salome HOME
projects
/
tools
/
sat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix the generate command
[tools/sat.git]
/
commands
/
configure.py
diff --git
a/commands/configure.py
b/commands/configure.py
index 9349fed1101357a2cdd9ba3f0ea912195a239153..2fe672c9662bfddf46e5cc82a38e4fc91ba72399 100644
(file)
--- 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()
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)
# 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)
@@
-186,7
+193,7
@@
def run(args, runner, logger):
# check that the command has been called with an application
src.check_config_has_application( runner.cfg )
# check that the command has been called with an application
src.check_config_has_application( runner.cfg )
- # Get the list of products to t
h
reat
+ # Get the list of products to treat
products_infos = get_products_list(options, runner.cfg, logger)
# Print some informations
products_infos = get_products_list(options, runner.cfg, logger)
# Print some informations
@@
-199,6
+206,8
@@
def run(args, runner, logger):
# Call the function that will loop over all the products and execute
# the right command(s)
# Call the function that will loop over all the products and execute
# the right command(s)
+ if options.option is None:
+ options.option = ""
res = configure_all_products(runner.cfg, products_infos, options.option, logger)
# Print the final state
res = configure_all_products(runner.cfg, products_infos, options.option, logger)
# Print the final state