Remove build directory

[tools/install.git] / config_files / ParaView-3.10.sh

diff --git a/config_files/ParaView-3.10.sh b/config_files/ParaView-3.10.sh
index 776c4b57f7285b5d6ac37581053304bc98c4332e..60905e2d6da13bd663a559b78dfa302030210c71 100755 (executable)
--- a/config_files/ParaView-3.10.sh
+++ b/config_files/ParaView-3.10.sh
@@ -89,6 +89,12 @@ if [ "${need_patch_mutable}" == "1" ] ; then
        sed -i "s%\([[:space:]]*\)PyVTKSpecialObject.h%\1PyVTKSpecialObject.h\n\1PyVTKMutableObject.h%g" \
        VTK/Wrapping/Python/CMakeLists.txt )
 fi
+# 3. patch for ftgl (incompatibility with OCCT 6.5)
+need_patch_ftgl=1
+if [ "${need_patch_ftgl}" == "1" ] ; then
+    cp patches/paraview-3.10.1-ftgl.patch ${PRODUCT_SRC_DIR}
+    ( cd ${PRODUCT_SRC_DIR} ; patch -p1 < paraview-3.10.1-ftgl.patch )
+fi
 
 # to generate environment scripts
 try_preinstalled
@@ -112,10 +118,10 @@ tcl_includes=""
 tcl_libs=""
 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"`
-    tcl_includes=`grep -e "TCL_INCLUDE_SPEC=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_INCLUDE_SPEC=[\'|\"]-I\(.*\)[\'|\"]%\1%g"`
+    tcl_version=`grep -e "TCL_VERSION=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_VERSION=[\'|\"]\(.*\)[\'|\"]%\1%g" | sed -e "s%^[[:space:]]%%g;s%[[:space:]]\+$%%g"`
+    tcl_includes=`grep -e "TCL_INCLUDE_SPEC=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_INCLUDE_SPEC=[\'|\"]-I\(.*\)[\'|\"]%\1%g" | sed -e "s%^[[:space:]]%%g;s%[[:space:]]\+$%%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" | sed -e "s%^[[:space:]]%%g;s%[[:space:]]\+$%%g"`
 fi
     
 CMAKE_OPTIONS=""
@@ -184,12 +190,24 @@ fi
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBOOST_ROOT=${BOOSTDIR}"
 
+### gl2ps settings
+if [ "${GL2PSHOME}" != "" ]; then
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_GL2PS:BOOL=ON"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DGL2PS_INCLUDE_DIR:STRING=${GL2PSHOME}/include"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DGL2PS_LIBRARY:STRING=${GL2PSHOME}/lib/libgl2ps.so"
+fi
+
 ### Extra options (switch off non-used Paraview plug-ins)
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessing:BOOL=OFF"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_Prism:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SLACTool:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SierraPlugin:BOOL=OFF"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=OFF"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools:BOOL=OFF"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_VisTrailsPlugin:BOOL=OFF"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_pvblot:BOOL=OFF"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=OFF"
 
 ### Extra options (switch on required Paraview plug-ins)
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
@@ -227,7 +245,9 @@ used gcc=$GCC
 EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make -j4
 
-### 'make install` has been replaced by `cpack`
+#######
+# `make install` has been replaced by `cpack` since Paraview 3.10.0
+#######
 use_make_install=0
 if [ "${use_make_install}" == "1" ] ; then
     check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
@@ -246,12 +266,19 @@ if [ "${use_make_install}" == "1" ] ; then
     fi
 else
     check_job ${PRODUCT_DIR}/CPACK.LOG cpack -G TGZ --config Applications/ParaView/CPackParaView-DevelopmentConfig.cmake
-    bindir=`find ${PRODUCT_BUILD_DIR}/_CPack_Packages -type d -name "ParaView-*-3.10*"`
-    cp -rf ${bindir}/* ${PRODUCT_DIR}
+    bindir=`find ${PRODUCT_BUILD_DIR}/_CPack_Packages -type d -name "ParaView-*-${PVLIBVERSION}*"`
+    if [ "${bindir}" != "" ] ; then
+        cp -rf ${bindir}/* ${PRODUCT_DIR}
+    else
+       echo "Error on cpack step! CPack archive is not found! Exiting"
+    fi
 fi 
 
-# patch Paraview problem for bad VisItBridge configuration), required at least for Paraview 3.10.0 and 3.10.1
-patch_visit_usage=1
+#######
+# patch Paraview problem (bad VisItBridge configuration)
+# NOT NEEDED SINCE PARAVIEW 3.10.1
+#######
+patch_visit_usage=0
 if [ "${patch_visit_usage}" == "1" ] ; then
     sed -i "s%SET(PARAVIEW_USE_VISITBRIDGE \"ON\")%SET(PARAVIEW_USE_VISITBRIDGE \"OFF\")%g" ${PRODUCT_DIR}/lib/paraview-${PVLIBVERSION}/ParaViewConfig.cmake
 fi
@@ -276,7 +303,11 @@ source ${INSTALL_WORK}/$SHRC
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-check_jb tar xfz ${SOURCE_DIR}/../../SOURCES/ParaViewData-${PVVERSION}.tar.gz -C ${INST_ROOT}
+data_archive=${SOURCE_DIR}/../../SOURCES/ParaViewData-${PVVERSION}.tar.gz
+if [ ! -f ${data_archive} ] ; then
+    data_archive=${SOURCE_DIR}/../../SOURCES/ParaViewData-${PVLIBVERSION}.tar.gz
+fi
+check_jb tar xfz ${data_archive} -C ${INST_ROOT}
 
 cd ${PRODUCT_DIR}