From 2f42e80ac5a744d0b10f58d83a7192187da4bd92 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Wed, 1 Mar 2006 15:02:55 +0000
Subject: [PATCH] *** empty log message ***

---
 config.xml                      |  2 +-
 config_Mandrake_10.1.xml        |  2 +-
 config_RedHat_8.0.xml           |  2 +-
 config_RedHat_8.0_with_Mesa.xml |  2 +-
 config_RedHat_9.xml             |  2 +-
 config_Scientific_3.0.5.xml     |  2 +-
 config_files/BOOST-1.30.2.sh    | 32 +++++++++++++++++++++++++++-----
 config_files/BOOST-1.31.0.sh    | 22 +++++++++++++++++++++-
 8 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/config.xml b/config.xml
index b1a33c6..64ae811 100644
--- a/config.xml
+++ b/config.xml
@@ -4,7 +4,7 @@
           copyright="&lt;h5>Copyright (C) 2003-2005 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>"
 	  os="RedHat8.0"/>
-  <path targetdir="${HOME}/salome"
+  <path targetdir="${HOME}/salome_2.2.8"
         tempdir="/tmp"/>
   <product name="gcc" 
            version="3.2" 
diff --git a/config_Mandrake_10.1.xml b/config_Mandrake_10.1.xml
index f3ce713..b8f5e15 100755
--- a/config_Mandrake_10.1.xml
+++ b/config_Mandrake_10.1.xml
@@ -4,7 +4,7 @@
           copyright="&lt;h5>Copyright (C) 2003-2005 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>"
 	  os="Mandrake10.1"/>
-  <path targetdir="${HOME}/salome"
+  <path targetdir="${HOME}/salome_2.2.8"
         tempdir="/tmp"/>
   <product name="gcc" 
            version="3.4.1" 
diff --git a/config_RedHat_8.0.xml b/config_RedHat_8.0.xml
index 5f0228a..64775ed 100755
--- a/config_RedHat_8.0.xml
+++ b/config_RedHat_8.0.xml
@@ -4,7 +4,7 @@
           copyright="&lt;h5>Copyright (C) 2003-2005 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>"
 	  os="RedHat8.0"/>
-  <path targetdir="${HOME}/salome"
+  <path targetdir="${HOME}/salome_2.2.8"
         tempdir="/tmp"/>
   <product name="gcc" 
            version="3.2" 
diff --git a/config_RedHat_8.0_with_Mesa.xml b/config_RedHat_8.0_with_Mesa.xml
index ad27d82..9ddaf45 100755
--- a/config_RedHat_8.0_with_Mesa.xml
+++ b/config_RedHat_8.0_with_Mesa.xml
@@ -4,7 +4,7 @@
           copyright="&lt;h5>Copyright (C) 2003-2005 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>"
 	  os="RedHat8.0"/>
-  <path targetdir="${HOME}/salome"
+  <path targetdir="${HOME}/salome_2.2.8"
         tempdir="/tmp"/>
   <product name="gcc" 
            version="3.2" 
diff --git a/config_RedHat_9.xml b/config_RedHat_9.xml
index f74ede4..1ffe836 100755
--- a/config_RedHat_9.xml
+++ b/config_RedHat_9.xml
@@ -4,7 +4,7 @@
           copyright="&lt;h5>Copyright (C) 2003-2005 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>"
 	  os="RedHat9"/>
-  <path targetdir="${HOME}/salome"
+  <path targetdir="${HOME}/salome_2.2.8"
         tempdir="/tmp"/>
   <product name="gcc" 
            version="3.2" 
diff --git a/config_Scientific_3.0.5.xml b/config_Scientific_3.0.5.xml
index 91d2548..136bd2a 100755
--- a/config_Scientific_3.0.5.xml
+++ b/config_Scientific_3.0.5.xml
@@ -4,7 +4,7 @@
           copyright="&lt;h5>Copyright (C) 2003-2005 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>"
 	  os="Scientific3.0.5"/>
-  <path targetdir="${HOME}/salome"
+  <path targetdir="${HOME}/salome_2.2.8"
         tempdir="/tmp"/>
   <product name="gcc" 
            version="3.2" 
diff --git a/config_files/BOOST-1.30.2.sh b/config_files/BOOST-1.30.2.sh
index bf0c29a..708d8fb 100755
--- a/config_files/BOOST-1.30.2.sh
+++ b/config_files/BOOST-1.30.2.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
 
 check_version(){
-ver=`egrep 'BOOST_VERSION [0-9]+' ${BOOSTDIR}/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`
-if [ "$ver" = "103002" ]; then
-  return 0
+if [ -n "${BOOSTDIR}" ]; then
+    ver=`egrep 'BOOST_VERSION [0-9]+' ${BOOSTDIR}/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`
+    if [ "$ver" = "103002" ]; then
+	return 0
+    fi
 fi
 return 1;
 }
@@ -21,7 +23,27 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
-echo "It is impossible to use native BOOST."
+boostdir="`find_in_path version.hpp /usr/include/boost`"
+if [ -z "${boostdir}" ] ; then
+    boostdir="`find_in_path version.hpp /usr/share/include/boost`"
+fi
+if [ -n "${boostdir}" ] ; then
+    boostdir=`cd ${boostdir}/..; pwd`
+    ver=`egrep 'BOOST_VERSION [0-9]+' ${boostdir}/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`
+    if [ $ver -ge 103002 ] ;  then 
+	cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM 
+export BOOSTDIR=${boostdir}
+##
+EOF
+	make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+	if [ $ver -eq 103002 ] ;  then 
+	    return 0
+	else
+	    return 2
+	fi
+    fi
+fi
 return 1
 }
 
@@ -42,7 +64,7 @@ print_env
 
 install_binary()
 {
-echo "It impossible to install BOOST from binaries, try install from sources."
+echo "It impossible to install BOOST 1.30.2 from binaries, try to install it from sources."
 return 1
 }
 
diff --git a/config_files/BOOST-1.31.0.sh b/config_files/BOOST-1.31.0.sh
index e6e0f76..a694d27 100755
--- a/config_files/BOOST-1.31.0.sh
+++ b/config_files/BOOST-1.31.0.sh
@@ -23,7 +23,27 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
-echo "It is impossible to use native BOOST 1.31.0."
+boostdir="`find_in_path version.hpp /usr/include/boost`"
+if [ -z "${boostdir}" ] ; then
+    boostdir="`find_in_path version.hpp /usr/share/include/boost`"
+fi
+if [ -n "${boostdir}" ] ; then
+    boostdir=`cd ${boostdir}/..; pwd`
+    ver=`egrep 'BOOST_VERSION [0-9]+' ${boostdir}/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`
+    if [ $ver -ge 103100 ] ;  then 
+	cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM 
+export BOOSTDIR=${boostdir}
+##
+EOF
+	make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+	if [ $ver -eq 103100 ] ;  then 
+	    return 0
+	else
+	    return 2
+	fi
+    fi
+fi
 return 1
 }
 
-- 
2.39.2