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
sat job: be able to pass global options to a specific command (sat -o ... command)
[tools/sat.git]
/
commands
/
make.py
diff --git
a/commands/make.py
b/commands/make.py
index 9d885b33bf16ca4d9cdbe50294f70008227d0b03..6cd7bac762b4efe924898d5af37e7b63da799a63 100644
(file)
--- a/
commands/make.py
+++ b/
commands/make.py
@@
-24,10
+24,10
@@
import src
# Define all possible option for the make command : sat make <options>
parser = src.options.Options()
parser.add_option('p', 'products', 'list2', 'products',
# Define all possible option for the make command : sat make <options>
parser = src.options.Options()
parser.add_option('p', 'products', 'list2', 'products',
- _('products to configure. This option can be'
+ _('
Optional:
products to configure. This option can be'
' passed several time to configure several products.'))
parser.add_option('o', 'option', 'string', 'option',
' passed several time to configure several products.'))
parser.add_option('o', 'option', 'string', 'option',
- _('Option to add to the make command.'), "")
+ _('Option
al: Option
to add to the make command.'), "")
def get_products_list(options, cfg, logger):
'''method that gives the product list with their informations from
def get_products_list(options, cfg, logger):
'''method that gives the product list with their informations from
@@
-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()
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)
@@
-201,7
+208,10
@@
def description():
:rtype: str
'''
return _("The make command executes the \"make\" command in"
:rtype: str
'''
return _("The make command executes the \"make\" command in"
- " the build directory")
+ " the build directory.\nIn case of a product that is constructed "
+ "using a script (build_source : \"script\"), then the make "
+ "command executes the script.\n\nexample:\nsat make SALOME-master "
+ "--products Python,KERNEL,GUI")
def run(args, runner, logger):
'''method that is called when salomeTools is called with make parameter.
def run(args, runner, logger):
'''method that is called when salomeTools is called with make parameter.
@@
-213,7
+223,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
@@
-227,6
+237,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 = make_all_products(runner.cfg, products_infos, options.option, logger)
# Print the final state
res = make_all_products(runner.cfg, products_infos, options.option, logger)
# Print the final state