X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=runInstall;h=2f81342139fa2f57b02e0127b677b87a251bcb20;hb=6095ce5222ff8d780cda0dae07b6f71f92579096;hp=c854b8243d5e10b14fc49a3c8a8d68775d879ef7;hpb=71bec8db40527eb5b421007be0682dbcef6ecbe7;p=tools%2Finstall.git

diff --git a/runInstall b/runInstall
index c854b82..2f81342 100755
--- a/runInstall
+++ b/runInstall
@@ -7,7 +7,7 @@ import sys, os, string, re
 # get_help_info
 #==============================================================
 def get_help_info() :
-    str = "\nSALOME Professional Installation Wizard\n\n"
+    str = "\nPAL/SALOME Installation Wizard\n\n"
     str = str + "\tUsage : \n\tInstall [-g|b] [-f <xml-file>] [-t <target-dir>] [-tmp <tmp-dir>]\n"
     str = str + "\n"
     str = str + " -g              Runs the Installation Wizard in the GUI mode.\n"
@@ -284,7 +284,8 @@ class Product :
                  theDependencies       = None,
                  theInstalldiskspace   = None,
                  theTemporarydiskspace = None,
-                 theScript             = None):
+                 theScript             = None,
+                 thePickUpEnvironment  = None):
         
 
         self.name               = theName
@@ -296,6 +297,7 @@ class Product :
         self.installdiskspace   = theInstalldiskspace
         self.temporarydiskspace = theTemporarydiskspace
         self.script             = theScript
+        self.pickupEnv          = thePickUpEnvironment
 
 #===================================================================
 # class Config
@@ -343,6 +345,9 @@ class ConfigParser(xmllib.XMLParser):
                            attrs['temporarydiskspace'],
                            attrs['script'])
 
+        if attrs.has_key( 'pickupenv' ):
+            aProduct.pickupEnv = attrs['pickupenv']
+
         self.products.append(aProduct)
 
     def end_product(self):
@@ -365,6 +370,12 @@ class ConfigParser(xmllib.XMLParser):
     def end_path(self):
         pass
 
+    def getProduct(self, prod):
+        for product in self.products:
+            if product.name == prod:
+                return product
+        return None
+
 #================================================================
 # get the path using file name
 #================================================================
@@ -465,7 +476,7 @@ if __name__ == "__main__":
         env["LD_LIBRARY_PATH"] =  ".:" +  env["LD_LIBRARY_PATH"]
         env["PATH"] = ".:"+ env["PATH"]
 
-        sys.exit(os.system("cd " + cur_dir + "; ./bin/SALOMEPRO_InstallWizard " + xml_file +"&"))
+        sys.exit(os.system("cd " + cur_dir + "; ./bin/SALOME_InstallWizard " + xml_file +"&"))
         
         
 
@@ -539,7 +550,8 @@ if __name__ == "__main__":
     #list_of_dep =  get_dependencies_set(parser.products)
 
     if check_disk_space(parser.products, scripts_dir, target_dir, tmp_dir) :
- 
+
+        # install products
         for product in parser.products :
 
             if product.disable == "true": continue
@@ -555,5 +567,21 @@ if __name__ == "__main__":
             res = os.system(cmd)
             if res : break;
 
+        # pickup environment
+        for product in parser.products :
+
+            if product.disable == "true": continue
+
+            if product.pickupEnv == "true":
+                cmd = scripts_dir +  product.script + " " + \
+                      "pickup_env " + \
+                      tmp_dir + " " + \
+                      source_dir + "/" + subdir[product.install] + " " + \
+                      target_dir + " " + \
+                      '"' + list_of_dep + '"' + " " + \
+                      product.name
+                
+                res = os.system(cmd)
+
     if len(root_path) and os.path.exists(root_path):
         os.system("rm -r -f "+ root_path)