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

Minor changes
---

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index a61d23d..29293b9 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -1098,6 +1098,7 @@
     <product name="Swig">
       <dep>Python</dep>
       <dep>tcltk</dep>
+      <dep>boost</dep>
     </product>
     <product name="ftgl">
       <dep>freetype</dep>
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 47897d6..9f1ff83 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -1098,6 +1098,7 @@
     <product name="Swig">
       <dep>Python</dep>
       <dep>tcltk</dep>
+      <dep>boost</dep>
     </product>
     <product name="ftgl">
       <dep>freetype</dep>
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index b28da79..bfd8945 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -1084,6 +1084,7 @@
     <product name="Swig">
       <dep>Python</dep>
       <dep>tcltk</dep>
+      <dep>boost</dep>
     </product>
     <product name="ftgl">
       <dep>freetype</dep>
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index 9bc494a..ea779b7 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -1084,6 +1084,7 @@
     <product name="Swig">
       <dep>Python</dep>
       <dep>tcltk</dep>
+      <dep>boost</dep>
     </product>
     <product name="ftgl">
       <dep>freetype</dep>
diff --git a/config_files/boost.sh b/config_files/boost.sh
index 22c5657..1f9545a 100755
--- a/config_files/boost.sh
+++ b/config_files/boost.sh
@@ -87,11 +87,14 @@ EOF
 
 # configure
 cd ${PRODUCT_SRC_DIR}
-check_job ${PRODUCT_DIR}/BUILD.LOG ./bootstrap.sh --with-toolset=gcc --with-python=`which python` --prefix=${PRODUCT_DIR}
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./bootstrap.sh --with-toolset=gcc --with-python=`which python` --prefix=${PRODUCT_DIR}
 
 # make & install
 cd ${PRODUCT_SRC_DIR}
 
+PRODUCT_BUILD_DIR=${PRODUCT_DIR}_build
+mkdir -p ${PRODUCT_BUILD_DIR} >& /dev/null
+
 ./b2 --prefix=${PRODUCT_DIR} toolset=gcc variant=release runtime-link=shared threading=multi --build-dir=${PRODUCT_BUILD_DIR} install >& ${PRODUCT_DIR}/INSTALL.LOG 
 
 if [ "$?" -ne "0" ] ; then
@@ -105,6 +108,7 @@ 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}
+    test -d ${PRODUCT_BUILD_DIR} && rm -fr ${PRODUCT_BUILD_DIR}
 fi
 
 # to generate environment scripts
diff --git a/config_files/swig.sh b/config_files/swig.sh
index 673fcca..276d688 100755
--- a/config_files/swig.sh
+++ b/config_files/swig.sh
@@ -15,7 +15,7 @@
 #
 # swig version
 #
-SWIG_VERSION=2.0.9
+SWIG_VERSION=2.0.8
 
 check_version(){
 if [ -n "`which swig 2>/dev/null`" ]; then
@@ -33,8 +33,8 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 #$DELIM ${PRODUCT_TYPE} $DELIM 
 export SWIG_ROOT=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export SWIG_ROOT_DIR=\${SWIG_ROOT}
-export PATH=\${SWIG_ROOT}/bin:\${PATH}
 export SWIG_LIB=\${SWIG_ROOT}/share/swig/${SWIG_VERSION}
+export PATH=\${SWIG_ROOT}/bin:\${PATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})