fix the generate command

[tools/sat.git] / commands / makeinstall.py

diff --git a/commands/makeinstall.py b/commands/makeinstall.py
index bff343148fc522ec393c4b4d27f66b83c800d470..22409ab8dfe90235a8124adf9d82acdca12b0f33 100644 (file)
--- 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 <options>
+# Define all possible option for the makeinstall command : sat makeinstall <options>
 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