From: vsr <vsr@opencascade.com>
Date: Thu, 3 Nov 2005 15:39:06 +0000 (+0000)
Subject: Fix bugs
X-Git-Tag: V_3_1_0a2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=efd5556e73d842014085fa8f86bbf23dd7d55435;p=tools%2Finstall.git

Fix bugs
---

diff --git a/config_files/CAS-6.0.sh b/config_files/CAS-6.0.sh
index cf1a7d1..81eab0f 100755
--- a/config_files/CAS-6.0.sh
+++ b/config_files/CAS-6.0.sh
@@ -9,12 +9,12 @@ 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_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 1
+    return 0
 fi
 return 1
 }
diff --git a/config_files/VTK-4.2.2.sh b/config_files/VTK-4.2.2.sh
index 9615f7d..830d862 100755
--- a/config_files/VTK-4.2.2.sh
+++ b/config_files/VTK-4.2.2.sh
@@ -3,12 +3,10 @@
 check_version()
 {
 if [ -z "$VTKHOME" ]; then
-   #echo "VTKHOME doesn't set"
    return 1 
 fi
 check_lib_version libvtkCommon.so ${VTKHOME}/lib/vtk
 if [ "$?" -eq "0" ]; then
-   #echo "The product ${PRODUCT} has been already installed on yours system"
    return 0
 fi
 return 1
@@ -141,7 +139,7 @@ cd ${PRODUCT_WORK}/Wrapping/Python
 check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PRODUCT_DIR}
 
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
-#du -sk ${INSTALL_WORK}/cmake-1.6.6 > ${PRODUCT_DIR}/size1.log
+#du -sk ${INSTALL_WORK}/cmake-1.6.6 >> ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK} ${INSTALL_WORK}/cmake-1.6.6
 
 # set correct symbolic links - bug of python wrappings installation
diff --git a/config_files/VTK-4.2.6.sh b/config_files/VTK-4.2.6.sh
index ccc4baa..56ae5f7 100755
--- a/config_files/VTK-4.2.6.sh
+++ b/config_files/VTK-4.2.6.sh
@@ -84,7 +84,11 @@ mv -f IO/vtkImageReader.cxx.orig IO/vtkImageReader.cxx
 
 # get Python and tcl/tk version
 python_version="`python -c 'import sys; print sys.version[:3]'`"
-tcl_version="`find ${TCLHOME}/lib -name 'libtcl*.so' | awk '/libtcl[0-9.]+.so/ { print $0}' | sed -e 's%^.*libtcl\([0-9\.]*\)\.so%\1%'`"
+tcl_version=""
+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"`
+fi
     
 VTK_CMAKE_OPTIONS=""
 ### common VTK settings
@@ -98,11 +102,14 @@ 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"
 ### Wrap Python settings
+if [ "${python_version}" != "" ]; then
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_PYTHON:BOOL=ON"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHONHOME}/bin/python${python_version}"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_INCLUDE_PATH:STRING=${PYTHONHOME}/include/python${python_version}"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHONHOME}/lib/python${python_version}/config/libpython${python_version}.a"
+fi
 ### Wrap Tcl settings
+if [ "${tcl_version}" != "" ]; then
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=ON"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_INCLUDE_PATH:STRING=${TCLHOME}/include"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_LIBRARY:STRING=${TCLHOME}/lib/libtcl${tcl_version}.so"
@@ -112,6 +119,7 @@ VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_INCLUDE_PATH:STRING=${TCLHOME}/includ
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_LIBRARY:STRING=${TCLHOME}/lib/libtk${tcl_version}.so"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_STUB_LIBRARY:STRING=${TCLHOME}/lib/libtkstub${tcl_version}.a"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_WISH:STRING=${TCLHOME}/bin/wish"
+fi
 ### if Mesa is pre-installed
 if [ -n "$MESA_HOME" ]; then
   VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_INCLUDE_DIR:STRING=${MESA_HOME}/include"
@@ -131,19 +139,19 @@ used gcc=$GCC
 EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make
 
-check_job ${PRODUCT_DIR}/INSTALL.LOG make install
+check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
 cd ${PRODUCT_WORK}/Wrapping/Python
 check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PRODUCT_DIR}
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+#du -sk ${INSTALL_WORK}/cmake-1.6.6 >> ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK} ${INSTALL_WORK}/cmake-1.6.6
 
 # set correct symbolic links - bug of python wrappings installation
 cd ${PRODUCT_DIR}/lib/python${python_version}/site-packages/vtk_python
 ln -sf ../../../vtk/*Python*.so .
 
-#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
-rm -fr ${PRODUCT_WORK}
 print_env
 }
 
diff --git a/config_files/graphviz-1.9.sh b/config_files/graphviz-1.9.sh
index 9c5c8d4..2d4d694 100755
--- a/config_files/graphviz-1.9.sh
+++ b/config_files/graphviz-1.9.sh
@@ -60,7 +60,7 @@ check_jb tar xfz ${SOURCE_DIR}/graphviz-1.9.tar.gz -C ${INSTALL_WORK}
 
 cd ${PRODUCT_WORK}
 makedir ${PRODUCT_DIR}
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG configure --prefix=${PRODUCT_DIR} --with-tcl=$TCLHOME --disable-rpath 
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG configure --prefix=${PRODUCT_DIR} --with-tcl=${TCLHOME} --disable-rpath 
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
diff --git a/config_files/graphviz-2.2.1.sh b/config_files/graphviz-2.2.1.sh
index e2302c7..4e8b94f 100755
--- a/config_files/graphviz-2.2.1.sh
+++ b/config_files/graphviz-2.2.1.sh
@@ -66,7 +66,7 @@ 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
+check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
@@ -79,6 +79,15 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/graphviz-2.2.1.tar.gz -C ${INSTALL_ROOT}
+cd ${PRODUCT_DIR}/lib/graphviz
+for l in `ls *.la`; do
+    libdir=`grep -e "libdir=.*" $l | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"`
+    sed -e "s%${libdir}%${PRODUCT_DIR}/lib/graphviz%g" $l > _$l
+    libdir=`dirname $libdir`
+    sed -e "s%${libdir}%${PRODUCT_DIR}/lib/graphviz%g" _$l > $l
+    rm -f _$l
+    chmod a+x $l
+done
 
 print_env
 }