From bce70ebc193700cc85ecdd53d659969cec94fcaa Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Tue, 3 Apr 2012 19:48:38 +0000
Subject: [PATCH] SALOME 6.5.0 preparation: update script for qwt (5.2.1)

---
 config_CentOS_5.5_64bit.xml              |  2 +-
 config_Debian_4.0.xml                    |  2 +-
 config_Debian_4.0_64bit.xml              |  2 +-
 config_Debian_5.0_64bit.xml              |  2 +-
 config_Debian_6.0_64bit.xml              |  2 +-
 config_Mandriva_2008.0.xml               |  2 +-
 config_Mandriva_2008.0_64bit.xml         |  2 +-
 config_Mandriva_2010.0.xml               |  2 +-
 config_Mandriva_2010.0_64bit.xml         |  2 +-
 config_Red_Hat_Enterprise_WS_4_64bit.xml |  2 +-
 config_Scientific_SL_5.1_64bit.xml       |  2 +-
 config_files/{qwt-5.2.1.sh => qwt.sh}    | 10 ++++++++--
 12 files changed, 19 insertions(+), 13 deletions(-)
 rename config_files/{qwt-5.2.1.sh => qwt.sh} (97%)

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index db96f67..defef72 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -507,7 +507,7 @@
                     version="5.2.1" 
 		    disable="false"
 		    installdiskspace="9988,10828,23964"
-		    script="qwt-5.2.1.sh"/>
+		    script="qwt.sh"/>
     </product>
     <product name="OmniORB"
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index ddc4514..7d805ae 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -507,7 +507,7 @@
                     version="5.2.1" 
 		    disable="false"
 		    installdiskspace="9988,10828,23964"
-		    script="qwt-5.2.1.sh"/>
+		    script="qwt.sh"/>
     </product>
     <product name="OmniORB"
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index c669208..14f41a9 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -507,7 +507,7 @@
                     version="5.2.1" 
 		    disable="false"
 		    installdiskspace="9988,10828,23964"
-		    script="qwt-5.2.1.sh"/>
+		    script="qwt.sh"/>
     </product>
     <product name="OmniORB"
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index bde8a9b..c2b3200 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -507,7 +507,7 @@
                     version="5.2.1" 
 		    disable="false"
 		    installdiskspace="9988,10828,23964"
-		    script="qwt-5.2.1.sh"/>
+		    script="qwt.sh"/>
     </product>
     <product name="OmniORB"
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 51a7fce..48008a5 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -507,7 +507,7 @@
                     version="5.2.1" 
 		    disable="false"
 		    installdiskspace="9988,10828,23964"
-		    script="qwt-5.2.1.sh"/>
+		    script="qwt.sh"/>
     </product>
     <product name="OmniORB"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index 2567021..6909b01 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -507,7 +507,7 @@
                     version="5.2.1" 
 		    disable="false"
 		    installdiskspace="9988,10828,23964"
-		    script="qwt-5.2.1.sh"/>
+		    script="qwt.sh"/>
     </product>
     <product name="OmniORB"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 8a055e4..22f050c 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -507,7 +507,7 @@
                     version="5.2.1" 
 		    disable="false"
 		    installdiskspace="9988,10828,23964"
-		    script="qwt-5.2.1.sh"/>
+		    script="qwt.sh"/>
     </product>
     <product name="OmniORB"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index cf14dbc..7cfde8e 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -507,7 +507,7 @@
                     version="5.2.1" 
 		    disable="false"
 		    installdiskspace="9988,10828,23964"
-		    script="qwt-5.2.1.sh"/>
+		    script="qwt.sh"/>
     </product>
     <product name="OmniORB"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index 3e973d6..0ca9065 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -507,7 +507,7 @@
                     version="5.2.1" 
 		    disable="false"
 		    installdiskspace="9988,10828,23964"
-		    script="qwt-5.2.1.sh"/>
+		    script="qwt.sh"/>
     </product>
     <product name="OmniORB"
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index a5646e7..2eed410 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -507,7 +507,7 @@
                     version="5.2.1" 
 		    disable="false"
 		    installdiskspace="9988,10828,23964"
-		    script="qwt-5.2.1.sh"/>
+		    script="qwt.sh"/>
     </product>
     <product name="OmniORB"
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index 9716394..c005416 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -507,7 +507,7 @@
                     version="5.2.1" 
 		    disable="false"
 		    installdiskspace="9988,10828,23964"
-		    script="qwt-5.2.1.sh"/>
+		    script="qwt.sh"/>
     </product>
     <product name="OmniORB"
 	     type="prerequisite"
diff --git a/config_files/qwt-5.2.1.sh b/config_files/qwt.sh
similarity index 97%
rename from config_files/qwt-5.2.1.sh
rename to config_files/qwt.sh
index 87874b1..6ffa469 100755
--- a/config_files/qwt-5.2.1.sh
+++ b/config_files/qwt.sh
@@ -1,12 +1,12 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : qwt-5.2.1.sh
+#  File      : qwt.sh
 #  Created   : Thu Dec 18 12:01:00 2002
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2008 CEA
+#  Copyright : 2002-2012 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -94,8 +94,12 @@ mv -f designer/designer.pro.new designer/designer.pro
 INSTALL_ROOT_PREV=$INSTALL_ROOT
 unset INSTALL_ROOT
 
+# configure with qmake
+
 qmake
 
+# make
+
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
@@ -103,6 +107,8 @@ EOF
 
 check_job ${PRODUCT_DIR}/MAKE.LOG make
 
+# make install
+
 check_job ${PRODUCT_DIR}/MAKE_INSTALL.LOG make install
 
 if [ "${INSTALL_ROOT_PREV}" != "" ] ; then
-- 
2.39.2