From: vsr <vsr@opencascade.com>
Date: Mon, 13 Mar 2006 11:40:11 +0000 (+0000)
Subject: Change CASCADE version number: 6.0 -> 6.1
X-Git-Tag: mergeto_SALOME_3_17May06~36
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4bcea5b6d2c5142a6f3388f643da147610372819;p=tools%2Finstall.git

Change CASCADE version number: 6.0 -> 6.1
---

diff --git a/config.xml b/config.xml
index 471d1bf..61a98e1 100644
--- a/config.xml
+++ b/config.xml
@@ -97,15 +97,15 @@
 	   temporarydiskspace="27724"
 	   script="SWIG-1.3.24.sh"/>
   <product name="OpenCascade" 
-           version="6.0" 
-           description="Open CASCADE version 6.0.0"
+           version="6.1" 
+           description="Open CASCADE version 6.1.0"
            install="install binaries"
 	   supported="install sources,install binaries"
 	   disable="false"
 	   dependancies="gcc,tcltk"
 	   installdiskspace="217388"
 	   temporarydiskspace="980538"
-	   script="CAS-6.0.sh"/>
+	   script="CAS-6.1.sh"/>
   <product name="Qwt" 
            version="4.2.0" 
            description="2-D plotting extension for Qt library"
diff --git a/config_Debian_3.1.xml b/config_Debian_3.1.xml
index 471d1bf..61a98e1 100755
--- a/config_Debian_3.1.xml
+++ b/config_Debian_3.1.xml
@@ -97,15 +97,15 @@
 	   temporarydiskspace="27724"
 	   script="SWIG-1.3.24.sh"/>
   <product name="OpenCascade" 
-           version="6.0" 
-           description="Open CASCADE version 6.0.0"
+           version="6.1" 
+           description="Open CASCADE version 6.1.0"
            install="install binaries"
 	   supported="install sources,install binaries"
 	   disable="false"
 	   dependancies="gcc,tcltk"
 	   installdiskspace="217388"
 	   temporarydiskspace="980538"
-	   script="CAS-6.0.sh"/>
+	   script="CAS-6.1.sh"/>
   <product name="Qwt" 
            version="4.2.0" 
            description="2-D plotting extension for Qt library"
