From: maintenance team Date: Fri, 24 Oct 2008 08:33:24 +0000 (+0000) Subject: Changing ${INSTALL_ROOT} to ${INST_ROOT} X-Git-Tag: before_merging_with_4X~4 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=77b1e8d9c27a60a9d7052b9d92d3d0b4c34dd81e;p=tools%2Finstall.git Changing ${INSTALL_ROOT} to ${INST_ROOT} --- diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh index ecd793d..8fd5050 100755 --- a/config_files/BLSURFPLUGIN.sh +++ b/config_files/BLSURFPLUGIN.sh @@ -40,7 +40,7 @@ else fi cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < Jambase + GCC=`which gcc` cat >> ${PRODUCT_DIR}/BUILD.LOG < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < /dev/null version=`cat bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]'` @@ -149,8 +149,8 @@ if [ -d ${PRODUCT_DIR} ] ; then cp -f ${PRODUCT_DIR}/salome.sh $dir/env.d popd > /dev/null fi -create_config.sh ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_DIR} -make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src ${PRODUCT_SRC_DIR} +create_config.sh ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_DIR} +make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src ${PRODUCT_SRC_DIR} } source ./common.sh @@ -158,7 +158,7 @@ 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; @@ -171,6 +171,6 @@ SINGLE_DIR=$9; if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi export PRODUCT="KERNEL_${SALOME_VERSION}" export PRODUCT_SRC="KERNEL_SRC_${SALOME_VERSION}" -export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} -export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} +export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}} +export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC} $PROCEDURE diff --git a/config_files/LIGHT.sh b/config_files/LIGHT.sh index 4aebadd..f3edf87 100755 --- a/config_files/LIGHT.sh +++ b/config_files/LIGHT.sh @@ -38,7 +38,7 @@ else fi cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < define INSTALL_ROOT +### !!! writing salome.sh file !!! -> define INST_ROOT cat >> ${install_work}/$SHRC <" >> ${CONFIG_FILE} # tag : path to the environment script -echo " " >> ${CONFIG_FILE} +echo " " >> ${CONFIG_FILE} # begin tag echo " " >> ${CONFIG_FILE} diff --git a/config_files/docutils-0.3.9.sh b/config_files/docutils-0.3.9.sh index e8cd3f5..83ffb95 100755 --- a/config_files/docutils-0.3.9.sh +++ b/config_files/docutils-0.3.9.sh @@ -20,12 +20,12 @@ return 0 print_env_bin(){ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < /dev/null if [ $? == 0 ] ; then is_fedora6=1 ; fi fi -if [ $is_mandriva2007 == 1 ] || [ $is_mandriva2008 == 1 ] || [ $is_fedora6 == 1 ] ; then + chmod +w ./Makefile.am mv Makefile.am Makefile.am.orig -sed -e 's/ include src tests tools doc / include src tools doc /g' Makefile.am.orig > Makefile.am -fi +sed -e 's/include src tests tools doc/include src tools doc/g' Makefile.am.orig > Makefile.am + if [ $is_mandriva2006 == 1 ] || [ $is_mandriva2007 == 1 ] || [ $is_mandriva2008 == 1 ] || [ $is_fedora4 == 1 ] || [ $is_fedora6 == 1 ] || [ $is_debian40 == 1 ] ; then if test `uname -m` = "x86_64" ; then echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} FFLAGS='-g -O2 -ffixed-line-length-none' CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG" @@ -143,7 +143,7 @@ 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 product directory @@ -196,7 +196,7 @@ try_preinstalled 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; @@ -205,8 +205,8 @@ REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9 export PRODUCT="med-2.3.4" -export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} +export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT}_SRC +export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC source ./common.sh $PROCEDURE diff --git a/config_files/metis-4.0.sh b/config_files/metis-4.0.sh index 374638e..17d1e8e 100755 --- a/config_files/metis-4.0.sh +++ b/config_files/metis-4.0.sh @@ -21,11 +21,11 @@ print_env_bin() { cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < _omniidl @@ -203,7 +203,7 @@ try_preinstalled 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; @@ -211,8 +211,8 @@ shift REMOVE_SRC_TMP=$8; test $# == 10 && shift && SINGLE_DIR=$9 export PRODUCT="omniORB-4.1.0" -export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} +export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT}_SRC +export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC source ./common.sh $PROCEDURE diff --git a/config_files/qt-3.3.8.sh b/config_files/qt-3.3.8.sh index 973d0df..3f19fa4 100755 --- a/config_files/qt-3.3.8.sh +++ b/config_files/qt-3.3.8.sh @@ -27,13 +27,13 @@ print_env_bin() { cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <> ${PRODUCT_DIR}/MAKE.LOG < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${PRODUCT_DIR}/size.log @@ -102,7 +110,7 @@ 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 product directory @@ -117,7 +125,7 @@ try_preinstalled 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; @@ -125,8 +133,8 @@ shift REMOVE_SRC_TMP=$8; test $# == 10 && shift && SINGLE_DIR=$9 export PRODUCT="qwt-4.2.0" -export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} +export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT}_SRC +export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC source ./common.sh $PROCEDURE diff --git a/config_files/release_notes.sh b/config_files/release_notes.sh index fb52910..42ad401 100755 --- a/config_files/release_notes.sh +++ b/config_files/release_notes.sh @@ -51,7 +51,7 @@ execute() # $3 is the temporary directory path SCRIPT_DIR=`dirname $0` PROCEDURE=$1; -INSTALL_ROOT=$2; +INST_ROOT=$2; INSTALL_WORK=$3; # Run the procedure diff --git a/config_files/scotch-4.0.sh b/config_files/scotch-4.0.sh index 81ca238..736f264 100755 --- a/config_files/scotch-4.0.sh +++ b/config_files/scotch-4.0.sh @@ -21,11 +21,11 @@ print_env_bin() { cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <