From: akl Date: Wed, 18 Jun 2008 14:51:22 +0000 (+0000) Subject: Use global variables with the current SALOME version and a single directory name... X-Git-Tag: before_merging_with_4X~23 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=00c4a9417b6094741b41d66b3eb896f1ae8556bf;p=tools%2Finstall.git Use global variables with the current SALOME version and a single directory name for SALOME modules. --- diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh index a124d48..1aa614e 100755 --- a/config_files/BLSURFPLUGIN.sh +++ b/config_files/BLSURFPLUGIN.sh @@ -1,30 +1,28 @@ #!/bin/bash -noprofile #################################################################################### -# File : BLSURFPLUGIN_BIN.sh +# File : BLSURFPLUGIN.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.3" - check_version(){ if [ -n "${BLSURFPLUGIN_ROOT_DIR}" ]; then if [ -f ${BLSURFPLUGIN_ROOT_DIR}/bin/salome/VERSION ]; then ver=`cat ${BLSURFPLUGIN_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 "${BLSURFPLUGIN_SRC_DIR}" ]; then check_version(){ - check_salome_src_version BLSURFPLUGIN_SRC_DIR $VERSION + check_salome_src_version BLSURFPLUGIN_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 } @@ -78,7 +76,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SRC_DIR}/BLSURFPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SRC_DIR}/BLSURFPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -125,11 +123,11 @@ source ${INSTALL_WORK}/$SHRC test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} if [ $INST_WITH_GUI == "FALSE" ] ; then - check_jb tar xfz ${SOURCE_DIR}/BLSURFPLUGINWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/BLSURFPLUGINWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} else - check_jb tar xfz ${SOURCE_DIR}/BLSURFPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/BLSURFPLUGINbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} fi -check_jb tar xfz ${SRC_DIR}/BLSURFPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SRC_DIR}/BLSURFPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export BLSURFPLUGIN_ROOT_DIR=${PRODUCT_DIR} @@ -139,6 +137,8 @@ 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; @@ -153,9 +153,9 @@ shift INST_WITH_GUI=$9; shift SINGLE_DIR=$9; -export PRODUCT="BLSURFPLUGIN_${VERSION}" -export PRODUCT_SRC="BLSURFPLUGIN_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="BLSURFPLUGIN_${SALOME_VERSION}" +export PRODUCT_SRC="BLSURFPLUGIN_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/CALCULATOR.sh b/config_files/CALCULATOR.sh index 0f861e8..63315d4 100755 --- a/config_files/CALCULATOR.sh +++ b/config_files/CALCULATOR.sh @@ -1,30 +1,28 @@ #!/bin/bash -noprofile #################################################################################### -# File : CALCULATOR_BIN.sh +# File : CALCULATOR.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.3" - check_version(){ if [ -n "${CALCULATOR_ROOT_DIR}" ]; then check_lib_version VERSION ${CALCULATOR_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${CALCULATOR_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "${VERSION}" ]; then + if [ "$ver" = "${SALOME_VERSION}" ]; then return 0 fi fi elif [ -n "${CALCULATOR_SRC_DIR}" ]; then - check_salome_src_version CALCULATOR_SRC_DIR $VERSION + check_salome_src_version CALCULATOR_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -79,7 +77,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/CALCULATORsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/CALCULATORsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -121,8 +119,8 @@ 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}/CALCULATORbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} -check_jb tar xfz ${SRC_DIR}/CALCULATORsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/CALCULATORbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} +check_jb tar xfz ${SRC_DIR}/CALCULATORsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export CALCULATOR_ROOT_DIR=${PRODUCT_DIR} @@ -138,6 +136,8 @@ chmod a+x runAppli try_preinstalled } +source ./common.sh + export PROCEDURE=$1; export INSTALL_WORK=$2; export SOURCE_DIR=$3; @@ -150,9 +150,9 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9; -export PRODUCT="CALCULATOR_${VERSION}" -export PRODUCT_SRC="CALCULATOR_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="CALCULATOR_${SALOME_VERSION}" +export PRODUCT_SRC="CALCULATOR_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/COMPONENT.sh b/config_files/COMPONENT.sh index e0a0569..e00242c 100755 --- a/config_files/COMPONENT.sh +++ b/config_files/COMPONENT.sh @@ -1,30 +1,28 @@ #!/bin/bash -noprofile #################################################################################### -# File : COMPONENT_BIN.sh +# File : COMPONENT.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.3" - check_version(){ if [ -n "${COMPONENT_ROOT_DIR}" ]; then check_lib_version VERSION ${COMPONENT_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${COMPONENT_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "${VERSION}" ]; then + if [ "$ver" = "${SALOME_VERSION}" ]; then return 0 fi fi elif [ -n "${COMPONENT_SRC_DIR}" ]; then - check_salome_src_version COMPONENT_SRC_DIR $VERSION + check_salome_src_version COMPONENT_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -79,7 +77,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/COMPONENTsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/COMPONENTsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -121,8 +119,8 @@ 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}/COMPONENTbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} -check_jb tar xfz ${SRC_DIR}/COMPONENTsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/COMPONENTbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} +check_jb tar xfz ${SRC_DIR}/COMPONENTsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export COMPONENT_ROOT_DIR=${PRODUCT_DIR} @@ -132,6 +130,8 @@ 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; @@ -144,9 +144,9 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9; -export PRODUCT="COMPONENT_${VERSION}" -export PRODUCT_SRC="COMPONENT_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="COMPONENT_${SALOME_VERSION}" +export PRODUCT_SRC="COMPONENT_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/DEBIANFORSALOME-3.1.sh b/config_files/DEBIANFORSALOME-3.1.sh index 4121429..3f5b10f 100755 --- a/config_files/DEBIANFORSALOME-3.1.sh +++ b/config_files/DEBIANFORSALOME-3.1.sh @@ -6,7 +6,7 @@ # 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. # @@ -50,6 +50,8 @@ check_jb tar xfz ${SOURCE_DIR}/DEBIANLIBS-3.1.tar.gz -C ${PRODUCT_DIR} try_preinstalled } +source ./common.sh + export PROCEDURE=$1; export INSTALL_WORK=$2; export SOURCE_DIR=$3; @@ -60,7 +62,7 @@ export INSTALL_PRODUCTS=$7; shift shift SINGLE_DIR=$9 +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi export PRODUCT="DEBIANLIBS-3.1" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} -source ./common.sh $PROCEDURE diff --git a/config_files/DOCUMENTATION.sh b/config_files/DOCUMENTATION.sh index aa1bb91..d16024e 100755 --- a/config_files/DOCUMENTATION.sh +++ b/config_files/DOCUMENTATION.sh @@ -6,14 +6,12 @@ # 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.3" - check_version(){ # There is no possibility to check version number return 0 @@ -43,7 +41,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SRC_DIR}/DOCUMENTATIONsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SRC_DIR}/DOCUMENTATIONsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -59,6 +57,8 @@ install_binary() install_source } +source ./common.sh + export PROCEDURE=$1; export INSTALL_WORK=$2; export SOURCE_DIR=$3; @@ -70,9 +70,7 @@ SRC_DIR=$8; shift shift SINGLE_DIR=$9; -export PRODUCT="DOCUMENTATION_${VERSION}" -export PRODUCT_SRC="DOCUMENTATION_SRC_${VERSION}" -export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} +export PRODUCT="DOCUMENTATION_${SALOME_VERSION}" +export PRODUCT_SRC="DOCUMENTATION_SRC_${SALOME_VERSION}" export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/FILTER.sh b/config_files/FILTER.sh index 3878f44..19f232b 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.3" - 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 @@ -76,7 +74,7 @@ install_source() make_env ${INSTALL_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 ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -118,8 +116,8 @@ 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 ${INSTALL_ROOT} # modify all *.la files export FILTER_ROOT_DIR=${PRODUCT_DIR} @@ -129,6 +127,8 @@ 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; @@ -141,9 +141,9 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9; -export PRODUCT="FILTER_${VERSION}" -export PRODUCT_SRC="FILTER_SRC_${VERSION}" +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=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/GEOM.sh b/config_files/GEOM.sh index 5fc11b5..332af59 100755 --- a/config_files/GEOM.sh +++ b/config_files/GEOM.sh @@ -1,30 +1,28 @@ #!/bin/bash -noprofile #################################################################################### -# File : GEOM_BIN.sh +# File : GEOM.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.3" - check_version(){ if [ -n "${GEOM_ROOT_DIR}" ]; then check_lib_version VERSION ${GEOM_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${GEOM_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "${VERSION}" ]; then + if [ "$ver" = "${SALOME_VERSION}" ]; then return 0 fi fi elif [ -n "${GEOM_SRC_DIR}" ]; then - check_salome_src_version GEOM_SRC_DIR $VERSION + check_salome_src_version GEOM_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -77,7 +75,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/GEOMsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/GEOMsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -124,11 +122,11 @@ source ${INSTALL_WORK}/$SHRC test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} if [ $INST_WITH_GUI == "FALSE" ] ; then - check_jb tar xfz ${SOURCE_DIR}/GEOMWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/GEOMWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} else - check_jb tar xfz ${SOURCE_DIR}/GEOMbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/GEOMbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} fi -check_jb tar xfz ${SRC_DIR}/GEOMsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SRC_DIR}/GEOMsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export GEOM_ROOT_DIR=${PRODUCT_DIR} @@ -138,6 +136,8 @@ 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; @@ -152,9 +152,9 @@ shift INST_WITH_GUI=$9; shift SINGLE_DIR=$9; -export PRODUCT="GEOM_${VERSION}" -export PRODUCT_SRC="GEOM_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="GEOM_${SALOME_VERSION}" +export PRODUCT_SRC="GEOM_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/GHS3DPLUGIN.sh b/config_files/GHS3DPLUGIN.sh index 3645951..d78535a 100755 --- a/config_files/GHS3DPLUGIN.sh +++ b/config_files/GHS3DPLUGIN.sh @@ -1,31 +1,29 @@ #!/bin/bash -noprofile #################################################################################### -# File : GHS3DPLUGIN_BIN.sh +# File : GHS3DPLUGIN.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.3" - check_version(){ if [ -n "${GHS3DPLUGIN_ROOT_DIR}" ]; then check_lib_version VERSION ${GHS3DPLUGIN_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${GHS3DPLUGIN_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "${VERSION}" ]; then + if [ "$ver" = "${SALOME_VERSION}" ]; then return 0 fi fi return 0 elif [ -n "${GHS3DPLUGIN_SRC_DIR}" ]; then - check_salome_src_version GHS3DPLUGIN_SRC_DIR $VERSION + check_salome_src_version GHS3DPLUGIN_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -79,7 +77,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -126,11 +124,11 @@ source ${INSTALL_WORK}/$SHRC test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} if [ $INST_WITH_GUI == "FALSE" ] ; then - check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} else - check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} fi -check_jb tar xfz ${SRC_DIR}/GHS3DPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SRC_DIR}/GHS3DPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export GHS3DPLUGIN_ROOT_DIR=${PRODUCT_DIR} @@ -140,6 +138,8 @@ 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; @@ -154,9 +154,9 @@ shift INST_WITH_GUI=$9; shift SINGLE_DIR=$9; -export PRODUCT="GHS3DPLUGIN_${VERSION}" -export PRODUCT_SRC="GHS3DPLUGIN_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="GHS3DPLUGIN_${SALOME_VERSION}" +export PRODUCT_SRC="GHS3DPLUGIN_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/GHS3DPRLPLUGIN.sh b/config_files/GHS3DPRLPLUGIN.sh index f735a63..0204c3a 100755 --- a/config_files/GHS3DPRLPLUGIN.sh +++ b/config_files/GHS3DPRLPLUGIN.sh @@ -1,29 +1,27 @@ #!/bin/bash -noprofile #################################################################################### -# File : GHS3DPRLPLUGIN_BIN.sh +# File : GHS3DPRLPLUGIN.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.3" - check_version(){ if [ -n "${GHS3DPRLPLUGIN_ROOT_DIR}" ]; then if [ -f ${GHS3DPRLPLUGIN_ROOT_DIR}/bin/salome/VERSION ]; then ver=`cat ${GHS3DPRLPLUGIN_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 "${GHS3DPRLPLUGIN_SRC_DIR}" ]; then - check_salome_src_version GHS3DPRLPLUGIN_SRC_DIR $VERSION + check_salome_src_version GHS3DPRLPLUGIN_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -76,7 +74,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/GHS3DPRLPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/GHS3DPRLPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -123,11 +121,11 @@ source ${INSTALL_WORK}/$SHRC test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} if [ $INST_WITH_GUI == "FALSE" ] ; then - check_jb tar xfz ${SOURCE_DIR}/GHS3DPRLPLUGINWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/GHS3DPRLPLUGINWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} else - check_jb tar xfz ${SOURCE_DIR}/GHS3DPRLPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/GHS3DPRLPLUGINbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} fi -check_jb tar xfz ${SRC_DIR}/GHS3DPRLPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SRC_DIR}/GHS3DPRLPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export GHS3DPRLPLUGIN_ROOT_DIR=${PRODUCT_DIR} @@ -137,6 +135,8 @@ 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; @@ -151,9 +151,9 @@ shift INST_WITH_GUI=$9; shift SINGLE_DIR=$9; -export PRODUCT="GHS3DPRLPLUGIN_${VERSION}" -export PRODUCT_SRC="GHS3DPRLPLUGIN_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="GHS3DPRLPLUGIN_${SALOME_VERSION}" +export PRODUCT_SRC="GHS3DPRLPLUGIN_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/GUI.sh b/config_files/GUI.sh index 419a7b5..afe857b 100755 --- a/config_files/GUI.sh +++ b/config_files/GUI.sh @@ -1,30 +1,28 @@ #!/bin/bash -noprofile #################################################################################### -# File : GUI_BIN.sh +# File : GUI.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.3" - check_version(){ if [ -n "${GUI_ROOT_DIR}" ]; then check_lib_version VERSION ${GUI_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${GUI_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "${VERSION}" ]; then + if [ "$ver" = "${SALOME_VERSION}" ]; then return 0 fi fi elif [ -n "${GUI_SRC_DIR}" ]; then - check_salome_src_version GUI_SRC_DIR $VERSION + check_salome_src_version GUI_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -77,7 +75,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/GUIsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/GUIsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -119,8 +117,8 @@ 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}/GUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} -check_jb tar xfz ${SRC_DIR}/GUIsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/GUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} +check_jb tar xfz ${SRC_DIR}/GUIsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export GUI_ROOT_DIR=${PRODUCT_DIR} @@ -130,6 +128,8 @@ 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; @@ -142,9 +142,9 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9; -export PRODUCT="GUI_${VERSION}" -export PRODUCT_SRC="GUI_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="GUI_${SALOME_VERSION}" +export PRODUCT_SRC="GUI_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/HELLO.sh b/config_files/HELLO.sh index dd283fa..9174a2f 100755 --- a/config_files/HELLO.sh +++ b/config_files/HELLO.sh @@ -1,29 +1,27 @@ #!/bin/bash -noprofile #################################################################################### -# File : HELLO_BIN.sh +# File : HELLO.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.3" - check_version(){ if [ -n "${HELLO_ROOT_DIR}" ]; then if [ -f ${HELLO_ROOT_DIR}/bin/salome/VERSION ]; then ver=`cat ${HELLO_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 "${HELLO_SRC_DIR}" ]; then - check_salome_src_version HELLO_SRC_DIR $VERSION + check_salome_src_version HELLO_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -76,7 +74,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/HELLOsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/HELLOsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -118,8 +116,8 @@ 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}/HELLObinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} -check_jb tar xfz ${SRC_DIR}/HELLOsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/HELLObinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} +check_jb tar xfz ${SRC_DIR}/HELLOsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export HELLO_ROOT_DIR=${PRODUCT_DIR} @@ -135,6 +133,8 @@ chmod a+x runAppli try_preinstalled } +source ./common.sh + export PROCEDURE=$1; export INSTALL_WORK=$2; export SOURCE_DIR=$3; @@ -147,9 +147,9 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9; -export PRODUCT="HELLO_${VERSION}" -export PRODUCT_SRC="HELLO_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="HELLO_${SALOME_VERSION}" +export PRODUCT_SRC="HELLO_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/HXX2SALOME.sh b/config_files/HXX2SALOME.sh index a6fa3de..bb2f6d4 100755 --- a/config_files/HXX2SALOME.sh +++ b/config_files/HXX2SALOME.sh @@ -6,14 +6,12 @@ # 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.3" - check_version(){ # No way to check version! return 0 @@ -52,7 +50,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC # unpack -check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -107,12 +105,14 @@ 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}/HXX2SALOMEbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} +check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} # to generate environment scripts try_preinstalled } +source ./common.sh + export PROCEDURE=$1; export INSTALL_WORK=$2; export SOURCE_DIR=$3; @@ -124,9 +124,9 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9; -export PRODUCT="HXX2SALOME_${VERSION}" -export PRODUCT_SRC="HXX2SALOME_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="HXX2SALOME_${SALOME_VERSION}" +export PRODUCT_SRC="HXX2SALOME_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/HXX2SALOMEDOC.sh b/config_files/HXX2SALOMEDOC.sh index bff2329..8ea80b3 100755 --- a/config_files/HXX2SALOMEDOC.sh +++ b/config_files/HXX2SALOMEDOC.sh @@ -6,14 +6,12 @@ # 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.3" - check_version(){ # No way to check version! return 0 @@ -50,7 +48,7 @@ install_source(){ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC # unpack -check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEDOCsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEDOCsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -79,6 +77,8 @@ try_preinstalled return 1 } +source ./common.sh + export PROCEDURE=$1; export INSTALL_WORK=$2; export SOURCE_DIR=$3; @@ -90,9 +90,9 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9; -export PRODUCT="HXX2SALOMEDOC_${VERSION}" -export PRODUCT_SRC="HXX2SALOMEDOC_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="HXX2SALOMEDOC_${SALOME_VERSION}" +export PRODUCT_SRC="HXX2SALOMEDOC_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/HexoticPLUGIN.sh b/config_files/HexoticPLUGIN.sh index fad8937..0f8f930 100755 --- a/config_files/HexoticPLUGIN.sh +++ b/config_files/HexoticPLUGIN.sh @@ -1,29 +1,27 @@ #!/bin/bash -noprofile #################################################################################### -# File : HexoticPLUGIN_BIN.sh +# File : HexoticPLUGIN.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.3" - check_version(){ if [ -n "${HexoticPLUGIN_ROOT_DIR}" ]; then if [ -f ${HexoticPLUGIN_ROOT_DIR}/bin/salome/VERSION ]; then ver=`cat ${HexoticPLUGIN_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 "${HexoticPLUGIN_SRC_DIR}" ]; then - check_salome_src_version HexoticPLUGIN_SRC_DIR $VERSION + check_salome_src_version HexoticPLUGIN_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -76,7 +74,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/HexoticPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/HexoticPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -123,11 +121,11 @@ source ${INSTALL_WORK}/$SHRC test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} if [ $INST_WITH_GUI == "FALSE" ] ; then - check_jb tar xfz ${SOURCE_DIR}/HexoticPLUGINWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/HexoticPLUGINWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} else - check_jb tar xfz ${SOURCE_DIR}/HexoticPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/HexoticPLUGINbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} fi -check_jb tar xfz ${SRC_DIR}/HexoticPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SRC_DIR}/HexoticPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export HexoticPLUGIN_ROOT_DIR=${PRODUCT_DIR} @@ -137,6 +135,8 @@ 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; @@ -151,9 +151,9 @@ shift INST_WITH_GUI=$9; shift SINGLE_DIR=$9; -export PRODUCT="HexoticPLUGIN_${VERSION}" -export PRODUCT_SRC="HexoticPLUGIN_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="HexoticPLUGIN_${SALOME_VERSION}" +export PRODUCT_SRC="HexoticPLUGIN_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/KERNEL.sh b/config_files/KERNEL.sh index e79099a..30bbedf 100755 --- a/config_files/KERNEL.sh +++ b/config_files/KERNEL.sh @@ -6,25 +6,23 @@ # 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.3" - check_version(){ if [ -n "${KERNEL_ROOT_DIR}" ]; then check_lib_version VERSION ${KERNEL_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${KERNEL_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "${VERSION}" ]; then + if [ "$ver" = "${SALOME_VERSION}" ]; then return 0 fi fi elif [ -n "${KERNEL_SRC_DIR}" ]; then - check_salome_src_version KERNEL_SRC_DIR $VERSION + check_salome_src_version KERNEL_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -77,7 +75,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC # unpack -check_jb tar xfz ${SOURCE_DIR}/KERNELsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/KERNELsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -120,8 +118,8 @@ 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}/KERNELbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} -check_jb tar xfz ${SRC_DIR}/KERNELsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/KERNELbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} +check_jb tar xfz ${SRC_DIR}/KERNELsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # The next two symbolic links are created only for Red Hat 9 and Scientific Linux 3.0.5 if [ -f /lib/libcrypto.so.0.9.7a ]; then @@ -155,6 +153,8 @@ create_config.sh ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src ${PRODUCT_SRC_DIR} } +source ./common.sh + export PROCEDURE=$1; export INSTALL_WORK=$2; export SOURCE_DIR=$3; @@ -168,9 +168,9 @@ REMOVE_SRC_TMP=$8; shift shift SINGLE_DIR=$9; -export PRODUCT="KERNEL_${VERSION}" -export PRODUCT_SRC="KERNEL_SRC_${VERSION}" +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} -source ./common.sh $PROCEDURE diff --git a/config_files/LIGHT.sh b/config_files/LIGHT.sh index 50ef571..9694306 100755 --- a/config_files/LIGHT.sh +++ b/config_files/LIGHT.sh @@ -1,29 +1,27 @@ #!/bin/bash -noprofile #################################################################################### -# File : LIGHT_BIN.sh +# File : LIGHT.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.3" - check_version(){ if [ -n "${LIGHT_ROOT_DIR}" ]; then if [ -f ${LIGHT_ROOT_DIR}/bin/salome/VERSION ]; then ver=`cat ${LIGHT_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 "${LIGHT_SRC_DIR}" ]; then - check_salome_src_version LIGHT_SRC_DIR $VERSION + check_salome_src_version LIGHT_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -74,7 +72,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/LIGHTsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/LIGHTsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -116,8 +114,8 @@ 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}/LIGHTbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} -check_jb tar xfz ${SRC_DIR}/LIGHTsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/LIGHTbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} +check_jb tar xfz ${SRC_DIR}/LIGHTsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export LIGHT_ROOT_DIR=${PRODUCT_DIR} @@ -127,6 +125,8 @@ 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; @@ -139,9 +139,9 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9; -export PRODUCT="LIGHT_${VERSION}" -export PRODUCT_SRC="LIGHT_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="LIGHT_${SALOME_VERSION}" +export PRODUCT_SRC="LIGHT_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/MED.sh b/config_files/MED.sh index 9258f4c..d33f4b6 100755 --- a/config_files/MED.sh +++ b/config_files/MED.sh @@ -1,30 +1,28 @@ #!/bin/bash -noprofile #################################################################################### -# File : MED_BIN.sh +# File : MED.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.3" - check_version(){ if [ -n "${MED_ROOT_DIR}" ]; then check_lib_version VERSION ${MED_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${MED_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "${VERSION}" ]; then + if [ "$ver" = "${SALOME_VERSION}" ]; then return 0 fi fi elif [ -n "${MED_SRC_DIR}" ]; then - check_salome_src_version MED_SRC_DIR $VERSION + check_salome_src_version MED_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -77,7 +75,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/MEDsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/MEDsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -124,11 +122,11 @@ source ${INSTALL_WORK}/$SHRC test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} if [ $INST_WITH_GUI == "FALSE" ] ; then - check_jb tar xfz ${SOURCE_DIR}/MEDWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/MEDWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} else - check_jb tar xfz ${SOURCE_DIR}/MEDbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/MEDbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} fi -check_jb tar xfz ${SRC_DIR}/MEDsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SRC_DIR}/MEDsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export MED_ROOT_DIR=${PRODUCT_DIR} @@ -138,6 +136,8 @@ 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; @@ -152,9 +152,9 @@ shift INST_WITH_GUI=$9; shift SINGLE_DIR=$9; -export PRODUCT="MED_${VERSION}" -export PRODUCT_SRC="MED_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="MED_${SALOME_VERSION}" +export PRODUCT_SRC="MED_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/MULTIPR.sh b/config_files/MULTIPR.sh index 7ca3945..2220ccf 100755 --- a/config_files/MULTIPR.sh +++ b/config_files/MULTIPR.sh @@ -1,29 +1,27 @@ #!/bin/bash -noprofile #################################################################################### -# File : MULTIPR_BIN.sh +# File : MULTIPR.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.3" - check_version(){ if [ -n "${MULTIPR_ROOT_DIR}" ]; then if [ -f ${MULTIPR_ROOT_DIR}/bin/salome/VERSION ]; then ver=`cat ${MULTIPR_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 "${MULTIPR_SRC_DIR}" ]; then - check_salome_src_version MULTIPR_SRC_DIR $VERSION + check_salome_src_version MULTIPR_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -76,7 +74,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/MULTIPRsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/MULTIPRsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -118,8 +116,8 @@ 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}/MULTIPRbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} -check_jb tar xfz ${SRC_DIR}/MULTIPRsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/MULTIPRbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} +check_jb tar xfz ${SRC_DIR}/MULTIPRsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export MULTIPR_ROOT_DIR=${PRODUCT_DIR} @@ -129,6 +127,8 @@ 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; @@ -141,9 +141,9 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9; -export PRODUCT="MULTIPR_${VERSION}" -export PRODUCT_SRC="MULTIPR_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="MULTIPR_${SALOME_VERSION}" +export PRODUCT_SRC="MULTIPR_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/NETGENPLUGIN.sh b/config_files/NETGENPLUGIN.sh index dd40ffd..e56fb36 100755 --- a/config_files/NETGENPLUGIN.sh +++ b/config_files/NETGENPLUGIN.sh @@ -1,31 +1,29 @@ #!/bin/bash -noprofile #################################################################################### -# File : NETGENPLUGIN_BIN.sh +# File : NETGENPLUGIN.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.3" - check_version(){ if [ -n "${NETGENPLUGIN_ROOT_DIR}" ]; then check_lib_version VERSION ${NETGENPLUGIN_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${NETGENPLUGIN_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "${VERSION}" ]; then + if [ "$ver" = "${SALOME_VERSION}" ]; then return 0 fi fi return 0 elif [ -n "${NETGENPLUGIN_SRC_DIR}" ]; then - check_salome_src_version NETGENPLUGIN_SRC_DIR $VERSION + check_salome_src_version NETGENPLUGIN_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -77,7 +75,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -124,11 +122,11 @@ source ${INSTALL_WORK}/$SHRC test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} if [ $INST_WITH_GUI == "FALSE" ] ; then - check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} else - check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} fi -check_jb tar xfz ${SRC_DIR}/NETGENPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SRC_DIR}/NETGENPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export NETGENPLUGIN_ROOT_DIR=${PRODUCT_DIR} @@ -138,6 +136,8 @@ 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; @@ -152,9 +152,9 @@ shift INST_WITH_GUI=$9; shift SINGLE_DIR=$9; -export PRODUCT="NETGENPLUGIN_${VERSION}" -export PRODUCT_SRC="NETGENPLUGIN_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="NETGENPLUGIN_${SALOME_VERSION}" +export PRODUCT_SRC="NETGENPLUGIN_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/PYCALCULATOR.sh b/config_files/PYCALCULATOR.sh index cc17d2f..96fddad 100755 --- a/config_files/PYCALCULATOR.sh +++ b/config_files/PYCALCULATOR.sh @@ -1,30 +1,28 @@ #!/bin/bash -noprofile #################################################################################### -# File : PYCALCULATOR_BIN.sh +# File : PYCALCULATOR.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.3" - check_version(){ if [ -n "${PYCALCULATOR_ROOT_DIR}" ]; then check_lib_version VERSION ${PYCALCULATOR_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${PYCALCULATOR_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "${VERSION}" ]; then + if [ "$ver" = "${SALOME_VERSION}" ]; then return 0 fi fi elif [ -n "${PYCALCULATOR_SRC_DIR}" ]; then - check_salome_src_version PYCALCULATOR_SRC_DIR $VERSION + check_salome_src_version PYCALCULATOR_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -77,7 +75,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/PYCALCULATORsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/PYCALCULATORsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -119,8 +117,8 @@ 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}/PYCALCULATORbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} -check_jb tar xfz ${SRC_DIR}/PYCALCULATORsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/PYCALCULATORbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} +check_jb tar xfz ${SRC_DIR}/PYCALCULATORsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export PYCALCULATOR_ROOT_DIR=${PRODUCT_DIR} @@ -130,6 +128,8 @@ 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; @@ -142,9 +142,9 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9; -export PRODUCT="PYCALCULATOR_${VERSION}" -export PRODUCT_SRC="PYCALCULATOR_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="PYCALCULATOR_${SALOME_VERSION}" +export PRODUCT_SRC="PYCALCULATOR_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/PYHELLO.sh b/config_files/PYHELLO.sh index 5c8dd08..c697b44 100755 --- a/config_files/PYHELLO.sh +++ b/config_files/PYHELLO.sh @@ -1,29 +1,27 @@ #!/bin/bash -noprofile #################################################################################### -# File : PYHELLO_BIN.sh +# File : PYHELLO.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.3" - check_version(){ if [ -n "${PYHELLO_ROOT_DIR}" ]; then if [ -f ${PYHELLO_ROOT_DIR}/bin/salome/VERSION ]; then ver=`cat ${PYHELLO_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 "${PYHELLO_SRC_DIR}" ]; then - check_salome_src_version PYHELLO_SRC_DIR $VERSION + check_salome_src_version PYHELLO_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -75,7 +73,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/PYHELLOsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/PYHELLOsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -117,8 +115,8 @@ 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}/PYHELLObinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} -check_jb tar xfz ${SRC_DIR}/PYHELLOsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/PYHELLObinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} +check_jb tar xfz ${SRC_DIR}/PYHELLOsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export PYHELLO_ROOT_DIR=${PRODUCT_DIR} @@ -133,6 +131,8 @@ chmod a+x runAppli try_preinstalled } +source ./common.sh + export PROCEDURE=$1; export INSTALL_WORK=$2; export SOURCE_DIR=$3; @@ -145,9 +145,9 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9; -export PRODUCT="PYHELLO_${VERSION}" -export PRODUCT_SRC="PYHELLO_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="PYHELLO_${SALOME_VERSION}" +export PRODUCT_SRC="PYHELLO_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/RANDOMIZER.sh b/config_files/RANDOMIZER.sh index 50d0e86..e039504 100755 --- a/config_files/RANDOMIZER.sh +++ b/config_files/RANDOMIZER.sh @@ -1,29 +1,27 @@ #!/bin/bash -noprofile #################################################################################### -# File : RANDOMIZER_BIN.sh +# File : RANDOMIZER.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.3" - check_version(){ if [ -n "${RANDOMIZER_ROOT_DIR}" ]; then if [ -f ${RANDOMIZER_ROOT_DIR}/bin/salome/VERSION ]; then ver=`cat ${RANDOMIZER_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 "${RANDOMIZER_SRC_DIR}" ]; then - check_salome_src_version RANDOMIZER_SRC_DIR $VERSION + check_salome_src_version RANDOMIZER_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -76,7 +74,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/RANDOMIZERsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/RANDOMIZERsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -118,8 +116,8 @@ 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}/RANDOMIZERbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} -check_jb tar xfz ${SRC_DIR}/RANDOMIZERsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/RANDOMIZERbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} +check_jb tar xfz ${SRC_DIR}/RANDOMIZERsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export RANDOMIZER_ROOT_DIR=${PRODUCT_DIR} @@ -129,6 +127,8 @@ 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; @@ -141,9 +141,9 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9; -export PRODUCT="RANDOMIZER_${VERSION}" -export PRODUCT_SRC="RANDOMIZER_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="RANDOMIZER_${SALOME_VERSION}" +export PRODUCT_SRC="RANDOMIZER_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/SAMPLES.sh b/config_files/SAMPLES.sh index 2f7169c..0f42bc4 100755 --- a/config_files/SAMPLES.sh +++ b/config_files/SAMPLES.sh @@ -6,14 +6,12 @@ # 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.3" - check_version(){ # There is no possibility to check version number return 0 @@ -43,7 +41,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SRC_DIR}/SAMPLESsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SRC_DIR}/SAMPLESsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -59,6 +57,8 @@ install_binary() install_source } +source ./common.sh + export PROCEDURE=$1; export INSTALL_WORK=$2; export SOURCE_DIR=$3; @@ -70,9 +70,7 @@ SRC_DIR=$8; shift shift SINGLE_DIR=$9; -export PRODUCT="SAMPLES_${VERSION}" -export PRODUCT_SRC="SAMPLES_SRC_${VERSION}" -export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} +export PRODUCT="SAMPLES_${SALOME_VERSION}" +export PRODUCT_SRC="SAMPLES_SRC_${SALOME_VERSION}" export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/SIERPINSKY.sh b/config_files/SIERPINSKY.sh index 1d12efe..08a792e 100755 --- a/config_files/SIERPINSKY.sh +++ b/config_files/SIERPINSKY.sh @@ -1,29 +1,27 @@ #!/bin/bash -noprofile #################################################################################### -# File : SIERPINSKY_BIN.sh +# File : SIERPINSKY.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.3" - check_version(){ if [ -n "${SIERPINSKY_ROOT_DIR}" ]; then if [ -f ${SIERPINSKY_ROOT_DIR}/bin/salome/VERSION ]; then ver=`cat ${SIERPINSKY_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 "${SIERPINSKY_SRC_DIR}" ]; then - check_salome_src_version SIERPINSKY_SRC_DIR $VERSION + check_salome_src_version SIERPINSKY_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -76,7 +74,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/SIERPINSKYsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/SIERPINSKYsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -118,8 +116,8 @@ 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}/SIERPINSKYbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} -check_jb tar xfz ${SRC_DIR}/SIERPINSKYsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/SIERPINSKYbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} +check_jb tar xfz ${SRC_DIR}/SIERPINSKYsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export SIERPINSKY_ROOT_DIR=${PRODUCT_DIR} @@ -129,6 +127,8 @@ 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; @@ -141,9 +141,9 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9; -export PRODUCT="SIERPINSKY_${VERSION}" -export PRODUCT_SRC="SIERPINSKY_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="SIERPINSKY_${SALOME_VERSION}" +export PRODUCT_SRC="SIERPINSKY_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/SMESH.sh b/config_files/SMESH.sh index 7f8ec49..122fa47 100755 --- a/config_files/SMESH.sh +++ b/config_files/SMESH.sh @@ -1,30 +1,28 @@ #!/bin/bash -noprofile #################################################################################### -# File : SMESH_BIN.sh +# File : SMESH.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.3" - check_version(){ if [ -n "${SMESH_ROOT_DIR}" ]; then check_lib_version VERSION ${SMESH_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${SMESH_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "${VERSION}" ]; then + if [ "$ver" = "${SALOME_VERSION}" ]; then return 0 fi fi elif [ -n "${SMESH_SRC_DIR}" ]; then - check_salome_src_version SMESH_SRC_DIR $VERSION + check_salome_src_version SMESH_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -77,7 +75,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/SMESHsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/SMESHsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -124,11 +122,11 @@ source ${INSTALL_WORK}/$SHRC test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} if [ $INST_WITH_GUI == "FALSE" ] ; then - check_jb tar xfz ${SOURCE_DIR}/SMESHWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/SMESHWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} else - check_jb tar xfz ${SOURCE_DIR}/SMESHbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/SMESHbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} fi -check_jb tar xfz ${SRC_DIR}/SMESHsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SRC_DIR}/SMESHsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export SMESH_ROOT_DIR=${PRODUCT_DIR} @@ -138,6 +136,8 @@ 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; @@ -152,9 +152,9 @@ shift INST_WITH_GUI=$9; shift SINGLE_DIR=$9; -export PRODUCT="SMESH_${VERSION}" -export PRODUCT_SRC="SMESH_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="SMESH_${SALOME_VERSION}" +export PRODUCT_SRC="SMESH_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/SUPERV.sh b/config_files/SUPERV.sh index 1e431b7..b84fa89 100755 --- a/config_files/SUPERV.sh +++ b/config_files/SUPERV.sh @@ -1,30 +1,28 @@ #!/bin/bash -noprofile #################################################################################### -# File : SUPERV_BIN.sh +# File : SUPERV.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.3" - check_version(){ if [ -n "${SUPERV_ROOT_DIR=}" ]; then check_lib_version VERSION ${SUPERV_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${SUPERV_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "${VERSION}" ]; then + if [ "$ver" = "${SALOME_VERSION}" ]; then return 0 fi fi elif [ -n "${SUPERV_SRC_DIR}" ]; then - check_salome_src_version SUPERV_SRC_DIR $VERSION + check_salome_src_version SUPERV_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -77,7 +75,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/SUPERVsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/SUPERVsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -119,8 +117,8 @@ 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}/SUPERVbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} -check_jb tar xfz ${SRC_DIR}/SUPERVsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/SUPERVbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} +check_jb tar xfz ${SRC_DIR}/SUPERVsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export SUPERV_ROOT_DIR=${PRODUCT_DIR} @@ -130,6 +128,8 @@ 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; @@ -142,9 +142,9 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9; -export PRODUCT="SUPERV_${VERSION}" -export PRODUCT_SRC="SUPERV_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="SUPERV_${SALOME_VERSION}" +export PRODUCT_SRC="SUPERV_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/VISU.sh b/config_files/VISU.sh index 6e35235..ad7ae42 100755 --- a/config_files/VISU.sh +++ b/config_files/VISU.sh @@ -1,30 +1,28 @@ #!/bin/bash -noprofile #################################################################################### -# File : VISU_BIN.sh +# File : VISU.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.3" - check_version(){ if [ -n "${VISU_ROOT_DIR}" ]; then check_lib_version VERSION ${VISU_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${VISU_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "${VERSION}" ]; then + if [ "$ver" = "${SALOME_VERSION}" ]; then return 0 fi fi elif [ -n "${VISU_SRC_DIR}" ]; then - check_salome_src_version VISU_SRC_DIR $VERSION + check_salome_src_version VISU_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -77,7 +75,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/VISUsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/VISUsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -119,8 +117,8 @@ 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}/VISUbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} -check_jb tar xfz ${SRC_DIR}/VISUsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/VISUbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} +check_jb tar xfz ${SRC_DIR}/VISUsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export VISU_ROOT_DIR=${PRODUCT_DIR} @@ -130,6 +128,8 @@ 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; @@ -142,9 +142,9 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9; -export PRODUCT="VISU_${VERSION}" -export PRODUCT_SRC="VISU_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="VISU_${SALOME_VERSION}" +export PRODUCT_SRC="VISU_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/YACS.sh b/config_files/YACS.sh index f1fbcda..ce4fb48 100755 --- a/config_files/YACS.sh +++ b/config_files/YACS.sh @@ -1,29 +1,27 @@ #!/bin/bash -noprofile #################################################################################### -# File : YACS_BIN.sh +# File : YACS.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.3" - check_version(){ if [ -n "${YACS_ROOT_DIR}" ]; then if [ -f ${YACS_ROOT_DIR}/bin/salome/VERSION ]; then ver=`cat ${YACS_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 "${YACS_SRC_DIR}" ]; then - check_salome_src_version YACS_SRC_DIR $VERSION + check_salome_src_version YACS_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi return 1 fi @@ -76,7 +74,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/YACSsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/YACSsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # to generate environment scripts try_preinstalled @@ -123,11 +121,11 @@ source ${INSTALL_WORK}/$SHRC test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} if [ $INST_WITH_GUI == "FALSE" ] ; then - check_jb tar xfz ${SOURCE_DIR}/YACSWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/YACSWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} else - check_jb tar xfz ${SOURCE_DIR}/YACSbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR} + check_jb tar xfz ${SOURCE_DIR}/YACSbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} fi -check_jb tar xfz ${SRC_DIR}/YACSsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SRC_DIR}/YACSsourcesV${SALOME_VERSION}.tar.gz -C ${INSTALL_ROOT} # modify all *.la files export YACS_ROOT_DIR=${PRODUCT_DIR} @@ -137,6 +135,8 @@ 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; @@ -151,9 +151,9 @@ shift INST_WITH_GUI=$9; shift SINGLE_DIR=$9; -export PRODUCT="YACS_${VERSION}" -export PRODUCT_SRC="YACS_SRC_${VERSION}" +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi +export PRODUCT="YACS_${SALOME_VERSION}" +export PRODUCT_SRC="YACS_SRC_${SALOME_VERSION}" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC} -source ./common.sh $PROCEDURE diff --git a/config_files/xdata-0.5.52.sh b/config_files/xdata-0.5.52.sh index fe3f24b..eb48113 100755 --- a/config_files/xdata-0.5.52.sh +++ b/config_files/xdata-0.5.52.sh @@ -6,7 +6,7 @@ # 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. # @@ -110,6 +110,8 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR} try_preinstalled } +source ./common.sh + export PROCEDURE=$1; export INSTALL_WORK=$2; export SOURCE_DIR=$3; @@ -122,8 +124,8 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9; +if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi export PRODUCT="xdata-0.5.52" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT}_SRC -source ./common.sh $PROCEDURE