From: maintenance team <salome-mnt@opencascade.com>
Date: Mon, 31 May 2010 08:10:53 +0000 (+0000)
Subject: Update for 6.1.0
X-Git-Tag: V6_1_0~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d70c265397805fef35d2b90ff06f831fddf912b7;p=tools%2Finstall.git

Update for 6.1.0
---

diff --git a/config_files/build.sh b/config_files/build.sh
index 5dace50..91d8855 100755
--- a/config_files/build.sh
+++ b/config_files/build.sh
@@ -84,7 +84,7 @@ inst_with_gui=1
 is_delete=0
 verbose_level=2
 params=""
-modules="KERNEL GUI GEOM MED SMESH VISU YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER MULTIPR JOBMANAGER"
+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"
 optim=""
 is_install=1
 is_tui=0
@@ -229,7 +229,7 @@ for module in ${modules}; do
         # check if configure script exists
         #########################################################
 	cfg_exist=0
-	if [ -e ${module_src}/configure ] ; then
+	if [ -e ${module_src}/configure ] || [ -e ${module_src}/CMakeLists.txt ] ; then
 	    cfg_exist=1
 	fi
         #########################################################
@@ -241,9 +241,12 @@ for module in ${modules}; do
 	    #########################################################
             # check if build_configure script exists
 	    #########################################################
-	    if [ ! -e ${module_src}/build_configure ] ; 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
+		    echo '!!! Warning !!! build_configure step is not executed for '${module}'.'		    
+		    else
 	        #########################################################
                 # call build_configure
 	        #########################################################
@@ -260,6 +263,7 @@ for module in ${modules}; do
 		    cat ${LOG_DIR}/build_configure_${module}.log | grep -E "(failed|: error:)" >&2
 		fi
 	    fi
+	    fi
 	fi
         #########################################################
         # deleting build directory if -d flag is given
@@ -299,12 +303,6 @@ for module in ${modules}; do
         # previous launch
         #########################################################
 	opts_changed=0
-##      if [ -f ${module_build}/config.log ] ; then
-##	    old_prefix=`grep -e '^prefix=' ${module_build}/config.log | sed -e "s%^prefix='\(.*\)'%\1%"`
-##	    if [ "$old_prefix" != "$prefix" ] ; then
-##	        opts_changed=1
-##	    fi
-##      fi
         #########################################################
         # define installation directory (by using module's version
         # number); default is a build directory
@@ -317,17 +315,17 @@ for module in ${modules}; do
 	    if [ "$vx" == "" ] ; then
 		vx=`grep -e "^AC_INIT" ${module_src}/configure.in.base | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
 	    fi
+	elif [ -e ${module_src}/CMakeLists.txt ] ; then
+	    ver_maj=`cat ${module_src}/CMakeLists.txt | grep SET\(VERSION_MAJOR | sed -e "s%[A-Z_() ]%%g"`
+	    ver_min=`cat ${module_src}/CMakeLists.txt | grep SET\(VERSION_MINOR | sed -e "s%[A-Z_() ]%%g"`
+	    ver_maintenance=`cat ${module_src}/CMakeLists.txt | grep SET\(VERSION_MAINTENANCE | sed -e "s%[A-Z_() ]%%g"`
+	    vx="${ver_maj}.${ver_min}.${ver_maintenance}"
 	fi
 	if [ "$vx" != "" ] ; then
 	    vx="_$vx"
 	fi
 	if [ "$prefix" == "" ] ; then
-	    #module_root_dir=`printenv ${module}_ROOT_DIR`
-	    #if [ "$module_root_dir" != "" ] ; then
-	    #    px=$module_root_dir
-	    #else
 		px=${BUILD_DIR}${def_install_dir}/${module}${vx}
-	    #fi
 	else
 	    px=$prefix/${module}${vx}
 	fi
diff --git a/config_files/common.sh b/config_files/common.sh
index 00dc8b0..5aa9960 100755
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -40,9 +40,9 @@ if [ -n "$root_dir" ]; then
 	fi
     if [ -f ${root_dir}/${cfg_file} ] ; then
 	if [ "${cfg_file}" = "CMakeLists.txt" ] ; then
-	    ver_maj=`cat CMakeLists.txt | grep SET\(VERSION_MAJOR  2>&1 | sed -e "s%[A-Z_() ]%%g"`
-	    ver_min=`cat CMakeLists.txt | grep SET\(VERSION_MINOR  2>&1 | sed -e "s%[A-Z_() ]%%g"`
-	    ver_maintenance=`cat CMakeLists.txt | grep SET\(VERSION_MAINTENANCE  2>&1 | sed -e "s%[A-Z_() ]%%g"`
+	    ver_maj=`cat ${root_dir}/${cfg_file} | grep SET\(VERSION_MAJOR | sed -e "s%[A-Z_() ]%%g"`
+	    ver_min=`cat ${root_dir}/${cfg_file} | grep SET\(VERSION_MINOR | sed -e "s%[A-Z_() ]%%g"`
+	    ver_maintenance=`cat ${root_dir}/${cfg_file} | grep SET\(VERSION_MAINTENANCE | sed -e "s%[A-Z_() ]%%g"`
 	    ver="${ver_maj}.${ver_min}.${ver_maintenance}"
 	else
 	    ver=`grep -e "^AC_INIT" ${root_dir}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`