X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FFILTER.sh;h=69bf833382aad8d36cf886c88b8396230899379d;hb=b11f07a702eb678c1928680606a05ea22de21b7f;hp=d04fb03510026da748f584f4163987488600bb2b;hpb=9d9300b025ea205f25f39551a5f0440e219cf33b;p=tools%2Finstall.git

diff --git a/config_files/FILTER.sh b/config_files/FILTER.sh
index d04fb03..69bf833 100755
--- a/config_files/FILTER.sh
+++ b/config_files/FILTER.sh
@@ -1,29 +1,27 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : FILTER_BIN.sh
+#  File      : FILTER.sh
 #  Created   : Thu Dec 18 12:01:00 2002
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2007 CEA
+#  Copyright : 2002-2008 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
 ####################################################################################
 
-VERSION="4.1.1"
-
 check_version(){
 if [ -n "${FILTER_ROOT_DIR}" ]; then
     if [ -f ${FILTER_ROOT_DIR}/bin/salome/VERSION ]; then
 	ver=`cat ${FILTER_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` 
-	if [ "$ver" = "${VERSION}" ]; then
+	if [ "$ver" = "${SALOME_VERSION}" ]; then
 	    return 0
 	fi
     fi
 elif [ -n "${FILTER_SRC_DIR}" ]; then
-  check_salome_src_version FILTER_SRC_DIR $VERSION
+  check_salome_src_version FILTER_SRC_DIR
   if [ $? -eq 0 ] ; then return 0 ; fi
   return 1
 fi
@@ -31,49 +29,45 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export FILTER_ROOT_DIR=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export FILTER_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
-  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" = "1" ] ; then
     export PATH=\${FILTER_ROOT_DIR}/bin/salome:\${PATH}
-    export PYTHONPATH=\${FILTER_ROOT_DIR}/bin/salome:\${FILTER_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${FILTER_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${FILTER_ROOT_DIR}/bin/salome:\${FILTER_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 }
 
 print_env_src(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE}_src $DELIM
-export FILTER_SRC_DIR=\${INSTALL_ROOT}/${PRODUCT_SRC}
+export FILTER_SRC_DIR=\${INST_ROOT}/${PRODUCT_SRC}
 ##
 EOF
 
 (test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 }
 
 try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 return $?
 }
 
 install_source()
 {
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/FILTERsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/FILTERsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
 # to generate environment scripts
 try_preinstalled
@@ -88,19 +82,19 @@ install_source
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 if [ -e ./build.sh ] ; then
-    cp -f ./build.sh ${INSTALL_ROOT}
+    cp -f ./build.sh ${INST_ROOT}
 fi
 
 CUR_DIR=`pwd`
-cd ${INSTALL_ROOT}
-check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT FILTER
+cd ${INST_ROOT}
+check_jb ./build.sh -o -b -d -v 0 -p $INST_ROOT FILTER
 
 cd $CUR_DIR
 
 # remove sources and temporary files after building
 if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
     test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-    test -d ${INSTALL_ROOT}/"FILTER_BUILD" && rm -fr ${INSTALL_ROOT}/"FILTER_BUILD"
+    test -d ${INST_ROOT}/"FILTER_BUILD" && rm -fr ${INST_ROOT}/"FILTER_BUILD"
 fi
 
 # to generate environment scripts
@@ -109,14 +103,14 @@ try_preinstalled
 
 install_binary()
 {
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
 # create a module directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-check_jb tar xfz ${SOURCE_DIR}/FILTERbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
-check_jb tar xfz ${SRC_DIR}/FILTERsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/FILTERbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
+check_jb tar xfz ${SRC_DIR}/FILTERsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
 # modify all *.la files
 export FILTER_ROOT_DIR=${PRODUCT_DIR}
@@ -126,10 +120,12 @@ test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 try_preinstalled
 }
 
+source ./common.sh
+
 export PROCEDURE=$1;
 export INSTALL_WORK=$2;
 export SOURCE_DIR=$3;
-export INSTALL_ROOT=$4;
+export INST_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 export PRODUCT_TYPE=$6;
 export INSTALL_PRODUCTS=$7;
@@ -138,9 +134,9 @@ shift
 REMOVE_SRC_TMP=$8;
 shift
 SINGLE_DIR=$9;
-export PRODUCT="FILTER_${VERSION}"
-export PRODUCT_SRC="FILTER_SRC_${VERSION}"
-export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC}
-source ./common.sh
+if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi
+export PRODUCT="FILTER_${SALOME_VERSION}"
+export PRODUCT_SRC="FILTER_SRC_${SALOME_VERSION}"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
 $PROCEDURE