diff --git a/config_files/CAS-6.0.sh b/config_files/CAS-6.0.sh
deleted file mode 100755
index a21ac98..0000000
--- a/config_files/CAS-6.0.sh
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/bin/sh
-
-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.0.0" ] ; then
-    return 0
-fi
-return 1
-}
-
-print_env()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export CASROOT=\${INSTALL_ROOT}/${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_SHMessageStd=\${CASROOT}/src/SHMessageStd
-export CSF_XSMessage=\${CASROOT}/src/XSMessage 
-# Variable for Font : 
-export CSF_MDTVFontDirectory=\${CASROOT}/src/FontMFT 
-export CSF_MDTVTexturesDirectory=\${CASROOT}/src/Textures 
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
-}
-
-# looks for the native product and collects it's environment (used by make_env())
-try_native(){
-check_version
-if [ $? -eq 0 ] ; then
-    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export CASROOT=${CASROOT}
-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_SHMessageStd=\${CASROOT}/src/SHMessageStd
-export CSF_XSMessage=\${CASROOT}/src/XSMessage 
-# Variable for Font : 
-export CSF_MDTVFontDirectory=\${CASROOT}/src/FontMFT 
-export CSF_MDTVTexturesDirectory=\${CASROOT}/src/Textures 
-##
-EOF
-    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
-    return 0
-fi
-return 1;
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-return $?
-}
-
-install_source()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-makedir ${PRODUCT_DIR}
-
-# unpack
-check_jb tar xfz ${SOURCE_DIR}/CAS-6.0.tar.gz -C ${INSTALL_WORK}
-cd ${PRODUCT_WORK}
-
-# configure
-flags="--with-gl-include=/usr/include --with-gl-library=/usr/lib"
-flags="$flags --with-xmu-include=/usr/X11R6/include/X11"
-flags="$flags --with-xmu-library=/usr/X11R6/lib"
-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-debug --enable-production"
-
-export CASROOT=${PRODUCT_WORK}
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure $flags --prefix=${PRODUCT_DIR}
-
-# make
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make -j4 install-strip
-
-# copy includes
-cp -fr inc ${PRODUCT_DIR}
-cp -f config.h ${PRODUCT_DIR}
-(cd ${PRODUCT_DIR}/inc; ln -fs ../config.h config.h)
-# copy resources
-makedir ${PRODUCT_DIR}/src
-cp -rp src/UnitsAPI ${PRODUCT_DIR}/src
-cp -rp src/SHMessage ${PRODUCT_DIR}/src
-cp -rp src/FontMFT ${PRODUCT_DIR}/src
-cp -rp src/Textures ${PRODUCT_DIR}/src
-cp -rp src/XSMessage ${PRODUCT_DIR}/src
-cp -rp src/DrawResources ${PRODUCT_DIR}/src
-(cd ${PRODUCT_DIR}; mkdir -p Linux; cd Linux; ln -fs ../lib lib)
-(cd ${PRODUCT_DIR}; mkdir -p lin; cd lin; ln -fs ../lib lib)
-
-#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
-cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
-print_env
-}
-
-install_binary()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/CAS-6.0.tar.gz -C ${INSTALL_ROOT}
-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
-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
-
-print_env
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INSTALL_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="cas" ; fi
-export PRODUCT="CAS-6.0"
-export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-source ./common.sh
-$PROCEDURE 
diff --git a/config_files/CAS-6.1.sh b/config_files/CAS-6.1.sh
new file mode 100755
index 0000000..7c68ed8
--- /dev/null
+++ b/config_files/CAS-6.1.sh
@@ -0,0 +1,166 @@
+#!/bin/sh
+
+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.1.0" ] ; then
+    return 0
+fi
+return 1
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export CASROOT=\${INSTALL_ROOT}/${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_SHMessageStd=\${CASROOT}/src/SHMessageStd
+export CSF_XSMessage=\${CASROOT}/src/XSMessage 
+# Variable for Font : 
+export CSF_MDTVFontDirectory=\${CASROOT}/src/FontMFT 
+export CSF_MDTVTexturesDirectory=\${CASROOT}/src/Textures 
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if [ $? -eq 0 ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export CASROOT=${CASROOT}
+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_SHMessageStd=\${CASROOT}/src/SHMessageStd
+export CSF_XSMessage=\${CASROOT}/src/XSMessage 
+# Variable for Font : 
+export CSF_MDTVFontDirectory=\${CASROOT}/src/FontMFT 
+export CSF_MDTVTexturesDirectory=\${CASROOT}/src/Textures 
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+return 1;
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+makedir ${PRODUCT_DIR}
+
+# unpack
+check_jb tar xfz ${SOURCE_DIR}/CAS-6.1.tar.gz -C ${INSTALL_WORK}
+cd ${PRODUCT_WORK}
+
+# configure
+flags="--with-gl-include=/usr/include --with-gl-library=/usr/lib"
+flags="$flags --with-xmu-include=/usr/X11R6/include/X11"
+flags="$flags --with-xmu-library=/usr/X11R6/lib"
+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-debug --enable-production"
+
+export CASROOT=${PRODUCT_WORK}
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure $flags --prefix=${PRODUCT_DIR}
+
+# make
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE.LOG make -j4 install-strip
+
+# copy includes
+cp -fr inc ${PRODUCT_DIR}
+cp -f config.h ${PRODUCT_DIR}
+(cd ${PRODUCT_DIR}/inc; ln -fs ../config.h config.h)
+# copy resources
+makedir ${PRODUCT_DIR}/src
+cp -rp src/UnitsAPI ${PRODUCT_DIR}/src
+cp -rp src/SHMessage ${PRODUCT_DIR}/src
+cp -rp src/FontMFT ${PRODUCT_DIR}/src
+cp -rp src/Textures ${PRODUCT_DIR}/src
+cp -rp src/XSMessage ${PRODUCT_DIR}/src
+cp -rp src/DrawResources ${PRODUCT_DIR}/src
+(cd ${PRODUCT_DIR}; mkdir -p Linux; cd Linux; ln -fs ../lib lib)
+(cd ${PRODUCT_DIR}; mkdir -p lin; cd lin; ln -fs ../lib lib)
+
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
+print_env
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/CAS-6.1.tar.gz -C ${INSTALL_ROOT}
+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
+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
+
+print_env
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="cas" ; fi
+export PRODUCT="CAS-6.1"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE