From: crouzet <nicolas.crouzet@cea.fr>
Date: Tue, 5 Jun 2018 07:26:25 +0000 (+0200)
Subject: sat #8560 : ajout des poignées set_env_build et set_env_launch pour mieux gérer les... 
X-Git-Tag: 5.1.0~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d3a5654146d64286ed5e92b1956329c993c7e105;p=tools%2Fsat.git

sat #8560 : ajout des poignées set_env_build et set_env_launch pour mieux gérer les environnement de build
---

diff --git a/src/environment.py b/src/environment.py
index b343c59..66efe01 100644
--- a/src/environment.py
+++ b/src/environment.py
@@ -644,10 +644,22 @@ class SalomeEnviron:
             pyproduct = imp.load_source(product_info.name + "_env_script",
                                         env_script)
             if not native:
-                pyproduct.set_env(self,
-                                  product_info.install_dir,
-                                  product_info.version)
+                if self.forBuild and "set_env_build" in dir(pyproduct):
+                    pyproduct.set_env_build(self,
+                                            product_info.install_dir,
+                                            product_info.version)
+                elif (not self.forBuild) and "set_env_launch" in dir(pyproduct):
+                    pyproduct.set_env_launch(self,
+                                            product_info.install_dir,
+                                            product_info.version)
+                else:
+                    # at least this one is mandatoryi,
+                    # if set_env_build and set_env_build are not defined
+                    pyproduct.set_env(self,
+                                      product_info.install_dir,
+                                      product_info.version)
             else:
+                # not mandatory, if set_nativ_env not defined, we do nothing
                 if "set_nativ_env" in dir(pyproduct):
                     pyproduct.set_nativ_env(self)
         except: