]> SALOME platform Git repositories - tools/sat.git/commitdiff
Salome HOME
Do not compile a product if it has the property compilable to no
authorSerge Rehbinder <serge.rehbinder@cea.fr>
Wed, 7 Sep 2016 09:34:32 +0000 (11:34 +0200)
committerSerge Rehbinder <serge.rehbinder@cea.fr>
Wed, 7 Sep 2016 09:34:32 +0000 (11:34 +0200)
commands/compile.py
commands/configure.py
commands/make.py
commands/makeinstall.py

index 78530a896090e418bc8f576b4a3ce312e2951fe2..3543d38734ba19544fdd24863334b6211c22ffb2 100644 (file)
@@ -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:
index a65a5e7a254125e41bfd7b7738af209491d2c9f7..2fe672c9662bfddf46e5cc82a38e4fc91ba72399 100644 (file)
@@ -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)
index 745a81ee5a88979c4fb59efef662e69a331883af..a3b77cae3df16720c5703a5d029c6eb0b68934cf 100644 (file)
@@ -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)
index ab31dd2572010e209155aa55922a46330d46ba74..22409ab8dfe90235a8124adf9d82acdca12b0f33 100644 (file)
@@ -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)