Update for Salome 6.1.0

diff --git a/config_files/PARAVIS.sh b/config_files/PARAVIS.sh
index f5ac3cb002a7c998fc18e11ffe1a430c77d7c318..5eb3535442953c4947e38f1a12fb120a6cd35182 100755 (executable)
--- a/config_files/PARAVIS.sh
+++ b/config_files/PARAVIS.sh
@@ -38,6 +38,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
     export PATH=\${PARAVIS_ROOT_DIR}/bin/salome:\${PATH}
     export LD_LIBRARY_PATH=\${PARAVIS_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
     export PYTHONPATH=\${PARAVIS_ROOT_DIR}/bin/salome:\${PARAVIS_ROOT_DIR}/lib/salome:\${PARAVIS_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export PV_PLUGIN_PATH=\${PARAVIS_ROOT_DIR}/lib/paraview:\${MEDREADERLIB}
   fi
 fi
 ##

diff --git a/config_files/build.csh b/config_files/build.csh
index a14ed1b6228477a0e98daab2ff40b07357a4af6c..65ffe1b5cdba25962236831a131a122f8adb415e 100755 (executable)
--- a/config_files/build.csh
+++ b/config_files/build.csh
@@ -21,7 +21,7 @@ set inst_with_gui=1
 set is_delete=0
 set verbose_level=2
 set params=""
-set modules=(KERNEL GUI GEOM MED SMESH VISU YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER MULTIPR JOBMANAGER)
+set modules=(KERNEL GUI GEOM MED SMESH VISU PARAVIS YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER MULTIPR JOBMANAGER)
 set optim=""
 set is_install=1
 set is_help=0
@@ -230,9 +230,12 @@ foreach module (${modules})
        #########################################################
        # check if build_configure script exists
        #########################################################
-       if ( ! -e ${module_src}/build_configure ) then
+       if ( ! -e ${module_src}/build_configure && "${module}" != "PARAVIS") then
            echo "\!\!\! Warning \!\!\! Can not find build_configure script in ${module_src}."
-       else
+           else
+           if ( "${module}" == "PARAVIS" ) then
+           echo "\!\!\! Warning \!\!\! build_configure step is not executed for ${module}."
+               else
            #########################################################
            # call build_configure
            #########################################################
@@ -249,6 +252,7 @@ foreach module (${modules})
                cat ${LOG_DIR}/build_configure_${module}.log | grep -E "(failed|: error:)" >/dev/stderr
            endif
        endif
+       endif
     endif
     #########################################################
     # deleting build directory if -d flag is given
@@ -302,6 +306,11 @@ foreach module (${modules})
        if ( "$vx" == "" ) then
            set vx=`grep -e "^AC_INIT" ${module_src}/configure.in.base | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
        endif
+    else if ( -e ${module_src}/CMakeLists.txt ) then
+           set ver_maj=`cat ${module_src}/CMakeLists.txt | grep SET\(VERSION_MAJOR | sed -e "s%[A-Z_() ]%%g"`
+           set ver_min=`cat ${module_src}/CMakeLists.txt | grep SET\(VERSION_MINOR | sed -e "s%[A-Z_() ]%%g"`
+           set ver_maintenance=`cat ${module_src}/CMakeLists.txt | grep SET\(VERSION_MAINTENANCE | sed -e "s%[A-Z_() ]%%g"`
+           set vx="${ver_maj}.${ver_min}.${ver_maintenance}"
     endif
     if ( "$vx" != "" ) then
         set vx="_$vx"
@@ -325,10 +334,10 @@ foreach module (${modules})
        #########################################################
        # check if configure script exists
        #########################################################
-       if ( ! -e ${module_src}/configure ) then
+       if ( ! -e ${module_src}/configure  && "${module}" != "PARAVIS" ) then
            echo "\!\!\! Warning \!\!\! Can not find configure script in ${module_src}."
        else
-           set myconf_keys="${CONF_OPTS}"
+#          set myconf_keys="${CONF_OPTS}"
            if ( $inst_with_gui == 0 ) then
                set myconf_keys="${myconf_keys} --without-gui"
            endif
@@ -338,7 +347,11 @@ foreach module (${modules})
            if ( "${module}" == "NETGENPLUGIN" && ($?NETGENHOME) ) then
                set myconf_keys="${myconf_keys} --with-netgen=${NETGENHOME}"
            endif
-           ${module_src}/configure --prefix=$px ${optim} ${myconf_keys} >& ${LOG_DIR}/configure_${module}.log
+               if ( "${module}" == "PARAVIS" )  then
+                   cd ${module_build}; cmake ${module_src} -DCMAKE_INSTALL_PREFIX=$px >& ${LOG_DIR}/configure_${module}.log
+               else
+                   ${module_src}/configure --prefix=$px ${optim} ${myconf_keys} >& ${LOG_DIR}/configure_${module}.log
+               endif
            #########################################################
            # echo possible errors
            #########################################################

diff --git a/config_files/build.sh b/config_files/build.sh
index 91d8855df9a71ad4659ef5009bb75caa73d749c3..33f25d81b6696672c2943512efd91492c00a4902 100755 (executable)
--- a/config_files/build.sh
+++ b/config_files/build.sh
@@ -241,10 +241,10 @@ for module in ${modules}; do
            #########################################################
             # check if build_configure script exists
            #########################################################
-           if [ ! -e ${module_src}/build_configure ] || [ "${module}" != "PARAVIS" ] ; then
+           if [ ! -e ${module_src}/build_configure ] && [ "${module}" != "PARAVIS" ] ; then
                echo '!!! Warning !!! Cannot find build_configure script in '${module_src}'.'
            else
-               if [ "${module}" != "PARAVIS" ]; then
+               if [ "${module}" == "PARAVIS" ]; then
                    echo '!!! Warning !!! build_configure step is not executed for '${module}'.'                    
                    else
                #########################################################
@@ -338,7 +338,7 @@ for module in ${modules}; do
            #########################################################
            # check if configure script exists
            #########################################################
-           if [ ! -e ${module_src}/configure ] ; then
+           if [ ! -e ${module_src}/configure ] && [ "${module}" != "PARAVIS" ] ; then
                echo
                echo '!!! Warning !!! Can not find configure script in '${module_src}'.'
                echo
@@ -353,7 +353,13 @@ for module in ${modules}; do
                if [ "${module}" == "NETGENPLUGIN" ] && [ "$NETGENHOME" != "" ] ; then
                    myconf_keys="${myconf_keys} --with-netgen=${NETGENHOME}"
                fi
+
+               if [ "${module}" == "PARAVIS" ] ; then
+               cd ${module_build}; cmake ${module_src} -DCMAKE_INSTALL_PREFIX=$px >& ${LOG_DIR}/configure_${module}.log
+                   else
                ${module_src}/configure --prefix=$px ${optim} ${myconf_keys} >& ${LOG_DIR}/configure_${module}.log
+               fi
+
                #########################################################
                # echo possible errors
                #########################################################
@@ -428,7 +434,7 @@ for module in ${modules}; do
                    echo
                fi
            fi
-           echo "... Performing make install"
+           echo "... Performing make instal"
            make install >& ${LOG_DIR}/make_install_${module}.log
            sts=$?
            #########################################################