X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config_files%2FVTK-4.2.6.sh;h=6d54315f4a592293aab4f0b12f1359634aa637cd;hb=eaf31aa384f20241a93e726b0baeb34aa1091e35;hp=04eea135c948b3b68330462bc89785aa869414a3;hpb=ba3788bdb913fa91e294acf12ef7e34fa9775630;p=tools%2Finstall.git

diff --git a/config_files/VTK-4.2.6.sh b/config_files/VTK-4.2.6.sh
index 04eea13..6d54315 100755
--- a/config_files/VTK-4.2.6.sh
+++ b/config_files/VTK-4.2.6.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash -noprofile
 
 ####################################################################################
 #  File      : VTK-4.2.6.sh
@@ -6,7 +6,7 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2006 CEA
+#  Copyright : 2002-2007 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -91,6 +91,23 @@ if test `uname -m` = "x86_64" ; then
 	( 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
+
+# apply a small patch for VTK (needed for gcc-3.4 and newer)
+if [ -f patches/vtk-4.2.6-gcc-4.1.patch ] ; then
+    cp patches/vtk-4.2.6-gcc-4.1.patch ${PRODUCT_WORK}
+    ( cd ${PRODUCT_WORK} ; patch -p1 < vtk-4.2.6-gcc-4.1.patch )
+else
+    cd ${PRODUCT_WORK}
+    sed -e "s%seekg(self->GetFile()->tellg()%seekg(static_cast<long>(self->GetFile()->tellg())%g" IO/vtkBMPReader.cxx > IO/vtkBMPReader.cxx.orig
+    mv -f IO/vtkBMPReader.cxx.orig IO/vtkBMPReader.cxx
+    sed -e "s%seekg(self->GetFile()->tellg()%seekg(static_cast<long>(self->GetFile()->tellg())%g" IO/vtkImageReader.cxx > IO/vtkImageReader.cxx.orig
+    mv -f IO/vtkImageReader.cxx.orig IO/vtkImageReader.cxx
+fi
 
 cd ${INSTALL_WORK}/cmake-1.6.6 
 
@@ -102,12 +119,6 @@ check_job ${PRODUCT_DIR}/MAKEcmake.LOG make
 
 cd ${PRODUCT_WORK}
 
-# 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
-mv -f IO/vtkBMPReader.cxx.orig IO/vtkBMPReader.cxx
-sed -e "s%seekg(self->GetFile()->tellg()%seekg(static_cast<long>(self->GetFile()->tellg())%g" IO/vtkImageReader.cxx > IO/vtkImageReader.cxx.orig
-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=""
@@ -118,7 +129,7 @@ if [ $? -eq 0 ] && [ -e ${tcldir}/tclConfig.sh ] ; then
     tcl_version=`grep -e "TCL_VERSION=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_VERSION=[\'|\"]\(.*\)[\'|\"]%\1%g"`
     tcl_includes=`grep -e "TCL_INCLUDE_SPEC=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_INCLUDE_SPEC=[\'|\"]-I\(.*\)[\'|\"]%\1%g"`
     if [ -z "$tcl_includes" ] ; then tcl_includes=/usr/include ; fi
-    tcl_libs=`grep -e "TCL_PACKAGE_PATH=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_PACKAGE_PATH=[\'|\"]\(.*\)[\'|\"]%\1%g"`
+    tcl_libs=`grep -e "TCL_PACKAGE_PATH=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_PACKAGE_PATH=[\'|\"]\(.*\)[\'|\"]%\1%g" | awk '{print $1}'`
 fi
     
 VTK_CMAKE_OPTIONS=""