evite la construction de l'environnement launch, saus pour la commande sat check

diff --git a/commands/check.py b/commands/check.py
index ffb31af02439e35014fd8904df00541e23165cca..366a1371e05b7e68591235f1c66a0467eb4e9d55 100644 (file)
--- a/commands/check.py
+++ b/commands/check.py
@@ -137,7 +137,7 @@ def check_product(p_name_info, config, logger):
     
     # Prepare the environment
     log_step(logger, header, "PREPARE ENV")
-    res_prepare = builder.prepare()
+    res_prepare = builder.prepare(add_env_launch=True)
     log_res_step(logger, res_prepare)
     
     len_end_line = 20

diff --git a/src/compilation.py b/src/compilation.py
index 210eb522096ea9f2bec2747233ba93ed4bd5536b..e9eb26f8105612d14774d36c96c3b7f4bc7b8ab6 100644 (file)
--- a/src/compilation.py
+++ b/src/compilation.py
@@ -73,7 +73,7 @@ class Builder:
     ##
     # Prepares the environment.
     # Build two environment: one for building and one for testing (launch).
-    def prepare(self):
+    def prepare(self, add_env_launch=False):
 
         if not self.build_dir.exists():
             # create build dir
@@ -96,12 +96,13 @@ class Builder:
         self.build_environ.silent = (self.config.USER.output_verbose_level < 5)
         self.build_environ.set_full_environ(self.logger, environ_info)
         
-        # create runtime environment
-        self.launch_environ = src.environment.SalomeEnviron(self.config,
-                                      src.environment.Environ(dict(os.environ)),
-                                      False)
-        self.launch_environ.silent = True # no need to show here
-        self.launch_environ.set_full_environ(self.logger, environ_info)
+        if add_env_launch:
+               # create runtime environment
+               self.launch_environ = src.environment.SalomeEnviron(self.config,
+                                             src.environment.Environ(dict(os.environ)),
+                                             False)
+               self.launch_environ.silent = True # no need to show here
+               self.launch_environ.set_full_environ(self.logger, environ_info)
 
         for ee in C_COMPILE_ENV_LIST:
             vv = self.build_environ.get(ee)

diff --git a/src/environment.py b/src/environment.py
index 8da1705504bb0f7cc5ee867891c2a4e1370b236a..3bf34cb5bb10c2b7492b268d07c8e3c10c946fa4 100644 (file)
--- a/src/environment.py
+++ b/src/environment.py
@@ -639,12 +639,6 @@ class SalomeEnviron:
             logger.write("licence file found for product %s : %s\n" % (pi.name, licence_file_name), 5) 
             self.set("LICENCE_FILE", licence_file_name)
 
-        # these infos may be needed for the environment of some products
-        if "debug" in pi and pi.debug == "yes":
-            self.set("SAT_DEBUG", "1")
-        if "verbose" in pi and pi.verbose == "yes":
-            self.set("SAT_VERBOSE", "1")
-
         if src.product.product_is_cpp(pi):
             # set a specific environment for cpp modules
             self.set_salome_minimal_product_env(pi, logger)