Update of configuration script to use cmake as prerequisite product

diff --git a/config_files/VTK-5.0.0.sh b/config_files/VTK-5.0.0.sh
index 467107a96b54e927afea597d3d54455a2bef8e3b..ab7efe2a82a7ea4e1df45bc36c05b28146d1525a 100755 (executable)
--- a/config_files/VTK-5.0.0.sh
+++ b/config_files/VTK-5.0.0.sh
@@ -61,10 +61,7 @@ install_source()
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 source ${INSTALL_WORK}/$SHRC
 
-makedir ${PRODUCT_SRC_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/cmake-2.2.3.tar.gz -C ${PRODUCT_SRC_DIR}
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_SRC_DIR}
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 
 # to generate environment scripts
 try_preinstalled
@@ -78,20 +75,7 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-cd ${PRODUCT_SRC_DIR}/cmake-2.2.3_SRC
-
-chmod +w ./configure
-#INV - bug in a cmake configure 
-cp configure configure.orig && sed "s/relid'/relid/" configure.orig > configure
-chmod 755 ./configure
-
-check_job ${PRODUCT_DIR}/CONFIGUREcmake.LOG ./configure
-cat >> ${PRODUCT_DIR}/MAKEcmake.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKEcmake.LOG make
-
-cd ${PRODUCT_SRC_DIR}/${PRODUCT}_SRC
+cd ${PRODUCT_SRC_DIR}
 
 # patch for gcc-3.4
 for f in IO/vtkBMPReader.cxx IO/vtkImageReader.cxx ; do
@@ -193,7 +177,7 @@ cat > ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
 used VTK settings:
 $VTK_CMAKE_OPTIONS
 EOF
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ${PRODUCT_SRC_DIR}/cmake-2.2.3_SRC/bin/cmake . $VTK_CMAKE_OPTIONS
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake . $VTK_CMAKE_OPTIONS
 
 cat > ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
@@ -202,27 +186,9 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make
 
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
-cd ${PRODUCT_SRC_DIR}/${PRODUCT}_SRC/Wrapping/Python
-
-check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
-
-# set correct symbolic links - bug of python wrappings installation
-#      cd ${PRODUCT_DIR}/include
-#      ln -sf vtk-5.0 vtk
-
-#      if test `uname -m` = "x86_64" ; then
-#        cd ${PRODUCT_DIR}/lib; ln -s ../lib64/python${python_version} .
-#      fi
-
-#      cd ${PRODUCT_DIR}/lib/python${python_version}/site-packages
-#      ln -sf vtk vtk_python 
-
-#      cd ${PRODUCT_DIR}/lib
-#      ln -sf ../lib vtk
+cd ${PRODUCT_SRC_DIR}/Wrapping/Python
 
-#      if test `uname -m` = "x86_64" ; then
-#        cd ${PRODUCT_DIR}/lib64; ln -sf ../lib/* .
-#      fi
+check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PRODUCT_DIR}
 
 cd ${PRODUCT_DIR};