]> SALOME platform Git repositories - tools/install.git/commitdiff
Salome HOME
Update for Salome 6.2.0
authorinv <inv@opencascade.com>
Fri, 17 Dec 2010 15:59:15 +0000 (15:59 +0000)
committerinv <inv@opencascade.com>
Fri, 17 Dec 2010 15:59:15 +0000 (15:59 +0000)
22 files changed:
README
bin/SALOME_InstallWizard
config_Debian_4.0_64bit.xml
config_files/CAS-6.3sp11-patch.sh [new file with mode: 0755]
config_files/CAS-6.3sp11.sh [new file with mode: 0755]
config_files/CAS-6.3sp9-patch.sh [deleted file]
config_files/CAS-6.3sp9.sh [deleted file]
config_files/MedReader-3.0.0.sh [deleted file]
config_files/ParaView-3.8.sh [deleted file]
config_files/ParaView-3.9.sh [new file with mode: 0755]
config_files/PyQt-4.7.3.sh
config_files/Python-2.6.5.sh [deleted file]
config_files/Python-2.6.6.sh [new file with mode: 0755]
config_files/common.sh
config_files/libxml2-2.6.27.sh [deleted file]
config_files/libxml2-2.7.7.sh [new file with mode: 0755]
config_files/qt-4.6.2.sh [deleted file]
config_files/qt-4.6.3.sh [new file with mode: 0755]
config_files/sphinx-0.6.6.sh [deleted file]
config_files/sphinx-1.0.4.sh [new file with mode: 0755]
doc/readme.html
src/SALOME_InstallWizard.cxx

diff --git a/README b/README
index 8f8e01262fdf5e11e0e8f4ce570b1aab2b9078f4..9890ac8d187f193784e584311e9135c3aba4748a 100644 (file)
--- a/README
+++ b/README
                source salome.csh
 
           where <KERNEL_ROOT_DIR> is KERNEL binaries directory, e.g. 
-          KERNEL_6.1.0 for the 6.1.0 version.
+          KERNEL_6.2.0 for the 6.2.0 version.
 
      2.2. Launching of SALOME
        
           After you set environment you can start SALOME. Go to the KERNEL 
-          module's binaries directory (KERNEL_6.1.0/bin/salome for the version 
-          6.1.0) by using of 'cd' command and then type:
+          module's binaries directory (KERNEL_6.2.0/bin/salome for the version 
+          6.2.0) by using of 'cd' command and then type:
 
                runSalome [<parameters>]
 
           In this scenario it is supposed that you have installed SALOME
           modules sources in the /home/user/salome directory. The name of each module
           sources directory depends on the version of the platform, for example,
-          KERNEL_SRC_6.1.0 for KERNEL module of SALOME version 6.1.0.
+          KERNEL_SRC_6.2.0 for KERNEL module of SALOME version 6.2.0.
 
           Compilation and installation should be performed according to 
           the dependencies between modules:
 
           - create a configuration script by typing
 
-               ../KERNEL_SRC_6.1.0/build_configure
+               ../KERNEL_SRC_6.2.0/build_configure
 
           - run configure script which will check the environment and create 
            Makefile files:
 
-               ../KERNEL_SRC_6.1.0/configure --prefix=/home/user/salome/KERNEL-6.1.0
+               ../KERNEL_SRC_6.2.0/configure --prefix=/home/user/salome/KERNEL-6.2.0
 
           Note, that --prefix option defines the directory where you want to 
           install KERNEL module after 'make install' procedure. configure script
                make install
 
           After you have completed this scenario, KERNEL module is built and 
-          installed into /home/user/salome/KERNEL-6.1.0 directory.
+          installed into /home/user/salome/KERNEL-6.2.0 directory.
 
           - modify your environment scripts:
 
           * for bash:
 
-               export KERNEL_ROOT_DIR=/home/user/salome/KERNEL-6.1.0
+               export KERNEL_ROOT_DIR=/home/user/salome/KERNEL-6.2.0
 
           * for csh:
 
-               setenv KERNEL_ROOT_DIR /home/user/salome/KERNEL-6.1.0
+               setenv KERNEL_ROOT_DIR /home/user/salome/KERNEL-6.2.0
 
           - then repeat this scenario for other modules you want to build taking 
             into account the dependencies between modules (see dependencies table
 
                setenv MODULE_ROOT_DIR /home/user/salome/<MODULE_distribution>
 
-          where <MODULE_distribution> is a MODULE-6.1.0 (see above).
+          where <MODULE_distribution> is a MODULE-6.2.0 (see above).
 
      4.2. Automatic build procedure: build.csh and build.sh scripts
 
index b3b48642fe5acc8b06b965811b4a3130a9ffc0f5..30b1b416d8258fb0d28002464e408e1a5d18cb17 100755 (executable)
Binary files a/bin/SALOME_InstallWizard and b/bin/SALOME_InstallWizard differ
index 26b1617c5558bf6d7a8cf13127163a380f62bbe2..837a3d34fbe7648bc2597ecb1b5e692697baceda 100755 (executable)
@@ -1,11 +1,11 @@
 <document>
 
-  <config version="6.1.0"
+  <config version="6.2.0"
          caption="SALOME v%1"
          copyright="&lt;h5>Copyright (C) 2007-2010 CEA/DEN, EDF R&amp;D, OPEN CASCADE&lt;br>&lt;br>Copyright (C) 2003-2007 OPEN CASCADE,&lt;br>EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D,&lt;br>LEG, PRINCIPIA R&amp;D, BUREAU VERITAS&lt;/h5>"
           license="&lt;h5>GNU LGPL&lt;/h5>"
          platforms="Debian 4.0 64bit"
-         targetdir="${HOME}/salome_6.1.0"
+         targetdir="${HOME}/salome_6.2.0"
          tempdir="/tmp"
          optionallibs="libcppunit,libblsurf"/>
 
@@ -24,7 +24,7 @@
              type="component"
             description="SALOME platform KERNEL module">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="39376,13516,135020"
@@ -35,7 +35,7 @@
              type="component"
             description="SALOME platform GUI module">
       <installation os="Debian 4.0 64bit"
-                   version="6.1.0" 
+                   version="6.2.0" 
                    disable="false"
                    installdiskspace="16852,17076,102216"
                    script="GUI.sh"/>
@@ -44,7 +44,7 @@
              type="component"
             description="SALOME platform GEOM module">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="32484,27092,157884"
@@ -54,7 +54,7 @@
              type="component"
             description="SALOME platform MED module">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="132980,94224,423000"
@@ -64,7 +64,7 @@
              type="component"
             description="SALOME platform SMESH module">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="35052,22268,155620"
@@ -74,7 +74,7 @@
              type="component"
             description="SALOME platform VISU module">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    installdiskspace="28204,13148,128936"
                    script="VISU.sh"/>
@@ -83,7 +83,7 @@
              type="component"
             description="SALOME platform PARAVIS module">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    installdiskspace="161032,1396,599320"
                    script="PARAVIS.sh"/>
@@ -92,7 +92,7 @@
              type="component"
             description="SALOME platform NETGEN meshing algorithm plugin">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="5772,54320,64924"
              type="component"
             description="SALOME platform GHS3D meshing algorithm plugin. For use this plugin you should add the path to ghs3d to your PATH environment variable.">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="816,2360,9188"
              type="component"
             description="SMESH plugin from CEA">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="792,2560,9636"
              type="component"
             description="SMESH plugin from CEA">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="584,2332,8420"
              type="component"
             description="SMESH plugin from CEA sources">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="1356,2756,12000"
              type="component"
             description="SALOME platform COMPONENT module">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    installdiskspace="2960,3100,18892"
                    script="COMPONENT.sh"/>
              type="component"
             description="SALOME platform PYCALCULATOR module">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    installdiskspace="220,2060,5764"
                    script="PYCALCULATOR.sh"/>
              type="component"
             description="SALOME platform CALCULATOR module">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    installdiskspace="1012,2320,8644"
                    script="CALCULATOR.sh"/>
              type="component"
             description="Example SALOME C++ module: Hello.">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    installdiskspace="540,2096,6656"
                    script="HELLO.sh"/>
              type="component"
             description="Example SALOME Python module: Hello.">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    installdiskspace="408,1968,5468"
                    script="PYHELLO.sh"/>
              type="component"
             description="LIGHT (no-CORBA-engine) SALOME module example">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    installdiskspace="248,2080,6364"
                    script="LIGHT.sh"/>
              type="component"
             description="LIGHT Python (no-CORBA-engine) SALOME module example">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    installdiskspace="112,1796,4772"
                    script="PYLIGHT.sh"/>
              type="component"
             description="SALOME-based module implement simple interface to calculate Sierpinsky fields">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    installdiskspace="196,1808,5060"
                    script="RANDOMIZER.sh"/>
              type="component"
             description="SALOME-based module implement simple interface to calculate Sierpinsky fields">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    installdiskspace="480,2316,7680"
                    script="SIERPINSKY.sh"/>
              type="component"
             description="Med Memory package">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="true"
                    installdiskspace="208,221,2958"
                    script="FILTER.sh"/>
              type="component"
             description="Partitioning/decimation module for the SALOME platform">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    installdiskspace="1356,3392,10632"
                    script="MULTIPR.sh"/>
              type="component"
             description="Tool to supervise execution of complex interconnected scientific applications">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    woguimode="false"
                    installdiskspace="49528,27596,226440"
             type="component"
              description="Component and module generator for SALOME">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    installdiskspace="356,668,1200"
                    script="YACSGEN.sh"/>
             type="component"
              description="Component and module generator for SALOME">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    installdiskspace="1880,512,15476"
                    script="JOBMANAGER.sh"/>
              type="component"
             description="SALOME samples files">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="115800,115800,115800"
             type="component"
              description="SALOME module generator">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    installdiskspace="1332,3160,11504"
                    script="HXX2SALOME.sh"/>
             type="component"
              description="SALOME module generator documentation">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    installdiskspace="0,2308,2308"
                    script="HXX2SALOMEDOC.sh"/>
             type="component"
              description="SALOME documentation">
       <installation os="Debian 4.0 64bit"
-                    version="6.1.0" 
+                    version="6.2.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="0,814464,0"
             type="prerequisite"
              description="Python language interpreter">
       <installation os="Debian 4.0 64bit"
-                    version="2.6.5
+                    version="2.6.6
                    disable="false"
                    installdiskspace="75364,64576,169376"
-                   script="Python-2.6.5.sh"/>
+                   script="Python-2.6.6.sh"/>
     </product>
     <product name="Qt" 
             type="prerequisite"
             description="Multiplatform C++ GUI application framework">
       <installation os="Debian 4.0 64bit"
-                    version="4.6.2
+                    version="4.6.3
                    disable="false"
                    installdiskspace="323108,488984,1522808"
-                   script="qt-4.6.2.sh"/>
+                   script="qt-4.6.3.sh"/>
     </product>
     <product name="QScintilla" 
             type="prerequisite"
     </product>
     <product name="OpenCascade" 
             type="prerequisite"
-             description="Open CASCADE version 6.3sp9">
+             description="Open CASCADE version 6.3sp11">
       <installation os="Debian 4.0 64bit"
-                    version="6.3sp9
+                    version="6.3sp11
                    disable="false"
                    installdiskspace="34168,23512,158888"
-                   script="CAS-6.3sp9.sh"/>
+                   script="CAS-6.3sp11.sh"/>
     </product>
     <product name="PatchForOpenCascade" 
             type="prerequisite"
-             description="Patch for Open CASCADE version 6.3sp9">
+             description="Patch for Open CASCADE version 6.3sp11">
       <installation os="Debian 4.0 64bit"
-                    version="6.3sp9
+                    version="6.3sp11
                    disable="true"
                    installdiskspace="241631,268394,1222169"
-                   script="CAS-6.3sp9-patch.sh"/>
+                   script="CAS-6.3sp11-patch.sh"/>
     </product>
     <product name="Qwt" 
             type="prerequisite"
             type="prerequisite"
             description="Scalable, open-source visualization application">
       <installation os="Debian 4.0 64bit"
-                    version="3.8
+                    version="3.9
                    disable="false"
                    installdiskspace="245476,193252,1157792"
-                   script="ParaView-3.8.sh"/>
-    </product>
-    <product name="MedReader"
-            type="prerequisite"
-            description="Plug-in for import med files in PARAVIS module">
-      <installation os="Debian 4.0 64bit"
-                    version="5.0.4" 
-                   disable="false"
-                   installdiskspace="1472,580,8096"
-                   script="MedReader-3.0.0.sh"/>
+                   script="ParaView-3.9.sh"/>
     </product>
     <product name="numpy"
             type="prerequisite"
             type="prerequisite"
              description="Generic batch management library">
       <installation os="Debian 4.0 64bit"
-                    version="1.1.0" 
+                    version="1.2.0" 
                    disable="false"
                    installdiskspace="1552,1148,7192"
-                   script="libBatch-1.1.0.sh"/>
+                   script="libBatch-1.2.0.sh"/>
     </product>
     <product name="expat"
             type="prerequisite"
             type="prerequisite"
              description="Tool for creation of documentation for Python projects">
       <installation os="Debian 4.0 64bit"
-                    version="0.6.6
+                    version="1.0.4
                    disable="false"
                    installdiskspace="2163,3342,6310"
-                   script="sphinx-0.6.6.sh"/>
+                   script="sphinx-1.0.4.sh"/>
     </product>
     <product name="netgen" 
             type="prerequisite"
             type="prerequisite"
              description="XML C parser">
       <installation os="Debian 4.0 64bit"
-                    version="2.6.27" 
+                    version="2.7.7" 
                    disable="false"
                    installdiskspace="14740,43504,81544"
-                   script="libxml2-2.6.27.sh"/>
+                   script="libxml2-2.7.7.sh"/>
     </product>
   </products>
   <dependencies>
       <dep>Hdf</dep>
       <dep>Med</dep>
       <dep>ParaView</dep>
-      <dep>MedReader</dep>
       <dep>OmniORB</dep>
       <dep>Doxygen</dep>
       <dep>Graphviz</dep>
       <dep>Hdf</dep>
       <dep>cmake</dep>
     </product>
-    <product name="MedReader">
-      <dep>Hdf</dep>
-      <dep>Med</dep>
-      <dep>ParaView</dep>
-      <dep>cmake</dep>
-    </product>
     <product name="numpy">
       <dep>Python</dep>
     </product>
diff --git a/config_files/CAS-6.3sp11-patch.sh b/config_files/CAS-6.3sp11-patch.sh
new file mode 100755 (executable)
index 0000000..bb0fed0
--- /dev/null
@@ -0,0 +1,134 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : CAS-6.3sp11.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
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+check_version()
+{
+if [ -z "$CASROOT" ]; then
+    return 1
+fi
+check_lib_version ${CASROOT}/inc/Standard_Version.hxx
+if [ "$?" -ne "0" ] ; then
+    return 1
+fi
+ver_major=`grep "#define OCC_VERSION_MAJOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
+ver_minor=`grep "#define OCC_VERSION_MINOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
+ver_maint=`grep "#define OCC_VERSION_MAINTENANCE" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
+ver="$ver_major.$ver_minor.$ver_maint"
+if [ "$ver" == "6.3" ] ; then
+    return 0
+fi
+return 1
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+##
+# Patch for Open CASCADE 6.3sp11 has been installed
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+##
+# Patch for Open CASCADE 6.3 has been installed
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled()
+{
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+# unpack
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}-patch.tar.gz -C ${INST_ROOT}
+cp -rf ${INST_ROOT}/${PRODUCT}-patch_SRC/* ${PRODUCT_SRC_DIR}
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+#test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR}
+
+# make
+echo " +++++++++++ make"
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE-PATH.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE-PATH.LOG make -j4 install-strip
+
+#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
+cd ${PRODUCT_DIR};
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${INST_ROOT}/${PRODUCT}-patch_SRC && rm -fr ${INST_ROOT}/${PRODUCT}-patch_SRC
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+# create a product directory
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}-patch.tar.gz -C ${PRODUCT_DIR}
+
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="CAS-6.3sp11"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
+source ./common.sh
+$PROCEDURE 
diff --git a/config_files/CAS-6.3sp11.sh b/config_files/CAS-6.3sp11.sh
new file mode 100755 (executable)
index 0000000..b063b90
--- /dev/null
@@ -0,0 +1,283 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : CAS-6.3sp11.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
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+check_version()
+{
+if [ -z "$CASROOT" ]; then
+    return 1
+fi
+check_lib_version ${CASROOT}/inc/Standard_Version.hxx
+if [ "$?" -ne "0" ] ; then
+    return 1
+fi
+ver_major=`grep "#define OCC_VERSION_MAJOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
+ver_minor=`grep "#define OCC_VERSION_MINOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
+ver_maint=`grep "#define OCC_VERSION_MAINTENANCE" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
+ver="$ver_major.$ver_minor.$ver_maint"
+if [ "$ver" == "6.3" ] ; then
+    return 0
+fi
+return 1
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export CASROOT=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${CASROOT}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${CASROOT}/lib:\${CASROOT}/lin/lib:\${LD_LIBRARY_PATH}
+# Variable for Foundation Classes : 
+export CSF_UnitsLexicon=\${CASROOT}/src/UnitsAPI/Lexi_Expr.dat 
+export CSF_UnitsDefinition=\${CASROOT}/src/UnitsAPI/Units.dat 
+# Variable for DataExchange : 
+export CSF_SHMessage=\${CASROOT}/src/SHMessage
+export CSF_XSMessage=\${CASROOT}/src/XSMessage 
+# Variable for Font : 
+export CSF_MDTVFontDirectory=\${CASROOT}/src/FontMFT 
+export CSF_MDTVTexturesDirectory=\${CASROOT}/src/Textures 
+# Activation of OCCT Kernel multithreading :
+export MMGT_REENTRANT=1
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled()
+{
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+# unpack
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR}
+
+# configure
+
+echo " +++++++++++ configure"
+
+is_mandriva2007=0
+is_mandriva2008=0
+is_debian40=0
+
+if [ -e /etc/issue ] ; then
+  grep -e "Mandriva Linux release 2007.0" /etc/issue > /dev/null
+  if [ $? == 0 ] ; then is_mandriva2007=1 ; fi
+fi
+
+if [ -e /etc/issue ] ; then
+  grep -e "Mandriva Linux release 2008.0" /etc/issue > /dev/null
+  if [ $? == 0 ] ; then is_mandriva2008=1 ; fi
+fi
+
+if [ -e /etc/issue ] ; then
+  grep -e "Debian GNU/Linux 4.0" /etc/issue > /dev/null
+  if [ $? == 0 ] ; then is_debian40=1 ; fi
+fi
+
+if [ $is_mandriva2007 == 1 ] || [ $is_mandriva2008 == 1 ] || [ $is_debian40 == 1 ] ; then
+where_xmu_include=/usr/include/X11
+else
+where_xmu_include=/usr/X11R6/include/X11
+fi
+
+flags="$flags --with-xmu-include=$where_xmu_include"
+
+if test `uname -m` = "x86_64" ; then
+    flags="$flags --with-xmu-library=/usr/lib64"
+else
+    flags="$flags --with-xmu-library=/usr/X11R6/lib"
+fi
+
+    flags="$flags LDFLAGS=-lpthread"
+glincdir="`where_gl_includes`"
+if [ $? -eq 0 ] ; then flags="$flags --with-gl-include=$glincdir"; fi
+gllibdir="`where_gl_libs`"
+if [ $? -eq 0 ] ; then flags="$flags --with-gl-library=$gllibdir"; fi
+tcldir="`where_tcl`"
+if [ $? -eq 0 ] ; then flags="$flags --with-tcl=$tcldir"; fi
+tkdir="`where_tk`"
+if [ $? -eq 0 ] ; then flags="$flags --with-tk=$tkdir"; fi
+dpsdir="`where_dps`"
+if [ $? -eq 0 ] ; then flags="$flags --with-dps-include=$dpsdir/include --with-dps-library=$dpsdir/lib"; fi
+flags="$flags --disable-wrappers --disable-wok --disable-debug --enable-production"
+
+export CASROOT=${PRODUCT_SRC_DIR}
+
+echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} $flags  >> ${PRODUCT_DIR}/CONFIGURE.LOG"
+./configure --prefix=${PRODUCT_DIR} $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog
+
+# make
+echo " +++++++++++ make"
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE.LOG make -j4 install-strip
+
+# fix libGL dependencies
+echo " +++++++++++ fix libGL dependencies"
+
+cd ${PRODUCT_DIR}/lib
+
+gllibdir="`where_gl_libs`"
+if [ "$gllibdir" != "" ] ; then
+    if [ -f ${gllibdir}/libGL.la ] ; then
+       libdir=`grep "libdir=" ${gllibdir}/libGL.la | sed -e "s%libdir='\(.*\)'%\1%"`
+       if [ "`ls $libdir/libGL.so* 2>/dev/null`" ] ; then
+           str_to_replace="${gllibdir}/libGL.la"
+       fi
+    fi
+    if [ "$str_to_replace" == "" ] ; then
+       str_to_replace="-L${gllibdir} -lGL"
+    fi
+
+    sed -e "s%-lGL\b%%g"                                                       \
+       -e "s%[^[:space:]]*libGL.la[[:space:]]%%g"                             \
+       -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \
+       libTKOpenGl.la > libTKOpenGl.la.new
+    mv -f libTKOpenGl.la.new libTKOpenGl.la
+fi
+
+#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
+cd ${PRODUCT_DIR};
+
+# remove sources and temporary files after building
+echo "${INSTALL_PRODUCTS}" | grep -q "PatchForOpenCascade"
+if [ $? -eq 1 ] && [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+# create a product directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
+
+is_mandriva2008=0
+
+if [ -e /etc/issue ] ; then
+  grep -e "Mandriva Linux release 2008.0" /etc/issue > /dev/null
+  if [ $? == 0 ] ; then is_mandriva2008=1 ; fi
+fi
+
+# modify *.la files
+ldir=${PRODUCT_DIR}/lib
+if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/Linux/lib; fi
+if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/lin/lib; fi
+cd $ldir
+# 1. set libdir correctly, correct dependencies, set tcldir correctly
+tcldir=`printenv TCLHOME`
+for l in X `find . -name "*.la"`; do
+    if [ "$l" != "X" ] ; then
+       l=`basename $l`
+       libdir=`grep -e "libdir=.*" $l | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"`
+       sed -e "s%${libdir}%${ldir}%g" $l > _$l
+       mv -f _$l $l
+       if [ -n "${tcldir}" ] && [ -d "${tcldir}" ] ; then
+           sed -e "s%-L[^[:space:]]*tcltk[^[:space:]]*/lib%-L${tcldir}/lib%g" $l > _$l
+           mv -f _$l $l
+       fi
+       chmod a+x $l
+    fi
+done
+
+# 2. fix libGL dependencies
+
+#if test "$is_mandriva2008" = "1" && test `uname -m` = "x86_64" ; then
+
+#echo " +++++++++++ libGL dependencies are not updated"
+
+#else
+
+cd $ldir
+gllibdir="`where_gl_libs`"
+if [ "$gllibdir" != "" ] ; then
+    if [ -f ${gllibdir}/libGL.la ] ; then
+       libdir=`grep "libdir=" ${gllibdir}/libGL.la | sed -e "s%libdir='\(.*\)'%\1%"`
+       if [ "`ls $libdir/libGL.so* 2>/dev/null`" ] ; then
+           str_to_replace="${gllibdir}/libGL.la"
+       fi
+fi
+    if [ "$str_to_replace" == "" ] ; then
+       str_to_replace="-L${gllibdir} -lGL"
+    fi
+
+        sed -e "s%-lGL\b%%g"                                                   \
+       -e "s%[^[:space:]\']*libGL.la[[:space:]]%%g"                             \
+       -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \
+       libTKOpenGl.la > libTKOpenGl.la.new
+        mv -f libTKOpenGl.la.new libTKOpenGl.la
+fi
+#fi
+
+# to generate environment script for sources
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="CAS-6.3sp11"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
+source ./common.sh
+$PROCEDURE 
diff --git a/config_files/CAS-6.3sp9-patch.sh b/config_files/CAS-6.3sp9-patch.sh
deleted file mode 100755 (executable)
index 2556da9..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : CAS-6.3sp9.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
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-check_version()
-{
-if [ -z "$CASROOT" ]; then
-    return 1
-fi
-check_lib_version ${CASROOT}/inc/Standard_Version.hxx
-if [ "$?" -ne "0" ] ; then
-    return 1
-fi
-ver_major=`grep "#define OCC_VERSION_MAJOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
-ver_minor=`grep "#define OCC_VERSION_MINOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
-ver_maint=`grep "#define OCC_VERSION_MAINTENANCE" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
-ver="$ver_major.$ver_minor.$ver_maint"
-if [ "$ver" == "6.3" ] ; then
-    return 0
-fi
-return 1
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-##
-# Patch for Open CASCADE 6.3sp9 has been installed
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-##
-# Patch for Open CASCADE 6.3 has been installed
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled()
-{
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-# unpack
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}-patch.tar.gz -C ${INST_ROOT}
-cp -rf ${INST_ROOT}/${PRODUCT}-patch_SRC/* ${PRODUCT_SRC_DIR}
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-#test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-cd ${PRODUCT_SRC_DIR}
-
-# make
-echo " +++++++++++ make"
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE-PATH.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE-PATH.LOG make -j4 install-strip
-
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
-cd ${PRODUCT_DIR};
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${INST_ROOT}/${PRODUCT}-patch_SRC && rm -fr ${INST_ROOT}/${PRODUCT}-patch_SRC
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-# create a product directory
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}-patch.tar.gz -C ${PRODUCT_DIR}
-
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="CAS-6.3sp9"
-export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-source ./common.sh
-$PROCEDURE 
diff --git a/config_files/CAS-6.3sp9.sh b/config_files/CAS-6.3sp9.sh
deleted file mode 100755 (executable)
index 45d7c07..0000000
+++ /dev/null
@@ -1,283 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : CAS-6.3sp9.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
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-check_version()
-{
-if [ -z "$CASROOT" ]; then
-    return 1
-fi
-check_lib_version ${CASROOT}/inc/Standard_Version.hxx
-if [ "$?" -ne "0" ] ; then
-    return 1
-fi
-ver_major=`grep "#define OCC_VERSION_MAJOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
-ver_minor=`grep "#define OCC_VERSION_MINOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
-ver_maint=`grep "#define OCC_VERSION_MAINTENANCE" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
-ver="$ver_major.$ver_minor.$ver_maint"
-if [ "$ver" == "6.3" ] ; then
-    return 0
-fi
-return 1
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export CASROOT=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${CASROOT}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${CASROOT}/lib:\${CASROOT}/lin/lib:\${LD_LIBRARY_PATH}
-# Variable for Foundation Classes : 
-export CSF_UnitsLexicon=\${CASROOT}/src/UnitsAPI/Lexi_Expr.dat 
-export CSF_UnitsDefinition=\${CASROOT}/src/UnitsAPI/Units.dat 
-# Variable for DataExchange : 
-export CSF_SHMessage=\${CASROOT}/src/SHMessage
-export CSF_XSMessage=\${CASROOT}/src/XSMessage 
-# Variable for Font : 
-export CSF_MDTVFontDirectory=\${CASROOT}/src/FontMFT 
-export CSF_MDTVTexturesDirectory=\${CASROOT}/src/Textures 
-# Activation of OCCT Kernel multithreading :
-export MMGT_REENTRANT=1
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled()
-{
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-# unpack
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-cd ${PRODUCT_SRC_DIR}
-
-# configure
-
-echo " +++++++++++ configure"
-
-is_mandriva2007=0
-is_mandriva2008=0
-is_debian40=0
-
-if [ -e /etc/issue ] ; then
-  grep -e "Mandriva Linux release 2007.0" /etc/issue > /dev/null
-  if [ $? == 0 ] ; then is_mandriva2007=1 ; fi
-fi
-
-if [ -e /etc/issue ] ; then
-  grep -e "Mandriva Linux release 2008.0" /etc/issue > /dev/null
-  if [ $? == 0 ] ; then is_mandriva2008=1 ; fi
-fi
-
-if [ -e /etc/issue ] ; then
-  grep -e "Debian GNU/Linux 4.0" /etc/issue > /dev/null
-  if [ $? == 0 ] ; then is_debian40=1 ; fi
-fi
-
-if [ $is_mandriva2007 == 1 ] || [ $is_mandriva2008 == 1 ] || [ $is_debian40 == 1 ] ; then
-where_xmu_include=/usr/include/X11
-else
-where_xmu_include=/usr/X11R6/include/X11
-fi
-
-flags="$flags --with-xmu-include=$where_xmu_include"
-
-if test `uname -m` = "x86_64" ; then
-    flags="$flags --with-xmu-library=/usr/lib64"
-else
-    flags="$flags --with-xmu-library=/usr/X11R6/lib"
-fi
-
-    flags="$flags LDFLAGS=-lpthread"
-glincdir="`where_gl_includes`"
-if [ $? -eq 0 ] ; then flags="$flags --with-gl-include=$glincdir"; fi
-gllibdir="`where_gl_libs`"
-if [ $? -eq 0 ] ; then flags="$flags --with-gl-library=$gllibdir"; fi
-tcldir="`where_tcl`"
-if [ $? -eq 0 ] ; then flags="$flags --with-tcl=$tcldir"; fi
-tkdir="`where_tk`"
-if [ $? -eq 0 ] ; then flags="$flags --with-tk=$tkdir"; fi
-dpsdir="`where_dps`"
-if [ $? -eq 0 ] ; then flags="$flags --with-dps-include=$dpsdir/include --with-dps-library=$dpsdir/lib"; fi
-flags="$flags --disable-wrappers --disable-wok --disable-debug --enable-production"
-
-export CASROOT=${PRODUCT_SRC_DIR}
-
-echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} $flags  >> ${PRODUCT_DIR}/CONFIGURE.LOG"
-./configure --prefix=${PRODUCT_DIR} $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog
-
-# make
-echo " +++++++++++ make"
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make -j4 install-strip
-
-# fix libGL dependencies
-echo " +++++++++++ fix libGL dependencies"
-
-cd ${PRODUCT_DIR}/lib
-
-gllibdir="`where_gl_libs`"
-if [ "$gllibdir" != "" ] ; then
-    if [ -f ${gllibdir}/libGL.la ] ; then
-       libdir=`grep "libdir=" ${gllibdir}/libGL.la | sed -e "s%libdir='\(.*\)'%\1%"`
-       if [ "`ls $libdir/libGL.so* 2>/dev/null`" ] ; then
-           str_to_replace="${gllibdir}/libGL.la"
-       fi
-    fi
-    if [ "$str_to_replace" == "" ] ; then
-       str_to_replace="-L${gllibdir} -lGL"
-    fi
-
-    sed -e "s%-lGL\b%%g"                                                       \
-       -e "s%[^[:space:]]*libGL.la[[:space:]]%%g"                             \
-       -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \
-       libTKOpenGl.la > libTKOpenGl.la.new
-    mv -f libTKOpenGl.la.new libTKOpenGl.la
-fi
-
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
-cd ${PRODUCT_DIR};
-
-# remove sources and temporary files after building
-echo "${INSTALL_PRODUCTS}" | grep -q "PatchForOpenCascade"
-if [ $? -eq 1 ] && [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-# create a product directory
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-
-is_mandriva2008=0
-
-if [ -e /etc/issue ] ; then
-  grep -e "Mandriva Linux release 2008.0" /etc/issue > /dev/null
-  if [ $? == 0 ] ; then is_mandriva2008=1 ; fi
-fi
-
-# modify *.la files
-ldir=${PRODUCT_DIR}/lib
-if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/Linux/lib; fi
-if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/lin/lib; fi
-cd $ldir
-# 1. set libdir correctly, correct dependencies, set tcldir correctly
-tcldir=`printenv TCLHOME`
-for l in X `find . -name "*.la"`; do
-    if [ "$l" != "X" ] ; then
-       l=`basename $l`
-       libdir=`grep -e "libdir=.*" $l | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"`
-       sed -e "s%${libdir}%${ldir}%g" $l > _$l
-       mv -f _$l $l
-       if [ -n "${tcldir}" ] && [ -d "${tcldir}" ] ; then
-           sed -e "s%-L[^[:space:]]*tcltk[^[:space:]]*/lib%-L${tcldir}/lib%g" $l > _$l
-           mv -f _$l $l
-       fi
-       chmod a+x $l
-    fi
-done
-
-# 2. fix libGL dependencies
-
-#if test "$is_mandriva2008" = "1" && test `uname -m` = "x86_64" ; then
-
-#echo " +++++++++++ libGL dependencies are not updated"
-
-#else
-
-cd $ldir
-gllibdir="`where_gl_libs`"
-if [ "$gllibdir" != "" ] ; then
-    if [ -f ${gllibdir}/libGL.la ] ; then
-       libdir=`grep "libdir=" ${gllibdir}/libGL.la | sed -e "s%libdir='\(.*\)'%\1%"`
-       if [ "`ls $libdir/libGL.so* 2>/dev/null`" ] ; then
-           str_to_replace="${gllibdir}/libGL.la"
-       fi
-fi
-    if [ "$str_to_replace" == "" ] ; then
-       str_to_replace="-L${gllibdir} -lGL"
-    fi
-
-        sed -e "s%-lGL\b%%g"                                                   \
-       -e "s%[^[:space:]\']*libGL.la[[:space:]]%%g"                             \
-       -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \
-       libTKOpenGl.la > libTKOpenGl.la.new
-        mv -f libTKOpenGl.la.new libTKOpenGl.la
-fi
-#fi
-
-# to generate environment script for sources
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="CAS-6.3sp9"
-export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-source ./common.sh
-$PROCEDURE 
diff --git a/config_files/MedReader-3.0.0.sh b/config_files/MedReader-3.0.0.sh
deleted file mode 100755 (executable)
index 1ee8e8a..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : MedReader-3.0.0.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
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-#
-# MedReader version
-#
-MEDREADER_VERSION=3.0.0
-
-check_version()
-{
-if [ -z "$MEDREADERHOME" ]; then
-   return 1 
-fi
-check_lib_version libvtkMedReader.so ${MEDREADERHOME}/lib
-
-if [ "$?" -eq "0" ]; then
-   return 0
-fi
-
-return 1
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export MEDREADERHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export MEDREADERLIB=\${MEDREADERHOME}/lib
-export LD_LIBRARY_PATH=\${MEDREADERHOME}/lib:\${LD_LIBRARY_PATH}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-export PRODUCT_BUILD_DIR=${PRODUCT_DIR}_build
-mkdir ${PRODUCT_BUILD_DIR}
-cd ${PRODUCT_BUILD_DIR}
-
-MEDREADER_CMAKE_OPTIONS=""
-
-MEDREADER_CMAKE_OPTIONS=""
-MEDREADER_CMAKE_OPTIONS=$MEDREADER_CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-MEDREADER_CMAKE_OPTIONS=$MEDREADER_CMAKE_OPTIONS" -DHDF5_INCLUDE_DIR:PATH=${HDF5HOME}/include"
-MEDREADER_CMAKE_OPTIONS=$MEDREADER_CMAKE_OPTIONS" -DHDF5_LIBRARY:STRING=${HDF5HOME}/lib"
-MEDREADER_CMAKE_OPTIONS=$MEDREADER_CMAKE_OPTIONS" -DMEDC_LIBRARY:FILEPATH=${MED2HOME}/lib/libmedC.so"
-MEDREADER_CMAKE_OPTIONS=$MEDREADER_CMAKE_OPTIONS" -DMED_INCLUDE_DIR:PATH=${MED2HOME}/include"
-MEDREADER_CMAKE_OPTIONS=$MEDREADER_CMAKE_OPTIONS" -DMED_LIBRARY:FILEPATH=${MED2HOME}/lib/libmed.so"
-MEDREADER_CMAKE_OPTIONS=$MEDREADER_CMAKE_OPTIONS" -DBUILD_MEDREADER_CLIENT_PLUGIN:BOOL=ON"
-MEDREADER_CMAKE_OPTIONS=$MEDREADER_CMAKE_OPTIONS" -DBUILD_MEDREADER_SERVER_PLUGIN:BOOL=ON"
-MEDREADER_CMAKE_OPTIONS=$MEDREADER_CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-MEDREADER_CMAKE_OPTIONS=$MEDREADER_CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:PATH=${PRODUCT_DIR}"
-MEDREADER_CMAKE_OPTIONS=$MEDREADER_CMAKE_OPTIONS" -DMedReader_BUILD_PARALLEL:BOOL=ON"
-MEDREADER_CMAKE_OPTIONS=$MEDREADER_CMAKE_OPTIONS" -DMedReader_BUILD_ParaView_Plugin:BOOL=ON"
-MEDREADER_CMAKE_OPTIONS=$MEDREADER_CMAKE_OPTIONS" -DParaView_DIR:PATH=${PVHOME}/lib/paraview-3.8"
-
-cat > ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
-used MEDREADER settings:
-$MEDREADER_CMAKE_OPTIONS
-EOF
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake ${PRODUCT_SRC_DIR} $MEDREADER_CMAKE_OPTIONS
-
-cat > ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-
-check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
-
-cd ${PRODUCT_DIR};
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-# create a product directory
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-
-# to generate environment script for sources
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="MedReader-${MEDREADER_VERSION}"
-export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-source ./common.sh
-$PROCEDURE 
diff --git a/config_files/ParaView-3.8.sh b/config_files/ParaView-3.8.sh
deleted file mode 100755 (executable)
index 7bb84c7..0000000
+++ /dev/null
@@ -1,263 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : ParaViev-3.8.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
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-#
-# VTK version
-#
-PVVERSION=3.8
-
-check_version()
-{
-if [ -z "$PARAVIEW" ]; then
-   return 1 
-fi
-check_lib_version libvtkCommon.so ${PVHOME}/lib/paraview-3.8
-if [ "$?" -eq "0" ]; then
-   return 0
-fi
-return 1
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export PVVERSION=3.8
-export PVHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${PVHOME}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${PVHOME}/lib/paraview-\${PVVERSION}:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${PVHOME}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-check_jb tar xfz ${SOURCE_DIR}/ParaViewData-${PVVERSION}.tar.gz -C ${INST_ROOT}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-export PRODUCT_BUILD_DIR=${PRODUCT_DIR}_build
-mkdir ${PRODUCT_BUILD_DIR}
-cd ${PRODUCT_BUILD_DIR}
-# get Python and tcl/tk version
-python_version="`python -c 'import sys; print sys.version[:3]'`"
-tcl_version=""
-tcl_includes=""
-tcl_libs=""
-tcldir="`where_tcl`"
-if [ $? -eq 0 ] && [ -e ${tcldir}/tclConfig.sh ] ; then
-    tcl_version=`grep -e "TCL_VERSION=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_VERSION=[\'|\"]\(.*\)[\'|\"]%\1%g"`
-    tcl_includes=`grep -e "TCL_INCLUDE_SPEC=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_INCLUDE_SPEC=[\'|\"]-I\(.*\)[\'|\"]%\1%g"`
-    if [ -z "$tcl_includes" ] ; then tcl_includes=/usr/include ; fi
-    tcl_libs=`grep -e "TCL_PACKAGE_PATH=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_PACKAGE_PATH=[\'|\"]\(.*\)[\'|\"]%\1%g"`
-fi
-    
-VTK_CMAKE_OPTIONS=""
-
-### compiler options
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS"-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1"
-
-### common VTK settings
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_BUILD_QT_GUI:BOOL=ON"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=`which gcc`"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_DIR}"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_HYBRID:BOOL=ON"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_GL2PS:BOOL=ON"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_PARALLEL:BOOL=ON"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_PATENTED:BOOL=OFF" 
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_RENDERING:BOOL=ON"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_GL2PS:BOOL=ON"
-
-### 64 bit platforms
-  if test `uname -m` = "x86_64" ; then
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
-  fi
-
-### Wrap Python settings
-if [ "${python_version}" != "" ]; then
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_PYTHON:BOOL=ON"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHONROOT}/bin/python${python_version}"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_INCLUDE_PATH:STRING=${PYTHONROOT}/include/python${python_version}"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHONROOT}/lib/python${python_version}/config/libpython${python_version}.a"
-fi
-### Wrap Tcl settings
-if [ "${tcl_version}" != "" ] && [ "${tcl_includes}" != "" ] && [ "${tcl_libs}" != "" ] ; then
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=ON"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_INCLUDE_PATH:STRING=${tcl_includes}"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_LIBRARY:STRING=${tcl_libs}/libtcl${tcl_version}.so"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_STUB_LIBRARY:STRING=${tcl_libs}/libtclstub${tcl_version}.a"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_TCLSH:STRING=${TCLHOME}/bin/tclsh${tcl_version}"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_INCLUDE_PATH:STRING=${tcl_includes}"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_LIBRARY:STRING=${tcl_libs}/libtk${tcl_version}.so"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_STUB_LIBRARY:STRING=${tcl_libs}/libtkstub${tcl_version}.a"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_WISH:STRING=${TCLHOME}/bin/wish${tcl_version}"
-fi
-### common PARAVIEW settings
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON"
-
-### Wrap HDF5 settings
-if [ "${HDF5HOME}" != "" ]; then
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DHDF5_INCLUDE_DIR:STRING=${HDF5HOME}/include"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DHDF5_LIBRARY:STRING=${HDF5HOME}/lib/libhdf5.so"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=OFF"
-fi
-### if Mesa is pre-installed
-if [ -n "$MESA_HOME" ]; then
-  VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_INCLUDE_DIR:STRING=${MESA_HOME}/include"
-  if test `uname -m` = "x86_64" ; then
-      VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_gl_LIBRARY:STRING=${MESA_HOME}/lib64/libGL.so"
-      VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_glu_LIBRARY:STRING=${MESA_HOME}/lib64/libGLU.so"
-  else
-      VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_gl_LIBRARY:STRING=${MESA_HOME}/lib/libGL.so"
-      VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_glu_LIBRARY:STRING=${MESA_HOME}/lib/libGLU.so"
-  fi
-  VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_xmesa_INCLUDE_DIR:STRING=${MESA_HOME}/include"
-fi
-cat > ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
-used VTK settings:
-$VTK_CMAKE_OPTIONS
-EOF
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake ${PRODUCT_SRC_DIR} $VTK_CMAKE_OPTIONS
-cat > ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-
-check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
-
-#-------------------- Additional coping
-
-#mkdir ${PRODUCT_DIR}/include/paraview-3.8/CMake
-
-#cp -f ${PRODUCT_SRC_DIR}/CMake/pqParaViewPlugin.cxx.in ${PRODUCT_DIR}/include/paraview-3.8/CMake
-#cp -f ${PRODUCT_SRC_DIR}/CMake/pqParaViewPlugin.h.in ${PRODUCT_DIR}/include/paraview-3.8/CMake
-
-#cp -f ${PRODUCT_SRC_DIR}/CMake/ParaViewMacros.cmake ${PRODUCT_DIR}/lib/paraview-3.8/CMake
-#cp -f ${PRODUCT_SRC_DIR}/CMake/ParaViewBranding.cmake ${PRODUCT_DIR}/lib/paraview-3.8/CMake
-#cp -f ${PRODUCT_SRC_DIR}/CMake/ParaViewBrandingCPack.cmake ${PRODUCT_DIR}/lib/paraview-3.8/CMake
-
-#cp -f ${PRODUCT_SRC_DIR}/VTK/Common/vtkABI.h ${PRODUCT_DIR}/include/paraview-3.8
-#cp -f ${PRODUCT_SRC_DIR}/Qt/ApplicationComponents/pqPVApplicationCore.h ${PRODUCT_DIR}/include/paraview-3.8
-#cp -f ${PRODUCT_SRC_DIR}/Qt/ApplicationComponents/*Behavior*.h ${PRODUCT_DIR}/include/paraview-3.8
-#cp -f ${PRODUCT_SRC_DIR}/Qt/ApplicationComponents/*Reaction*.h ${PRODUCT_DIR}/include/paraview-3.8
-
-#cp -f ${PRODUCT_SRC_DIR}/Qt/ApplicationComponents/pqViewMenuManager.h ${PRODUCT_DIR}/include/paraview-3.8
-#cp -f ${PRODUCT_SRC_DIR}/Qt/ApplicationComponents/pqParaViewMenuBuilders.h ${PRODUCT_DIR}/include/paraview-3.8
-#cp -f ${PRODUCT_SRC_DIR}/Qt/ApplicationComponents/pqProxyGroupMenuManager.h ${PRODUCT_DIR}/include/paraview-3.8
-#cp -f ${PRODUCT_SRC_DIR}/Qt/ApplicationComponents/pqPVAnimationWidget.h ${PRODUCT_DIR}/include/paraview-3.8
-#cp -f ${PRODUCT_SRC_DIR}/VTK/Wrapping/vtkParse.h ${PRODUCT_DIR}/include/paraview-3.8
-
-#cp -f ${PRODUCT_BUILD_DIR}/Qt/ApplicationComponents/pqApplicationComponentsExport.h ${PRODUCT_DIR}/include/paraview-3.8
-#cp -f ${PRODUCT_BUILD_DIR}/vtkPVConfig.h ${PRODUCT_DIR}/include/paraview-3.8
-
-
-cd ${PRODUCT_DIR};
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-# create a product directory
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-check_jb tar xfz ${SOURCE_DIR}/../../SOURCES/ParaViewData-${PVVERSION}.tar.gz -C ${INST_ROOT}
-
-cd ${PRODUCT_DIR}
-
-for f in `find . -name *.cmake` ; do
-sed -e "s%/[^\";]*/bin/moc%$QTDIR/bin/moc%g"     \
-    -e "s%/[^\";]*/bin/uic%$QTDIR/bin/uic%g"     \
-    -e "s%/[^\";]*/bin/rcc%$QTDIR/bin/rcc%g"     \
-    -e "s%/[^\";]*/bin/qmake%$QTDIR/bin/qmake%g" \
-    -e "s%/[^\";]*/lib/libQt%$QTDIR/lib/libQt%g" \
-    -e "s%/[^\";]*/lib64/libQt%$QTDIR/lib64/libQt%g" \
-    -e "s%/[^\";]*/lib/python\([0-9].[0-9]\)/config/libpython%$PYTHONHOME/lib/python\1/config/libpython%g" \
-    -e "s%/[^\";]*/include/python\([0-9].[0-9]\)%$PYTHONHOME/include/python\1%g" \
-    ${f} > ${f}.new
-    mv -f ${f}.new ${f}
-done
-
-
-# to generate environment script for sources
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="ParaView-${PVVERSION}"
-export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-source ./common.sh
-$PROCEDURE 
diff --git a/config_files/ParaView-3.9.sh b/config_files/ParaView-3.9.sh
new file mode 100755 (executable)
index 0000000..98f3cc4
--- /dev/null
@@ -0,0 +1,248 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : ParaViev-3.9.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
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+#
+# VTK version
+#
+PVVERSION=3.9
+
+check_version()
+{
+if [ -z "$PARAVIEW" ]; then
+   return 1 
+fi
+check_lib_version libvtkCommon.so ${PVHOME}/lib/paraview-${PVVERSION}
+if [ "$?" -eq "0" ]; then
+   return 0
+fi
+return 1
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PVVERSION=${PVVERSION}
+export PVHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${PVHOME}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${PVHOME}/lib/paraview-\${PVVERSION}:\${LD_LIBRARY_PATH}
+export PYTHONPATH=\${PVHOME}/lib/paraview-\${PVVERSION}:\${PVHOME}/lib/paraview-\${PVVERSION}/site-packages:\${PVHOME}/lib/paraview-\${PVVERSION}/site-packages/paraview:\${PYTHONPATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/ParaViewData-${PVVERSION}.tar.gz -C ${INST_ROOT}
+
+( cd ${PRODUCT_SRC_DIR} && grep "PyVTKMutableObject.h" VTK/Wrapping/Python/CMakeLists.txt >& /dev/null || \
+    sed -i "s%\([[:space:]]*\)PyVTKSpecialObject.h%\1PyVTKSpecialObject.h\n\1PyVTKMutableObject.h%g" \
+    VTK/Wrapping/Python/CMakeLists.txt )
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+export PRODUCT_BUILD_DIR=${PRODUCT_DIR}_build
+mkdir ${PRODUCT_BUILD_DIR}
+cd ${PRODUCT_BUILD_DIR}
+# get Python and tcl/tk version
+python_version="`python -c 'import sys; print sys.version[:3]'`"
+tcl_version=""
+tcl_includes=""
+tcl_libs=""
+tcldir="`where_tcl`"
+if [ $? -eq 0 ] && [ -e ${tcldir}/tclConfig.sh ] ; then
+    tcl_version=`grep -e "TCL_VERSION=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_VERSION=[\'|\"]\(.*\)[\'|\"]%\1%g"`
+    tcl_includes=`grep -e "TCL_INCLUDE_SPEC=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_INCLUDE_SPEC=[\'|\"]-I\(.*\)[\'|\"]%\1%g"`
+    if [ -z "$tcl_includes" ] ; then tcl_includes=/usr/include ; fi
+    tcl_libs=`grep -e "TCL_PACKAGE_PATH=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_PACKAGE_PATH=[\'|\"]\(.*\)[\'|\"]%\1%g"`
+fi
+    
+VTK_CMAKE_OPTIONS=""
+
+### compiler options
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS"-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1"
+
+### common VTK settings
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_BUILD_QT_GUI:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=`which gcc`"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_DIR}"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_HYBRID:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_GL2PS:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_PARALLEL:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_PATENTED:BOOL=OFF" 
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_RENDERING:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_QT_USE_WEBKIT:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_64BIT_IDS:BOOL=OFF"
+
+### 64 bit platforms
+  if test `uname -m` = "x86_64" ; then
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+  fi
+
+### Wrap Python settings
+if [ "${python_version}" != "" ]; then
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_PYTHON:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHONROOT}/bin/python${python_version}"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_INCLUDE_PATH:STRING=${PYTHONROOT}/include/python${python_version}"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHONROOT}/lib/python${python_version}/config/libpython${python_version}.a"
+fi
+### Wrap Tcl settings
+if [ "${tcl_version}" != "" ] && [ "${tcl_includes}" != "" ] && [ "${tcl_libs}" != "" ] ; then
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_INCLUDE_PATH:STRING=${tcl_includes}"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_LIBRARY:STRING=${tcl_libs}/libtcl${tcl_version}.so"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_STUB_LIBRARY:STRING=${tcl_libs}/libtclstub${tcl_version}.a"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_TCLSH:STRING=${TCLHOME}/bin/tclsh${tcl_version}"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_INCLUDE_PATH:STRING=${tcl_includes}"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_LIBRARY:STRING=${tcl_libs}/libtk${tcl_version}.so"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_STUB_LIBRARY:STRING=${tcl_libs}/libtkstub${tcl_version}.a"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_WISH:STRING=${TCLHOME}/bin/wish${tcl_version}"
+fi
+### common PARAVIEW settings
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON"
+
+### Wrap HDF5 settings
+if [ "${HDF5HOME}" != "" ]; then
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DHDF5_INCLUDE_DIR:STRING=${HDF5HOME}/include"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DHDF5_LIBRARY:STRING=${HDF5HOME}/lib/libhdf5.so"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=OFF"
+fi
+### if Mesa is pre-installed
+if [ -n "$MESA_HOME" ]; then
+  VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_INCLUDE_DIR:STRING=${MESA_HOME}/include"
+  if test `uname -m` = "x86_64" ; then
+      VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_gl_LIBRARY:STRING=${MESA_HOME}/lib64/libGL.so"
+      VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_glu_LIBRARY:STRING=${MESA_HOME}/lib64/libGLU.so"
+  else
+      VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_gl_LIBRARY:STRING=${MESA_HOME}/lib/libGL.so"
+      VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_glu_LIBRARY:STRING=${MESA_HOME}/lib/libGLU.so"
+  fi
+  VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_xmesa_INCLUDE_DIR:STRING=${MESA_HOME}/include"
+fi
+cat > ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
+used VTK settings:
+$VTK_CMAKE_OPTIONS
+EOF
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake ${PRODUCT_SRC_DIR} $VTK_CMAKE_OPTIONS
+cat > ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE.LOG make
+
+check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
+
+cd ${PRODUCT_DIR}/lib/paraview-${PVVERSION}
+for f in `find . -name "vtkPV*.so"` XXX ; do
+    if test "$f" == "XXX" ; then continue ; fi
+    d=`dirname $f`
+    f=`basename $f`
+    ( cd $d; if test ! -e lib$f ; then ln -sf $f lib$f ; fi;  ) 
+done
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+# create a product directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
+check_jb tar xfz ${SOURCE_DIR}/../../SOURCES/ParaViewData-${PVVERSION}.tar.gz -C ${INST_ROOT}
+
+cd ${PRODUCT_DIR}
+
+for f in `find . -name *.cmake` ; do
+sed -e "s%/[^\";]*/bin/moc%$QTDIR/bin/moc%g"     \
+    -e "s%/[^\";]*/bin/uic%$QTDIR/bin/uic%g"     \
+    -e "s%/[^\";]*/bin/rcc%$QTDIR/bin/rcc%g"     \
+    -e "s%/[^\";]*/bin/qmake%$QTDIR/bin/qmake%g" \
+    -e "s%/[^\";]*/lib/libQt%$QTDIR/lib/libQt%g" \
+    -e "s%/[^\";]*/lib64/libQt%$QTDIR/lib64/libQt%g" \
+    -e "s%/[^\";]*/lib/python\([0-9].[0-9]\)/config/libpython%$PYTHONHOME/lib/python\1/config/libpython%g" \
+    -e "s%/[^\";]*/include/python\([0-9].[0-9]\)%$PYTHONHOME/include/python\1%g" \
+    ${f} > ${f}.new
+    mv -f ${f}.new ${f}
+done
+
+
+# to generate environment script for sources
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="ParaView-${PVVERSION}"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
+source ./common.sh
+$PROCEDURE 
index 4a056795d7449f6d9519707c8dba23eea5763d85..4fd62e8afb4451f6bc31d2a4b7a5e321940179e0 100755 (executable)
@@ -74,6 +74,9 @@ source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 
+# apply patch for phonon package
+( cd ${PRODUCT_SRC_DIR}/sip/phonon && for f in `find . -name "*.sip"` ; do sed -i "s%^#include <%#include <phonon/%g" $f ; done )
+
 # to generate environment scripts
 try_preinstalled
 }
diff --git a/config_files/Python-2.6.5.sh b/config_files/Python-2.6.5.sh
deleted file mode 100755 (executable)
index 0428fa0..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : Python-2.6.5.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
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-PY_VERSION=2.6.5
-PY_XVERSION=`echo ${PY_VERSION} | awk -F. '{v1=0;v2=0;v3=0;if(NF>0)v1=$1;if(NF>1)v2=$2;if(NF>2)v3=$3;print v1*10000+v2*100+v3}'`
-PY_LIBVERSION=`echo ${PY_VERSION} | awk -F. '{printf("%d.%d",$1,$2)}'`
-
-check_version()
-{
-if [ -z "$PYTHONHOME"  ]; then
-   return 1
-fi
-isPython=`which python 2>/dev/null`
-if [ -n "$isPython" ]; then
-  # version number is calculated as: <major>*10000+<minor>*100+<release>
-  ver=`python -V 2>&1`
-  ver=`echo $ver | awk '{print $2}' | awk -F. '{v1=0;v2=0;v3=0;if(NF>0)v1=$1;if(NF>1)v2=$2;if(NF>2)v3=$3;print v1*10000+v2*100+v3}'`
-  if [ $ver -eq ${PY_XVERSION} ] ;  then 
-    return 0
-  fi
-fi
-return 1 
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export PYTHONROOT=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PYTHONHOME=\$PYTHONROOT
-export PATH=\${PYTHONROOT}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${PYTHONROOT}/lib:\${LD_LIBRARY_PATH}
-export PYTHON_VERSION=\`python -c "import sys; print sys.version[:3]"\`
-export PYTHON_INCLUDE=\${PYTHONROOT}/include/python\${PYTHON_VERSION}
-export PYTHONPATH=\${PYTHONROOT}/lib/python\${PYTHON_VERSION}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-
-# apply patch for 64-bit platforms
-#if test `uname -m` = "x86_64" ; then
-#    if [ -f patches/python_patch_lib64.patch ] ; then
-#      cp patches/python_patch_lib64.patch ${PRODUCT_SRC_DIR} 
-#      ( cd ${PRODUCT_SRC_DIR} ;                \
-#        patch -p1 < python_patch_lib64.patch ; \
-#        rm -rf aclocal.m4 ;                    \
-#        aclocal >& /dev/null ;                 \
-#        autoconf >& /dev/null ;                \
-#        aclocal >& /dev/null ;                 \
-#        autoconf >& /dev/null )
-#    fi
-#fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-cd ${PRODUCT_SRC_DIR}
-
-export PYTHON_ARCHIVE_PREFIX=""
-PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared --without-test --with-libs=-lstdc++"
-### --with-pydebug ### (for debug)
-
-if test `uname -m` = "x86_64" ; then
-    PYTHON_CONFIGURE_OPTIONS="${PYTHON_CONFIGURE_OPTIONS} CFLAGS=-m64 CXXFLAGS=-m64"
-fi
-
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR} $PYTHON_CONFIGURE_OPTIONS
-
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make 
-check_job ${PRODUCT_DIR}/MAKINSTALL.LOG make install
-(cd ${PRODUCT_DIR}/lib${PYTHON_LIB_PREFIX}/python${PY_LIBVERSION}/config; ln -fs ../../libpython${PY_LIBVERSION}.so.1.0 libpython${PY_LIBVERSION}.so)
-
-cd ${PRODUCT_DIR}/bin
-for sc in idle pydoc smtpd.py 2to3 python${PY_LIBVERSION}-config ; do
-    if [ -e $sc ] ; then
-       sed -e "s%^#\!.*python.*$%#\!/usr/bin/env python%" "$sc" > _"$sc"
-       mv -f _"$sc" "$sc"
-       chmod a+x "$sc"
-    fi
-done
-
-cd ${PRODUCT_DIR};
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-# create a product directory
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-
-(cd ${PRODUCT_DIR}/lib/python${PY_LIBVERSION}/config; ln -fs ../../libpython${PY_LIBVERSION}.so.1.0 libpython${PY_LIBVERSION}.so)
-
-cd ${PRODUCT_DIR}/bin
-for sc in idle pydoc smtpd.py ; do
-    if [ -e $sc ] ; then
-       sed -e "s%#\!.*python%#\!/usr/bin/env python%" "$sc" > _"$sc"
-       mv -f _"$sc" "$sc"
-       chmod a+x "$sc"
-    fi
-done
-
-# to generate environment scripts
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="Python-${PY_VERSION}"
-export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-source ./common.sh
-${PROCEDURE}
diff --git a/config_files/Python-2.6.6.sh b/config_files/Python-2.6.6.sh
new file mode 100755 (executable)
index 0000000..57bbb10
--- /dev/null
@@ -0,0 +1,182 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : Python-2.6.6.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
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+PY_VERSION=2.6.6
+PY_XVERSION=`echo ${PY_VERSION} | awk -F. '{v1=0;v2=0;v3=0;if(NF>0)v1=$1;if(NF>1)v2=$2;if(NF>2)v3=$3;print v1*10000+v2*100+v3}'`
+PY_LIBVERSION=`echo ${PY_VERSION} | awk -F. '{printf("%d.%d",$1,$2)}'`
+
+check_version()
+{
+if [ -z "$PYTHONHOME"  ]; then
+   return 1
+fi
+isPython=`which python 2>/dev/null`
+if [ -n "$isPython" ]; then
+  # version number is calculated as: <major>*10000+<minor>*100+<release>
+  ver=`python -V 2>&1`
+  ver=`echo $ver | awk '{print $2}' | awk -F. '{v1=0;v2=0;v3=0;if(NF>0)v1=$1;if(NF>1)v2=$2;if(NF>2)v3=$3;print v1*10000+v2*100+v3}'`
+  if [ $ver -eq ${PY_XVERSION} ] ;  then 
+    return 0
+  fi
+fi
+return 1 
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PYTHONROOT=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PYTHONHOME=\$PYTHONROOT
+export PATH=\${PYTHONROOT}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${PYTHONROOT}/lib:\${LD_LIBRARY_PATH}
+export PYTHON_VERSION=\`python -c "import sys; print sys.version[:3]"\`
+export PYTHON_INCLUDE=\${PYTHONROOT}/include/python\${PYTHON_VERSION}
+export PYTHONPATH=\${PYTHONROOT}/lib/python\${PYTHON_VERSION}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
+
+# apply patch for 64-bit platforms
+#if test `uname -m` = "x86_64" ; then
+#    if [ -f patches/python_patch_lib64.patch ] ; then
+#      cp patches/python_patch_lib64.patch ${PRODUCT_SRC_DIR} 
+#      ( cd ${PRODUCT_SRC_DIR} ;                \
+#        patch -p1 < python_patch_lib64.patch ; \
+#        rm -rf aclocal.m4 ;                    \
+#        aclocal >& /dev/null ;                 \
+#        autoconf >& /dev/null ;                \
+#        aclocal >& /dev/null ;                 \
+#        autoconf >& /dev/null )
+#    fi
+#fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR}
+
+export PYTHON_ARCHIVE_PREFIX=""
+PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared --without-test --with-libs=-lstdc++"
+### --with-pydebug ### (for debug)
+
+if test `uname -m` = "x86_64" ; then
+    PYTHON_CONFIGURE_OPTIONS="${PYTHON_CONFIGURE_OPTIONS} CFLAGS=-m64 CXXFLAGS=-m64"
+fi
+
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR} $PYTHON_CONFIGURE_OPTIONS
+
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE.LOG make 
+check_job ${PRODUCT_DIR}/MAKINSTALL.LOG make install
+(cd ${PRODUCT_DIR}/lib${PYTHON_LIB_PREFIX}/python${PY_LIBVERSION}/config; ln -fs ../../libpython${PY_LIBVERSION}.so.1.0 libpython${PY_LIBVERSION}.so)
+
+cd ${PRODUCT_DIR}/bin
+for sc in idle pydoc smtpd.py 2to3 python${PY_LIBVERSION}-config ; do
+    if [ -e $sc ] ; then
+       sed -e "s%^#\!.*python.*$%#\!/usr/bin/env python%" "$sc" > _"$sc"
+       mv -f _"$sc" "$sc"
+       chmod a+x "$sc"
+    fi
+done
+
+cd ${PRODUCT_DIR};
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+# create a product directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
+
+(cd ${PRODUCT_DIR}/lib/python${PY_LIBVERSION}/config; ln -fs ../../libpython${PY_LIBVERSION}.so.1.0 libpython${PY_LIBVERSION}.so)
+
+cd ${PRODUCT_DIR}/bin
+for sc in idle pydoc smtpd.py ; do
+    if [ -e $sc ] ; then
+       sed -e "s%#\!.*python%#\!/usr/bin/env python%" "$sc" > _"$sc"
+       mv -f _"$sc" "$sc"
+       chmod a+x "$sc"
+    fi
+done
+
+# to generate environment scripts
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="Python-${PY_VERSION}"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
+source ./common.sh
+${PROCEDURE}
index b2acc2bafcec811ab11c85f31111c2eecb99f6ad..ab9a3e45eecdb8b1b3ff0be7b6e28d1d4873eaaf 100755 (executable)
@@ -19,8 +19,8 @@ export CSHRC="salome.csh"
 #####################################################
 # !WARNING! This is current SALOME version number 
 ####################################################
-export SALOME_VERSION="6.1.0"
-export YACSGEN_VERSION="6.1.0"
+export SALOME_VERSION="6.2.0"
+export YACSGEN_VERSION="6.2.0"
 export JOBMANAGER_VERSION="0.1"
 
 # Name of the single directory for SALOME modules
diff --git a/config_files/libxml2-2.6.27.sh b/config_files/libxml2-2.6.27.sh
deleted file mode 100755 (executable)
index ac88c1d..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : libxml2-2.7.3.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
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-#
-# libxml version
-#
-LIBXML_VERSION=2.6.27
-
-check_version(){
-# No way to check version!
-return 0
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM 
-export LIBXML_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${LIBXML_DIR}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${LIBXML_DIR}/lib:\${LD_LIBRARY_PATH}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SRC_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-
-cd ${PRODUCT_SRC_DIR}
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
-  ./configure --prefix=${PRODUCT_DIR} 
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-check_job ${PRODUCT_DIR}/INSTALL.LOG make install 
-
-cd ${PRODUCT_DIR};
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-# create a product directory
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-
-cd ${PRODUCT_DIR}/lib
-export libdir=`grep -e "libdir=.*" libxml2.la | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"`
-cd ..
-lnew="_new"
-for l in `find -type f -name *.la`; do
-sed -e "s%${libdir}%${PRODUCT_DIR}/lib%g" $l > $l$lnew
-mv $l$lnew $l
-chmod 755 $l
-done
-
-cd ${PRODUCT_DIR}/lib/pkgconfig
-for l in X `find . -name "*.pc"`; do
-    if [ "${l}" != "X" ] ; then
-       sed -e "s%prefix=.*%prefix=${PRODUCT_DIR}%g" ${l} > ${l}_
-       chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l}
-    fi
-done
-
-# to generate environment scripts
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-SRC_DIR=$8;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="libxml2-${LIBXML_VERSION}"
-export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-source ./common.sh
-$PROCEDURE
diff --git a/config_files/libxml2-2.7.7.sh b/config_files/libxml2-2.7.7.sh
new file mode 100755 (executable)
index 0000000..99a6798
--- /dev/null
@@ -0,0 +1,144 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : libxml2-2.7.7.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
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+#
+# libxml version
+#
+LIBXML_VERSION=2.7.7
+
+check_version(){
+# No way to check version!
+return 0
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM 
+export LIBXML_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${LIBXML_DIR}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${LIBXML_DIR}/lib:\${LD_LIBRARY_PATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SRC_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+
+cd ${PRODUCT_SRC_DIR}
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
+  ./configure --prefix=${PRODUCT_DIR} 
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE.LOG make
+check_job ${PRODUCT_DIR}/INSTALL.LOG make install 
+
+cd ${PRODUCT_DIR};
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+# create a product directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
+
+cd ${PRODUCT_DIR}/lib
+export libdir=`grep -e "libdir=.*" libxml2.la | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"`
+cd ..
+lnew="_new"
+for l in `find -type f -name *.la`; do
+sed -e "s%${libdir}%${PRODUCT_DIR}/lib%g" $l > $l$lnew
+mv $l$lnew $l
+chmod 755 $l
+done
+
+cd ${PRODUCT_DIR}/lib/pkgconfig
+for l in X `find . -name "*.pc"`; do
+    if [ "${l}" != "X" ] ; then
+       sed -e "s%prefix=.*%prefix=${PRODUCT_DIR}%g" ${l} > ${l}_
+       chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l}
+    fi
+done
+
+# to generate environment scripts
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+SRC_DIR=$8;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="libxml2-${LIBXML_VERSION}"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
+source ./common.sh
+$PROCEDURE
diff --git a/config_files/qt-4.6.2.sh b/config_files/qt-4.6.2.sh
deleted file mode 100755 (executable)
index 6ce0b7e..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : qt-4.6.2.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
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-QT_REF_VERSION="4.6.2"
-
-check_version(){
-if [ -z "$QTDIR" ]; then
-   return 1
-fi
-ver=`grep "QT_VERSION_STR" ${QTDIR}/include/Qt/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'`
-if [ "$ver" == "${QT_REF_VERSION}" ] ; then
-    return 0
-fi
-return 1
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export QTDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${QTDIR}/bin:\$PATH 
-export LD_LIBRARY_PATH=\${QTDIR}/lib:\${LD_LIBRARY_PATH}
-export QT_PLUGIN_PATH=\${QTDIR}/plugins
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-
-#if [ -f patches/qt-4.5.2.patch ] ; then
-#    cp patches/qt-4.5.2.patch ${PRODUCT_SRC_DIR}
-#    ( cd ${PRODUCT_SRC_DIR} ; patch -p1 < qt-4.5.2.patch )
-#fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-cd ${PRODUCT_SRC_DIR}
-sed -e "s%\(QLinearGradient gradient(QPoint(\)\(width()/2, 0), QPoint(width()/2, height()));\)%\1this->\2%g" \
-    examples/xmlpatterns/trafficinfo/mainwindow.cpp > examples/xmlpatterns/trafficinfo/mainwindow.cpp.1
-    mv -f examples/xmlpatterns/trafficinfo/mainwindow.cpp.1 examples/xmlpatterns/trafficinfo/mainwindow.cpp
-
-is_mandriva2006=0
-
-if [ -e /etc/issue ] ; then
-  grep -e "Mandriva Linux release 2006.0" /etc/issue > /dev/null
-if [ $? == 0 ] ; then is_mandriva2006=1 ; fi
-fi
-
-if [ $is_mandriva2006 == 1 ] ; then
-    if test `uname -m` = "x86_64" ; then
-    sed -e "s/-O2/-O1/g" mkspecs/common/g++.conf > mkspecs/common/g++.conf.1
-    mv -f mkspecs/common/g++.conf.1 mkspecs/common/g++.conf
-    fi
-fi
-
-# configure
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure -prefix ${PRODUCT_DIR} -no-separate-debug-info -release -opensource -confirm-license
-
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-
-check_job ${PRODUCT_DIR}/MAKE.LOG make 
-check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
-
-if test `uname -m` = "x86_64" ; then
-     cd ${PRODUCT_DIR}; ln -sf lib lib64
-fi
-
-cd ${PRODUCT_DIR};
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-# create a product directory
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-
-# modify libdir
-cd ${PRODUCT_DIR}/lib
-
-# modify qt la files
-for l in `find $ldir -name "*.la"`; do
-sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" $l > $l"_"
-chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
-sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${PRODUCT}% \1${PRODUCT_DIR}%g" $l > $l"_"
-chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
-sed -e "s%^dependency_libs='\(-L\)\?[^[:space:]]*${PRODUCT}%dependency_libs=\'\1${PRODUCT_DIR}%g" $l > $l"_"
-chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
-
-done
-
-# modify libGL.so flags
-has_gl_dep=`grep -E "^dependency_libs=.*-lGL.*" libQtOpenGL.la`
-gllibdir="`where_gl_libs`"
-if [ "$has_gl_dep" != "" ] && [ "$gllibdir" != "" ] ; then
-    sed -e "s%-lGL\b%%g" \
-       -e "s%^dependency_libs='\(.*\)%dependency_libs='-L$gllibdir -lGL \1%g" \
-       libQtOpenGL.la > libQtOpenGL.la.new
-    mv -f libQtOpenGL.la.new libQtOpenGL.la
-fi
-
-# modify qt package config
-cd ${PRODUCT_DIR}/lib/pkgconfig
-for l in X `find . -name "*.pc"`; do
-    if [ "${l}" != "X" ] ; then
-       sed -e "s%^prefix=\(.*\)%prefix=${PRODUCT_DIR}%g" \
-           -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \
-           -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-x11-opensource-src-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \
-           -e "s%moc_location=.*%moc_location=${PRODUCT_DIR}/bin/moc%g" \
-           -e "s%uic_location=.*%uic_location=${PRODUCT_DIR}/bin/uic%g" \
-           ${l} > ${l}_
-       chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l}
-    fi
-done
-
-# generate qt.conf file
-cat > ${PRODUCT_DIR}/bin/qt.conf <<EOF
-[Paths]
-Prefix=${PRODUCT_DIR}
-EOF
-# to generate environment scripts
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="qt-${QT_REF_VERSION}"
-export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-source ./common.sh
-$PROCEDURE 
diff --git a/config_files/qt-4.6.3.sh b/config_files/qt-4.6.3.sh
new file mode 100755 (executable)
index 0000000..a6b9645
--- /dev/null
@@ -0,0 +1,200 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : qt-4.6.3.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
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+QT_REF_VERSION="4.6.3"
+
+check_version(){
+if [ -z "$QTDIR" ]; then
+   return 1
+fi
+ver=`grep "QT_VERSION_STR" ${QTDIR}/include/Qt/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'`
+if [ "$ver" == "${QT_REF_VERSION}" ] ; then
+    return 0
+fi
+return 1
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export QTDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${QTDIR}/bin:\$PATH 
+export LD_LIBRARY_PATH=\${QTDIR}/lib:\${LD_LIBRARY_PATH}
+export QT_PLUGIN_PATH=\${QTDIR}/plugins
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
+
+#if [ -f patches/qt-4.5.2.patch ] ; then
+#    cp patches/qt-4.5.2.patch ${PRODUCT_SRC_DIR}
+#    ( cd ${PRODUCT_SRC_DIR} ; patch -p1 < qt-4.5.2.patch )
+#fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+cd ${PRODUCT_SRC_DIR}
+sed -e "s%\(QLinearGradient gradient(QPoint(\)\(width()/2, 0), QPoint(width()/2, height()));\)%\1this->\2%g" \
+    examples/xmlpatterns/trafficinfo/mainwindow.cpp > examples/xmlpatterns/trafficinfo/mainwindow.cpp.1
+    mv -f examples/xmlpatterns/trafficinfo/mainwindow.cpp.1 examples/xmlpatterns/trafficinfo/mainwindow.cpp
+
+is_mandriva2006=0
+
+if [ -e /etc/issue ] ; then
+  grep -e "Mandriva Linux release 2006.0" /etc/issue > /dev/null
+if [ $? == 0 ] ; then is_mandriva2006=1 ; fi
+fi
+
+if [ $is_mandriva2006 == 1 ] ; then
+    if test `uname -m` = "x86_64" ; then
+    sed -e "s/-O2/-O1/g" mkspecs/common/g++.conf > mkspecs/common/g++.conf.1
+    mv -f mkspecs/common/g++.conf.1 mkspecs/common/g++.conf
+    fi
+fi
+
+# configure
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure -prefix ${PRODUCT_DIR} -no-separate-debug-info -release -opensource -confirm-license
+
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+
+check_job ${PRODUCT_DIR}/MAKE.LOG make 
+check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
+
+if test `uname -m` = "x86_64" ; then
+     cd ${PRODUCT_DIR}; ln -sf lib lib64
+fi
+
+cd ${PRODUCT_DIR};
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+# create a product directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
+
+# modify libdir
+cd ${PRODUCT_DIR}/lib
+
+# modify qt la files
+for l in `find $ldir -name "*.la"`; do
+sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" $l > $l"_"
+chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
+sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${PRODUCT}% \1${PRODUCT_DIR}%g" $l > $l"_"
+chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
+sed -e "s%^dependency_libs='\(-L\)\?[^[:space:]]*${PRODUCT}%dependency_libs=\'\1${PRODUCT_DIR}%g" $l > $l"_"
+chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
+
+done
+
+# modify libGL.so flags
+has_gl_dep=`grep -E "^dependency_libs=.*-lGL.*" libQtOpenGL.la`
+gllibdir="`where_gl_libs`"
+if [ "$has_gl_dep" != "" ] && [ "$gllibdir" != "" ] ; then
+    sed -e "s%-lGL\b%%g" \
+       -e "s%^dependency_libs='\(.*\)%dependency_libs='-L$gllibdir -lGL \1%g" \
+       libQtOpenGL.la > libQtOpenGL.la.new
+    mv -f libQtOpenGL.la.new libQtOpenGL.la
+fi
+
+# modify qt package config
+cd ${PRODUCT_DIR}/lib/pkgconfig
+for l in X `find . -name "*.pc"`; do
+    if [ "${l}" != "X" ] ; then
+       sed -e "s%^prefix=\(.*\)%prefix=${PRODUCT_DIR}%g" \
+           -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \
+           -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-x11-opensource-src-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \
+           -e "s%moc_location=.*%moc_location=${PRODUCT_DIR}/bin/moc%g" \
+           -e "s%uic_location=.*%uic_location=${PRODUCT_DIR}/bin/uic%g" \
+           ${l} > ${l}_
+       chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l}
+    fi
+done
+
+# generate qt.conf file
+cat > ${PRODUCT_DIR}/bin/qt.conf <<EOF
+[Paths]
+Prefix=${PRODUCT_DIR}
+EOF
+# to generate environment scripts
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="qt-${QT_REF_VERSION}"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
+source ./common.sh
+$PROCEDURE 
diff --git a/config_files/sphinx-0.6.6.sh b/config_files/sphinx-0.6.6.sh
deleted file mode 100755 (executable)
index 3a503c4..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : sphinx-0.6.6.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
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-#
-# Sphinx version
-#
-SPHINX_VERSION=0.6.6
-
-check_version(){
-# It is not necessary to check version!
-return 0
-}
-
-print_env_bin(){
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export PYTHONPATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
-export PATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/bin:\${PATH}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-makedir ${PRODUCT_SRC_DIR}
-# unpack
-check_jb tar xfz ${SOURCE_DIR}/sphinx-${SPHINX_VERSION}.tar.gz -C ${PRODUCT_SRC_DIR}
-check_jb tar xfz ${SOURCE_DIR}/setuptools-0.6c11.tar.gz -C ${PRODUCT_SRC_DIR}
-check_jb tar xfz ${SOURCE_DIR}/jinja2-2.5.0.tar.gz -C ${PRODUCT_SRC_DIR}
-check_jb tar xfz ${SOURCE_DIR}/pygments-1.3.1.tar.gz -C ${PRODUCT_SRC_DIR}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-mkdir ${PRODUCT_DIR}/bin
-mkdir ${PRODUCT_DIR}/lib
-mkdir ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}
-mkdir ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages
-
-export PYTHONPATH=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/lib/python${PYTHON_VERSION}/site-packages:${PYTHONPATH}
-export PATH=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/bin:${PATH}
-
-# install omniORB
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-cd ${PRODUCT_SRC_DIR}/setuptools-0.6c11_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
-cd ${PRODUCT_SRC_DIR}/pygments-1.3.1_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
-cd ${PRODUCT_SRC_DIR}/jinja2-2.5.0_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
-cd ${PRODUCT_SRC_DIR}/sphinx-${SPHINX_VERSION}_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
-
-cd ${PRODUCT_DIR}/bin; 
-
-sed -e "s%#\!.*python%#\!/usr/bin/env python%" easy_install  > _easy_install
-mv -f _easy_install easy_install
-chmod a+x easy_install
-
-sed -e "s%#\!.*python%#\!/usr/bin/env python%" easy_install-${PYTHON_VERSION}  > _easy_install-${PYTHON_VERSION}
-mv -f _easy_install-${PYTHON_VERSION} easy_install-${PYTHON_VERSION}
-chmod a+x easy_install-${PYTHON_VERSION}
-
-sed -e "s%#\!.*python%#\!/usr/bin/env python%" pygmentize  > _pygmentize
-mv -f _pygmentize pygmentize
-chmod a+x pygmentize
-
-sed -e "s%#\!.*python%#\!/usr/bin/env python%" sphinx-build  > _sphinx-build
-mv -f _sphinx-build sphinx-build
-chmod a+x sphinx-build
-
-sed -e "s%#\!.*python%#\!/usr/bin/env python%" sphinx-quickstart  > _sphinx-quickstart
-mv -f _sphinx-quickstart sphinx-quickstart
-chmod a+x sphinx-quickstart
-
-sed -e "s%#\!.*python%#\!/usr/bin/env python%" sphinx-autogen > _sphinx-autogen
-mv -f _sphinx-autogen sphinx-autogen
-chmod a+x sphinx-autogen
-
-cd ${PRODUCT_DIR}
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-# create a product directory
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-
-# to generate environment script for sources
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="sphinx-${SPHINX_VERSION}"
-export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-source ./common.sh
-$PROCEDURE 
diff --git a/config_files/sphinx-1.0.4.sh b/config_files/sphinx-1.0.4.sh
new file mode 100755 (executable)
index 0000000..ace2b5f
--- /dev/null
@@ -0,0 +1,163 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : sphinx-1.0.4.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
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+#
+# Sphinx version
+#
+SPHINX_VERSION=1.0.4
+
+check_version(){
+# It is not necessary to check version!
+return 0
+}
+
+print_env_bin(){
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PYTHONPATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
+export PATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/bin:\${PATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+makedir ${PRODUCT_SRC_DIR}
+# unpack
+check_jb tar xfz ${SOURCE_DIR}/sphinx-${SPHINX_VERSION}.tar.gz -C ${PRODUCT_SRC_DIR}
+check_jb tar xfz ${SOURCE_DIR}/setuptools-0.6c11.tar.gz -C ${PRODUCT_SRC_DIR}
+check_jb tar xfz ${SOURCE_DIR}/jinja2-2.5.0.tar.gz -C ${PRODUCT_SRC_DIR}
+check_jb tar xfz ${SOURCE_DIR}/pygments-1.3.1.tar.gz -C ${PRODUCT_SRC_DIR}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+mkdir ${PRODUCT_DIR}/bin
+mkdir ${PRODUCT_DIR}/lib
+mkdir ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}
+mkdir ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages
+
+export PYTHONPATH=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/lib/python${PYTHON_VERSION}/site-packages:${PYTHONPATH}
+export PATH=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/bin:${PATH}
+
+export PYTHONDONTWRITEBYTECODE=
+
+# install omniORB
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+cd ${PRODUCT_SRC_DIR}/setuptools-0.6c11_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR}/pygments-1.3.1_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR}/jinja2-2.5.0_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR}/sphinx-${SPHINX_VERSION}_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
+
+cd ${PRODUCT_DIR}/bin; 
+
+sed -e "s%#\!.*python%#\!/usr/bin/env python%" easy_install  > _easy_install
+mv -f _easy_install easy_install
+chmod a+x easy_install
+
+sed -e "s%#\!.*python%#\!/usr/bin/env python%" easy_install-${PYTHON_VERSION}  > _easy_install-${PYTHON_VERSION}
+mv -f _easy_install-${PYTHON_VERSION} easy_install-${PYTHON_VERSION}
+chmod a+x easy_install-${PYTHON_VERSION}
+
+sed -e "s%#\!.*python%#\!/usr/bin/env python%" pygmentize  > _pygmentize
+mv -f _pygmentize pygmentize
+chmod a+x pygmentize
+
+sed -e "s%#\!.*python%#\!/usr/bin/env python%" sphinx-build  > _sphinx-build
+mv -f _sphinx-build sphinx-build
+chmod a+x sphinx-build
+
+sed -e "s%#\!.*python%#\!/usr/bin/env python%" sphinx-quickstart  > _sphinx-quickstart
+mv -f _sphinx-quickstart sphinx-quickstart
+chmod a+x sphinx-quickstart
+
+sed -e "s%#\!.*python%#\!/usr/bin/env python%" sphinx-autogen > _sphinx-autogen
+mv -f _sphinx-autogen sphinx-autogen
+chmod a+x sphinx-autogen
+
+cd ${PRODUCT_DIR}
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+# create a product directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
+
+# to generate environment script for sources
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="sphinx-${SPHINX_VERSION}"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
+source ./common.sh
+$PROCEDURE 
index b3394e5f45b13b4692c7d07e36c218d7d18cc86f..5fcfb2d99bb2b757aa2d434784327e353a97ea91 100755 (executable)
@@ -36,7 +36,7 @@ Wizard Help</font></font></h3>
 </table>
 </center>
 <div align="right"><b><font color="#000099">updated for the version </font><font
- color="#ff0000">6.1.0</font></b></div>
+ color="#ff0000">6.2.0</font></b></div>
 <hr>
 <ul>
   <li> <a href="#install_from_wizard">Installing products with the
index 4d85f745bec50e4c2da65405bafd427f7a7211d6..d04520cecb05fbfe965aa4e2f3d666469d213a79 100644 (file)
@@ -61,6 +61,9 @@
 QString tmpDirName() { return QString(  "/INSTALLWORK" ) + QString::number( getpid() ); }
 #define TEMPDIRNAME tmpDirName()
 
+// uncomment next line to redirect all shell output (usually for errors) to /dev/null device
+// #define USE_DEV_NULL
+
 // ================================================================
 /*!
  *  Script
@@ -313,8 +316,15 @@ static bool makeDir( const QString& theDir, QString& theCreated )
       if ( !fi.exists() ) {
        // VSR: Create directory and set permissions to allow other users to remove it
        Script script;
-       script << "mkdir"     << QUOTE( fi.absFilePath() ) << ">& /dev/null" << "&&";
-       script << "chmod 777" << QUOTE( fi.absFilePath() ) << ">& /dev/null";
+       script << "mkdir" << QUOTE( fi.absFilePath() );
+#ifdef USE_DEV_NULL
+       script << ">& /dev/null";
+#endif
+       script << "&&";
+       script << "chmod 777" << QUOTE( fi.absFilePath() );
+#ifdef USE_DEV_NULL
+       script << ">& /dev/null";
+#endif
        ___MESSAGE___( "script = " << script.script().latin1() );
        if ( system( script.script().latin1() ) )
          return false;
@@ -328,7 +338,10 @@ static bool makeDir( const QString& theDir, QString& theCreated )
   if ( !QFileInfo( aDir ).exists() ) {
     // VSR: Create directory, other users should NOT have possibility to remove it!!!
     Script script;
-    script << "mkdir" << QUOTE( aDir ) << ">& /dev/null";
+    script << "mkdir" << QUOTE( aDir );
+#ifdef USE_DEV_NULL
+    script << ">& /dev/null";
+#endif
     ___MESSAGE___( "script = " << script.script().latin1() );
     if ( system( script.script().latin1() ) )
       return false;
@@ -559,7 +572,7 @@ SALOME_InstallWizard::SALOME_InstallWizard(const QString& aXmlFileName,
   addLogo( pixmap( pxLogo ) );
 
   // set defaults
-  setVersion( "6.1.0" );
+  setVersion( "6.2.0" );
   setCaption( tr( "SALOME %1" ).arg( myVersion ) );
   setCopyright( tr( "<h5>Copyright &copy; 2007-2010 CEA/DEN, EDF R&amp;D, OPEN CASCADE<br></h5>"
                "<h5>Copyright &copy; 2003-2007 OPEN CASCADE,<br>EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D,<br>LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</h5>" ));
@@ -647,7 +660,10 @@ SALOME_InstallWizard::~SALOME_InstallWizard()
   int PID = (int)shellProcess->processIdentifier();
   if ( PID > 0 ) {
     Script script;
-    script << "kill -9" << QString::number( PID ) << ">& /dev/null";
+    script << "kill -9" << QString::number( PID );
+#ifdef USE_DEV_NULL
+    script << ">& /dev/null";
+#endif
     ___MESSAGE___( "script: " << script.script().latin1() );
     if ( system( script.script().latin1() ) ) {
       // error
@@ -2429,7 +2445,9 @@ void SALOME_InstallWizard::onFinishButton()
       script << (*it).script() << "execute";
       script << QUOTE( QFileInfo( QDir::cleanDirPath( targetFolder->text().stripWhiteSpace() ) ).absFilePath() );
       script << QUOTE( QFileInfo( QDir::cleanDirPath( tempFolder->text().stripWhiteSpace() ) + TEMPDIRNAME ).absFilePath() );
+#ifdef USE_DEV_NULL
       script << ">& /dev/null";
+#endif
       ___MESSAGE___( "script: " << script.script().latin1() );
       if ( (*it).script().isEmpty() || system( script.script().latin1() ) ) {
        QMessageBox::warning( this,
@@ -2544,7 +2562,9 @@ void SALOME_InstallWizard::clean(bool rmDir)
   script << "cd" << QUOTE( rd.filePath( "config_files" ) ) << ";";
   script << "remove_tmp.sh" << QUOTE( tempFolder->text().stripWhiteSpace() + TEMPDIRNAME );
   script << QUOTE( getAllProducts( productsMap ) );
+#ifdef USE_DEV_NULL
   script << ">& /dev/null";
+#endif
   ___MESSAGE___( "script = " << script.script().latin1() );
   if ( system( script.script().latin1() ) ) {
     // error
@@ -2554,7 +2574,9 @@ void SALOME_InstallWizard::clean(bool rmDir)
   if ( rmDir && !tmpCreated.isNull() ) {
     script.clear();
     script << "rm -rf" << QUOTE( tmpCreated );
+#ifdef USE_DEV_NULL
     script << ">& /dev/null";
+#endif
     if ( system( script.script().latin1() ) ) {
       // error
     }
@@ -2696,7 +2718,9 @@ void SALOME_InstallWizard::pageChanged( const QString & mytitle)
        script << (*it).script() << "check_enabled";
        script << QUOTE( QFileInfo( QDir::cleanDirPath( targetFolder->text().stripWhiteSpace() ) ).absFilePath() );
        script << QUOTE( QFileInfo( QDir::cleanDirPath( tempFolder->text().stripWhiteSpace() ) + TEMPDIRNAME ).absFilePath() );
+#ifdef USE_DEV_NULL
        script << ">& /dev/null";
+#endif
        ___MESSAGE___( "script: " << script.script().latin1() );
        (*it).button()->setEnabled( !(*it).script().isEmpty() && !system( script.script().latin1() ) );
       }