Improve VTK installation procedure to provide with TCL and Python wrappers

diff --git a/config.xml b/config.xml
index d69fc440f38a564820842b4706801c1c326d1d05..14028aa4d69c46cbcc6740d21b92678afead8e53 100644 (file)
--- a/config.xml
+++ b/config.xml
@@ -143,8 +143,8 @@
           supported="install sources,install binaries"
           disable="false"
           dependancies="gcc,tcltk,Python"
-          installdiskspace="34156"
-          temporarydiskspace="168044"
+          installdiskspace="39073"
+          temporarydiskspace="172034"
           script="VTK-4.2.2.sh"/>
   <product name="netgen" 
            version="4.3" 

diff --git a/config_RedHat8_0.xml b/config_RedHat8_0.xml
index d69fc440f38a564820842b4706801c1c326d1d05..14028aa4d69c46cbcc6740d21b92678afead8e53 100644 (file)
--- a/config_RedHat8_0.xml
+++ b/config_RedHat8_0.xml
@@ -143,8 +143,8 @@
           supported="install sources,install binaries"
           disable="false"
           dependancies="gcc,tcltk,Python"
-          installdiskspace="34156"
-          temporarydiskspace="168044"
+          installdiskspace="39073"
+          temporarydiskspace="172034"
           script="VTK-4.2.2.sh"/>
   <product name="netgen" 
            version="4.3" 

diff --git a/config_RedHat8_0_with_Mesa.xml b/config_RedHat8_0_with_Mesa.xml
index 3202c038a9b0df64de2c3156092e38cb099e6379..07713a3d2d73a506cd5bc4779bd38f53b64e8fbd 100644 (file)
--- a/config_RedHat8_0_with_Mesa.xml
+++ b/config_RedHat8_0_with_Mesa.xml
@@ -143,8 +143,8 @@
           supported="install sources,install binaries"
           disable="false"
           dependancies="gcc,tcltk,Python,Mesa"
-          installdiskspace="34156"
-          temporarydiskspace="168048"
+          installdiskspace="39075"
+          temporarydiskspace="172049"
           script="VTK-4.2.2.sh"/>
   <product name="netgen" 
            version="4.3" 

diff --git a/config_files/VTK-4.2.2.sh b/config_files/VTK-4.2.2.sh
index d2552fc2e8fb64552fe1330ebc7057dbde2e8f49..830ca1182fec3593c15e8a52d392637ea825a416 100755 (executable)
--- a/config_files/VTK-4.2.2.sh
+++ b/config_files/VTK-4.2.2.sh
@@ -21,6 +21,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export VTKHOME=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${VTKHOME}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${VTKHOME}/lib/vtk:\${LD_LIBRARY_PATH}
+export PYTHONPATH=\${VTKHOME}/lib/vtk:\${VTKHOME}/lib/python2.2/site_packages/vtk_python:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -35,11 +36,14 @@ if [ $? -eq 0 ] ; then
     path=`sort_path ${tmp}`
     tmp="\${VTKHOME}/lib/vtk ${VTKHOME}/lib/vtk \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
     ld_library_path=`sort_path ${tmp}`
+    tmp="\${VTKHOME}/lib/vtk:\${VTKHOME}/lib/python2.2/site_packages/vtk_python ${VTKHOME}/lib/vtk:${VTKHOME}/lib/python2.2/site_packages/vtk_python \${PYTHONPATH} ${PYTHONPATH}";  
+    python_path=`sort_path ${tmp}`
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export VTKHOME=${VTKHOME}
 export PATH=${path}
 export LD_LIBRARY_PATH=${ld_library_path}
+export PYTHONPATH=${python_path}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -87,6 +91,16 @@ VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_PYTHON:BOOL=ON"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHONHOME}/bin/python2.2"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_INCLUDE_PATH:STRING=${PYTHONHOME}/include/python2.2"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHONHOME}/lib/python2.2/config/libpython2.2.a"
+### Wrap Tcl settings
+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.so"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_STUB_LIBRARY:STRING=${TCLHOME}/lib/libtclstub.a"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_TCLSH:STRING=${TCLHOME}/bin/tclsh"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_INCLUDE_PATH:STRING=${TCLHOME}/include"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_LIBRARY:STRING=${TCLHOME}/lib/libtk.so"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_STUB_LIBRARY:STRING=${TCLHOME}/lib/libtkstub.a"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_WISH:STRING=${TCLHOME}/bin/wish"
 ### if Mesa is pre-installed
 if [ -n "$MESA_HOME" ]; then
   VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_INCLUDE_DIR:STRING=${MESA_HOME}/include"
@@ -108,6 +122,9 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make
 
 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}
+
 rm -fr ${PRODUCT_WORK} ${INSTALL_WORK}/cmake-1.6.6
 print_env
 }