X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FVTK-4.2.6.sh;h=9c15a1f6e79749679e623c02c6cf5c0b508f046b;hb=334e45273d26a197394a5adf39aa7605363589b7;hp=c35db83c244011e3178c16207caae58a49018c24;hpb=284f495e7d904a7684d52143e5f53d18ebf5909a;p=tools%2Finstall.git

diff --git a/config_files/VTK-4.2.6.sh b/config_files/VTK-4.2.6.sh
index c35db83..9c15a1f 100755
--- a/config_files/VTK-4.2.6.sh
+++ b/config_files/VTK-4.2.6.sh
@@ -1,4 +1,16 @@
-#!/bin/sh
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : VTK-4.2.6.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-2007 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
 
 check_version()
 {
@@ -66,14 +78,26 @@ source ${INSTALL_WORK}/$SHRC
 makedir ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/cmake-1.6.6.tar.gz -C ${INSTALL_WORK}
+check_jb tar xfz ${SOURCE_DIR}/VTK-4.2.6.tar.gz -C ${INSTALL_WORK}
 
+# apply patches for 64-bit platforms
 if test `uname -m` = "x86_64" ; then
-cp cmake-1.6.6.patch ${INSTALL_WORK}/cmake-1.6.6 
-cd ${INSTALL_WORK}/cmake-1.6.6 
-patch -p 1 -i cmake-1.6.6.patch
-else
-cd ${INSTALL_WORK}/cmake-1.6.6 
+    if [ -f patches/cmake-1.6.6-lib64.patch ] ; then
+	cp patches/cmake-1.6.6-lib64.patch ${INSTALL_WORK}/cmake-1.6.6 
+	( cd ${INSTALL_WORK}/cmake-1.6.6 ; patch -p1 < cmake-1.6.6-lib64.patch )
+    fi
+    if [ -f patches/vtk-4.2.6-lib64.patch ] ; then
+	cp patches/vtk-4.2.6-lib64.patch ${PRODUCT_WORK}
+	( cd ${PRODUCT_WORK} ; patch -p1 < vtk-4.2.6-lib64.patch )
+    fi
 fi
+# apply patch: fix pb with importing Python vtk modules on some platforms
+if [ -f patches/vtk-4.2.6-patented.patch ] ; then
+    cp patches/vtk-4.2.6-patented.patch ${PRODUCT_WORK}
+    ( cd ${PRODUCT_WORK} ; patch -p1 < vtk-4.2.6-patented.patch )
+fi
+
+cd ${INSTALL_WORK}/cmake-1.6.6 
 
 check_job ${PRODUCT_DIR}/CONFIGUREcmake.LOG ./configure
 cat >> ${PRODUCT_DIR}/MAKEcmake.LOG <<EOF
@@ -81,15 +105,7 @@ used gcc=$GCC
 EOF
 check_job ${PRODUCT_DIR}/MAKEcmake.LOG make
 
-check_jb tar xfz ${SOURCE_DIR}/VTK-4.2.6.tar.gz -C ${INSTALL_WORK}
-
-if test `uname -m` = "x86_64" ; then
-cp ${SOURCE_DIR}/../../config_files/vtk-4.2.6.patch  ${PRODUCT_WORK}
-cd ${PRODUCT_WORK} 
-patch -p 1 -i vtk-4.2.6.patch
-else
 cd ${PRODUCT_WORK}
-fi
 
 # apply a small patch for VTK (needed for gcc-3.4)
 sed -e "s%seekg(self->GetFile()->tellg()%seekg(static_cast<long>(self->GetFile()->tellg())%g" IO/vtkBMPReader.cxx > IO/vtkBMPReader.cxx.orig
@@ -172,14 +188,8 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make
 
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
-#  if test `uname -m` = "x86_64" ; then
-#cd ${PRODUCT_WORK}/Wrapping/Python
-#sed -e "s%/lib/vtk%/lib64/vtk%" setup.py.in > _setup.py.in
-#mv -f _setup.py.in setup.py.in
-#chmod a+x setup.py.in
-#else
 cd ${PRODUCT_WORK}/Wrapping/Python
-#  fi
+
 check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PRODUCT_DIR}
 
 # set correct symbolic links - bug of python wrappings installation
@@ -191,7 +201,7 @@ check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PROD
   ln -sf ../../../vtk/*Python*.so .
 
   if test `uname -m` = "x86_64" ; then
-      cd ${PRODUCT_DIR}; ln -sf lib64 lib
+      cd ${PRODUCT_DIR}; ln -s lib64 lib
   fi
 
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log