From: vsr <vsr@opencascade.com>
Date: Tue, 16 Apr 2013 15:07:35 +0000 (+0000)
Subject: Minor changes
X-Git-Tag: V7_2_0rc1~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d20cfb771c03216319c54e38992ca8925b0870c6;p=tools%2Finstall.git

Minor changes
---

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 29293b9..700b277 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -170,7 +170,7 @@
 	     description="SALOME platform PYCALCULATOR module">
       <installation os="CentOS 5.5 64bit"
                     version="7.2.0" 
-		    disable="false"
+		    disable="true"
 		    installdiskspace="220,2060,5764"
 		    script="PYCALCULATOR.sh"/>
     </product>
@@ -489,7 +489,7 @@
                     version="30_018oss"
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="tbb30_018oss.sh"/>
+		    script="tbb.sh"/>
     </product>
     <product name="OpenCascade" 
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 9f1ff83..8fe0284 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -170,7 +170,7 @@
 	     description="SALOME platform PYCALCULATOR module">
       <installation os="Debian 6.0 64bit"
                     version="7.2.0" 
-		    disable="false"
+		    disable="true"
 		    installdiskspace="220,2060,5764"
 		    script="PYCALCULATOR.sh"/>
     </product>
@@ -489,7 +489,7 @@
                     version="30_018oss"
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="tbb30_018oss.sh"/>
+		    script="tbb.sh"/>
     </product>
     <product name="OpenCascade" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index bfd8945..1db26ba 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -170,7 +170,7 @@
 	     description="SALOME platform PYCALCULATOR module">
       <installation os="Mandriva 2010.0"
                     version="7.2.0" 
-		    disable="false"
+		    disable="true"
 		    installdiskspace="220,2060,5764"
 		    script="PYCALCULATOR.sh"/>
     </product>
@@ -489,7 +489,7 @@
                     version="30_018oss"
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="tbb30_018oss.sh"/>
+		    script="tbb.sh"/>
     </product>
     <product name="OpenCascade" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index ea779b7..ed15f9f 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -170,7 +170,7 @@
 	     description="SALOME platform PYCALCULATOR module">
       <installation os="Mandriva 2010.0 64bit"
                     version="7.2.0" 
-		    disable="false"
+		    disable="true"
 		    installdiskspace="220,2060,5764"
 		    script="PYCALCULATOR.sh"/>
     </product>
@@ -489,7 +489,7 @@
                     version="30_018oss"
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="tbb30_018oss.sh"/>
+		    script="tbb.sh"/>
     </product>
     <product name="OpenCascade" 
 	     type="prerequisite"
diff --git a/config_files/freeimage.sh b/config_files/freeimage.sh
index 117891e..d57380f 100755
--- a/config_files/freeimage.sh
+++ b/config_files/freeimage.sh
@@ -86,18 +86,16 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 # [-]
 local patch_build_procedure=1
 if [ "${patch_build_procedure}" = "1" ] ; then
-    echo -n ".. Patching freeimage sources: fix build procedure..." && \
-	cd ${PRODUCT_SRC_DIR} && \
-	sed -i "s%DESTDIR ?= /%DESTDIR ?= /usr%g;s%INCDIR ?= \$(DESTDIR)/usr/include%INCDIR ?= \$(DESTDIR)/include%g;s%INSTALLDIR ?= \$(DESTDIR)/usr/lib%INSTALLDIR ?= \$(DESTDIR)/lib%g;s%-o root -g root %%g" Makefile.gnu >& /dev/null && \
-	sed -i "s%DESTDIR ?= /%DESTDIR ?= /usr%g;s%INCDIR ?= \$(DESTDIR)/usr/include%INCDIR ?= \$(DESTDIR)/include%g;s%INSTALLDIR ?= \$(DESTDIR)/usr/lib%INSTALLDIR ?= \$(DESTDIR)/lib%g;s%-o root -g root %%g" Makefile.fip >& /dev/null
+    cd ${PRODUCT_SRC_DIR}
+    sed -i "s%DESTDIR ?= /%DESTDIR ?= /usr%g;s%INCDIR ?= \$(DESTDIR)/usr/include%INCDIR ?= \$(DESTDIR)/include%g;s%INSTALLDIR ?= \$(DESTDIR)/usr/lib%INSTALLDIR ?= \$(DESTDIR)/lib%g;s%-o root -g root %%g" Makefile.gnu
+    sed -i "s%DESTDIR ?= /%DESTDIR ?= /usr%g;s%INCDIR ?= \$(DESTDIR)/usr/include%INCDIR ?= \$(DESTDIR)/include%g;s%INSTALLDIR ?= \$(DESTDIR)/usr/lib%INSTALLDIR ?= \$(DESTDIR)/lib%g;s%-o root -g root %%g" Makefile.fip
 fi
 
 # [-]
 local patch_gcc47_compat=1
 if [ "${patch_gcc47_compat}" = "1" ] ; then
-    echo -n ".. Patching freeimage sources: gcc 4.7 compatibility..." && \
-	cd ${PRODUCT_SRC_DIR} && \
-	sed -i 's%\(#include "OpenEXRConfig.h"\)%\1\n#include <string.h>%g' Source/OpenEXR/IlmImf/ImfAutoArray.h >& /dev/null
+    cd ${PRODUCT_SRC_DIR}
+    sed -i 's%\(#include "OpenEXRConfig.h"\)%\1\n#include <string.h>%g' Source/OpenEXR/IlmImf/ImfAutoArray.h
 fi
 
 cd ${PRODUCT_SRC_DIR}
@@ -110,8 +108,8 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make -f Makefile.gnu
 # install
 check_job ${PRODUCT_DIR}/INSTALL.LOG make -f Makefile.gnu DESTDIR=${PRODUCT_DIR} install 
 
-# clean temporary files. 
-make -f Makefile.fip clean 
+# clean temporary files
+make -f Makefile.gnu clean 
 
 ## building FreeImagePlus library
 
@@ -121,7 +119,7 @@ check_job ${PRODUCT_DIR}/MAKEPLUS.LOG make -f Makefile.fip
 # install
 check_job ${PRODUCT_DIR}/INSTALLPLUS.LOG make -f Makefile.fip DESTDIR=${PRODUCT_DIR} install 
 
-# clean temporary files. 
+# clean temporary files
 make -f Makefile.fip clean 
 
 cd ${PRODUCT_DIR};
diff --git a/config_files/tbb.sh b/config_files/tbb.sh
new file mode 100755
index 0000000..cd048ea
--- /dev/null
+++ b/config_files/tbb.sh
@@ -0,0 +1,101 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : tbb.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-2013 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+TBB_VERSION=30_018oss
+TBBKERNEL='cc4.1.0_libc2.4_kernel2.6.16.21'
+
+if test `uname -m` = "x86_64" ; then
+    export TBBMODE="intel64/$TBBKERNEL"
+else
+    export TBBMODE="ia32/$TBBKERNEL"
+fi
+
+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 TBBHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${TBBHOME}/bin/$TBBMODE:\$PATH 
+export LD_LIBRARY_PATH=\${TBBHOME}/lib/$TBBMODE:\${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()
+{
+echo "It's impossible to install ${PRODUCT} from sources"
+}
+
+install_source_and_build()
+{
+install_binary
+}
+
+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 ${BIN_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
+
+
+# to generate environment script
+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;
+REMOVE_SRC_TMP=$9;
+shift
+BIN_DIR=$9;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="tbb${TBB_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/tbb30_018oss.sh b/config_files/tbb30_018oss.sh
deleted file mode 100755
index 19be85c..0000000
--- a/config_files/tbb30_018oss.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : tbb30_018oss.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-2013 CEA
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-
-TBBKERNEL='cc4.1.0_libc2.4_kernel2.6.16.21'
-
-if test `uname -m` = "x86_64" ; then
-    export TBBMODE="intel64/$TBBKERNEL"
-else
-    export TBBMODE="ia32/$TBBKERNEL"
-fi
-
-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 TBBHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${TBBHOME}/bin/$TBBMODE:\$PATH 
-export LD_LIBRARY_PATH=\${TBBHOME}/lib/$TBBMODE:\${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()
-{
-echo "It's impossible to install ${PRODUCT} from sources"
-}
-
-install_source_and_build()
-{
-install_binary
-}
-
-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 ${BIN_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-
-
-# to generate environment script
-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;
-REMOVE_SRC_TMP=$9;
-shift
-BIN_DIR=$9;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="tbb30_018oss"
-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