From: akl <akl@opencascade.com>
Date: Fri, 27 Feb 2009 13:19:29 +0000 (+0000)
Subject: Fix issue 0020160:[CEA:321] (installation wizard should make the difference between... 
X-Git-Tag: V4_1_4sp2~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0749d9a5762dc9e2a1d50cd695e61f1962d6d28a;p=tools%2Finstall.git

Fix issue 0020160:[CEA:321] (installation wizard should make the difference between optional and mandatory "missing libraries"): a new attribute 'optionallibs' was added to 'config' section of XML configuration file. IW processes it and makes difference between 'not found' libraries.
---

diff --git a/config.xml b/config.xml
index 286f60c..06d61e4 100644
--- a/config.xml
+++ b/config.xml
@@ -6,7 +6,8 @@
           license="&lt;h5>GNU LGPL&lt;/h5>"
 	  platforms="Debian 4.0 64bit,Debian 3.1,Mandrake 10.1,Mandriva 2006.0,Mandriva 2006.0 64bit,Mandriva 2007.0,Mandriva 2008.0,Mandriva 2008.0 64bit,Red Hat 8.0,Red Hat 9,Red Hat Enterprise WS 4,Scientific SL 4.2,Scientific SL 4.3"
 	  targetdir="${HOME}/salome_4.1.2"
-	  tempdir="/tmp"/>
+	  tempdir="/tmp"
+	  optionallibs="libcppunit,libblsurf"/>
 
   <buttons>
     <button label="Launch SALOME"
diff --git a/config_Debian_3.1.xml b/config_Debian_3.1.xml
index 5dc4fea..cd18115 100755
--- a/config_Debian_3.1.xml
+++ b/config_Debian_3.1.xml
@@ -6,7 +6,8 @@
           license="&lt;h5>GNU LGPL&lt;/h5>"
 	  platforms="Debian 3.1"
 	  targetdir="${HOME}/salome_4.1.4"
-	  tempdir="/tmp"/>
+	  tempdir="/tmp"
+	  optionallibs="libcppunit,libblsurf"/>
 
   <buttons>
     <button label="Launch SALOME"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index 93eae4e..198dbea 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -6,7 +6,8 @@
           license="&lt;h5>GNU LGPL&lt;/h5>"
 	  platforms="Debian 4.0"
 	  targetdir="${HOME}/salome_4.1.4"
-	  tempdir="/tmp"/>
+	  tempdir="/tmp"
+	  optionallibs="libcppunit,libblsurf"/>
 
   <buttons>
     <button label="Launch SALOME"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index fca8979..a801c73 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -6,7 +6,8 @@
           license="&lt;h5>GNU LGPL&lt;/h5>"
 	  platforms="Debian 4.0 64bit"
 	  targetdir="${HOME}/salome_4.1.4"
-	  tempdir="/tmp"/>
+	  tempdir="/tmp"
+	  optionallibs="libcppunit,libblsurf"/>
 
   <buttons>
     <button label="Launch SALOME"
diff --git a/config_Mandrake_10.1.xml b/config_Mandrake_10.1.xml
index 0c095d5..090a7ec 100755
--- a/config_Mandrake_10.1.xml
+++ b/config_Mandrake_10.1.xml
@@ -6,7 +6,8 @@
           license="&lt;h5>GNU LGPL&lt;/h5>"
 	  platforms="Mandrake 10.1"
 	  targetdir="${HOME}/salome_4.1.4"
-	  tempdir="/tmp"/>
+	  tempdir="/tmp"
+	  optionallibs="libcppunit,libblsurf"/>
 
   <buttons>
     <button label="Launch SALOME"
diff --git a/config_Mandriva_2006.0.xml b/config_Mandriva_2006.0.xml
index 337879f..c14697c 100755
--- a/config_Mandriva_2006.0.xml
+++ b/config_Mandriva_2006.0.xml
@@ -6,7 +6,8 @@
           license="&lt;h5>GNU LGPL&lt;/h5>"
 	  platforms="Mandriva 2006.0"
 	  targetdir="${HOME}/salome_4.1.4"
-	  tempdir="/tmp"/>
+	  tempdir="/tmp"
+	  optionallibs="libcppunit,libblsurf"/>
 
   <buttons>
     <button label="Launch SALOME"
diff --git a/config_Mandriva_2006.0_64bit.xml b/config_Mandriva_2006.0_64bit.xml
index 9e059a8..f76cfc7 100755
--- a/config_Mandriva_2006.0_64bit.xml
+++ b/config_Mandriva_2006.0_64bit.xml
@@ -6,7 +6,8 @@
 	  license="&lt;h5>GNU LGPL&lt;/h5>"
 	  platforms="Mandriva 2006.0 64bit"
 	  targetdir="${HOME}/salome_4.1.4"
-	  tempdir="/tmp"/>
+	  tempdir="/tmp"
+	  optionallibs="libcppunit,libblsurf"/>
 
   <buttons>
     <button label="Launch SALOME"
diff --git a/config_Mandriva_2007.0.xml b/config_Mandriva_2007.0.xml
index dd21050..8f3b962 100755
--- a/config_Mandriva_2007.0.xml
+++ b/config_Mandriva_2007.0.xml
@@ -6,7 +6,8 @@
           license="&lt;h5>GNU LGPL&lt;/h5>"
 	  platforms="Mandriva 2007.0"
 	  targetdir="${HOME}/salome_4.1.4"
-	  tempdir="/tmp"/>
+	  tempdir="/tmp"
+	  optionallibs="libcppunit,libblsurf"/>
 
   <buttons>
     <button label="Launch SALOME"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index 355ffba..7539d5a 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -6,7 +6,8 @@
           license="&lt;h5>GNU LGPL&lt;/h5>"
 	  platforms="Mandriva 2008.0"
 	  targetdir="${HOME}/salome_4.1.4"
-	  tempdir="/tmp"/>
+	  tempdir="/tmp"
+	  optionallibs="libcppunit,libblsurf"/>
 
   <buttons>
     <button label="Launch SALOME"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 9e6f270..fcb57f7 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -6,7 +6,8 @@
           license="&lt;h5>GNU LGPL&lt;/h5>"
 	  platforms="Mandriva 2008.0 64bit"
 	  targetdir="${HOME}/salome_4.1.4"
-	  tempdir="/tmp"/>
+	  tempdir="/tmp"
+	  optionallibs="libcppunit,libblsurf"/>
 
   <buttons>
     <button label="Launch SALOME"
diff --git a/config_RedHatEnterprise_4.xml b/config_RedHatEnterprise_4.xml
index f2fca5e..b0dae8c 100755
--- a/config_RedHatEnterprise_4.xml
+++ b/config_RedHatEnterprise_4.xml
@@ -6,7 +6,8 @@
           license="&lt;h5>GNU LGPL&lt;/h5>"
 	  platforms="Red Hat Enterprise WS 4"
 	  targetdir="${HOME}/salome_4.1.4"
-	  tempdir="/tmp"/>
+	  tempdir="/tmp"
+	  optionallibs="libcppunit,libblsurf"/>
 
   <buttons>
     <button label="Launch SALOME"
diff --git a/config_RedHat_8.0.xml b/config_RedHat_8.0.xml
index 3ebcbe7..5d5b45f 100755
--- a/config_RedHat_8.0.xml
+++ b/config_RedHat_8.0.xml
@@ -6,7 +6,8 @@
           license="&lt;h5>GNU LGPL&lt;/h5>"
 	  platforms="Red Hat 8.0"
 	  targetdir="${HOME}/salome_4.1.4"
-	  tempdir="/tmp"/>
+	  tempdir="/tmp"
+	  optionallibs="libcppunit,libblsurf"/>
 
   <buttons>
     <button label="Launch SALOME"
diff --git a/config_RedHat_9.xml b/config_RedHat_9.xml
index fb38a90..68803cd 100755
--- a/config_RedHat_9.xml
+++ b/config_RedHat_9.xml
@@ -6,7 +6,8 @@
           license="&lt;h5>GNU LGPL&lt;/h5>"
 	  platforms="Red Hat 9"
 	  targetdir="${HOME}/salome_4.1.4"
-	  tempdir="/tmp"/>
+	  tempdir="/tmp"
+	  optionallibs="libcppunit,libblsurf"/>
 
   <buttons>
     <button label="Launch SALOME"
diff --git a/config_Scientific_4.3.xml b/config_Scientific_4.3.xml
index c778a2e..76dcdb2 100755
--- a/config_Scientific_4.3.xml
+++ b/config_Scientific_4.3.xml
@@ -6,7 +6,8 @@
           license="&lt;h5>GNU LGPL&lt;/h5>"
 	  platforms="Scientific SL 4.3"
 	  targetdir="${HOME}/salome_4.1.4"
-	  tempdir="/tmp"/>
+	  tempdir="/tmp"
+	  optionallibs="libcppunit,libblsurf"/>
 
   <buttons>
     <button label="Launch SALOME"
diff --git a/config_Scientific_SL_4.2.xml b/config_Scientific_SL_4.2.xml
index 974392b..84dafc5 100755
--- a/config_Scientific_SL_4.2.xml
+++ b/config_Scientific_SL_4.2.xml
@@ -6,7 +6,8 @@
           license="&lt;h5>GNU LGPL&lt;/h5>"
 	  platforms="Scientific SL 4.2"
 	  targetdir="${HOME}/salome_4.1.4"
-	  tempdir="/tmp"/>
+	  tempdir="/tmp"
+	  optionallibs="libcppunit,libblsurf"/>
 
   <buttons>
     <button label="Launch SALOME"
diff --git a/runInstall b/runInstall
index 3f82079..70bfc6c 100755
--- a/runInstall
+++ b/runInstall
@@ -373,6 +373,7 @@ class Config :
     - SALOME platform version
     - Copyright and license info
     - Default target and temporary directories
+    - List of optional libraries for Salome
     """
     def __init__(self,
                  theVersion   = None,
@@ -381,7 +382,8 @@ class Config :
                  theLicense   = None,
                  thePlatforms = None,
                  theTargetdir = None,
-                 theTmpdir    = None):
+                 theTmpdir    = None,
+                 theOptLibs   = None):
         self.version   = strip(theVersion)
         self.caption   = strip(theCaption)
         self.copyright = strip(theCopyright)
@@ -389,6 +391,7 @@ class Config :
         self.platforms = strip(thePlatforms)
         self.targetdir = strip(theTargetdir)
         self.tmpdir    = strip(theTmpdir)
+        self.optlibs   = strip(theOptLibs)
 
 #==============================================================
 # class Product : pre-requisite product options
@@ -456,7 +459,8 @@ class ConfigParser:
                              configElem.getAttribute('license').strip(),
                              configElem.getAttribute('platforms').strip(),
                              configElem.getAttribute('targetdir').strip(),
-                             configElem.getAttribute('tempdir').strip())
+                             configElem.getAttribute('tempdir').strip(),
+                             configElem.getAttribute('optionallibs').strip())
         if not self.pltname and self.config.platforms:
             self.pltname = self.config.platforms.split(",")[0].strip()
         pass
@@ -1098,6 +1102,46 @@ def select_platform(all_platforms):
         pass
     return pltname, all_platforms[pltname]
 
+#==============================================================
+# Check existence of required libraries in system and
+# warn user if some ones are absent
+#===============================================================
+def check_not_found_libs(filepath, optlibs):
+    a_file = open(filepath, 'r')
+    nf_mand_libs = list()
+    nf_opt_libs = list()
+    pref_opt_libs = optlibs.split(",")
+    for line in a_file:
+        line = line.strip()
+        if not line:
+            continue
+        line = line.split(" ")[0]
+        if line in nf_mand_libs or line in nf_opt_libs:
+            continue
+        is_optional = False;
+        for opt_lib in pref_opt_libs:
+            if line.lower().startswith(opt_lib.lower().strip()):
+                is_optional = True
+                break
+        if is_optional:
+            nf_opt_libs.append(line)
+        else:
+            nf_mand_libs.append(line)
+        pass
+
+    msg = "=== WARNING: Some libraries are absent! ===\n"
+    if nf_mand_libs:
+        msg += "One or several MANDATORY libraries listed below are not found. SALOME may not work properly.\n\t"
+        msg += "\n\t".join(nf_mand_libs)
+        msg += "\n"
+    if nf_opt_libs:
+        msg += "One or several OPTIONAL libraries listed below are not found. This does not affect on the correct work of SALOME platform.\n\t"
+        msg += "\n\t".join(nf_opt_libs)
+    if nf_mand_libs or nf_opt_libs:
+        print msg
+    a_file.close()
+    pass
+
 #------------------------------------------------------------------#
 #                                                                  #
 #                    EXECUTION STARTS HERE                         #
@@ -1301,12 +1345,6 @@ if __name__ == "__main__":
         rm_src_tmp = "FALSE"
         pass
 
-    # modify *.la files, if --single-directory option was  -----------
-    if is_single_dir:
-        message("Modifying of *.la files of SALOME modules...")
-        cmd = '%s/modifyLaFiles.sh modify_la_files %s' % (scripts_dir, target_dir)
-        res = os.system(cmd)
-
     # pickup environment -----------
     message("Creating environment files")
     for product in parser.products :
@@ -1333,6 +1371,19 @@ if __name__ == "__main__":
             pass
         pass
 
+    if not is_force_src:
+        if is_single_dir:
+            # modify *.la files, if --single-directory option was pointed -----------
+            message("Modifying of *.la files of SALOME modules...")
+            cmd = '%s/modifyLaFiles.sh modify_la_files %s' % (scripts_dir, target_dir)
+            res = os.system(cmd)
+        else:
+            # check that all required libraries are in system
+            message("Check existence of Fortran and other required libraries...")
+            cmd = '%s/checkFortran.sh find_libraries %s > %s/not_found_libs.txt' % (scripts_dir, target_dir, tmp_dir)
+            if os.system(cmd):
+                check_not_found_libs("%s/not_found_libs.txt" % (tmp_dir), parser.config.optlibs)
+
     # clean temporary directory -----------
     message("Cleaning temporary directory")
     clean_all()