From: vsr Date: Fri, 28 Nov 2014 13:21:00 +0000 (+0300) Subject: Fix problem with installation to single directory (HEXABLOCK, HEXABLOCKPLUGIN, HOMARD... X-Git-Tag: V7_5_0~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8be8af7b24a326ea3834eb0a3510a54e267b9f97;p=tools%2Finstall.git Fix problem with installation to single directory (HEXABLOCK, HEXABLOCKPLUGIN, HOMARD and YACS modules were installed separately) --- diff --git a/config_files/HEXABLOCK.sh b/config_files/HEXABLOCK.sh index 6f6f23d..4ce5e87 100755 --- a/config_files/HEXABLOCK.sh +++ b/config_files/HEXABLOCK.sh @@ -1,4 +1,5 @@ #!/bin/bash -noprofile + #################################################################################### # File : HEXABLOCK.sh # Created : Thu Dec 18 12:01:00 2002 @@ -13,8 +14,7 @@ check_version(){ if [ -n "${HEXABLOCK_ROOT_DIR}" ]; then - check_lib_version VERSION ${HEXABLOCK_ROOT_DIR}/bin/salome - if [ "$?" -eq "0" ]; then + if [ -f ${HEXABLOCK_ROOT_DIR}/bin/salome/VERSION ]; then ver=`head -n1 ${HEXABLOCK_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` if [ "${ver}" = "${SALOME_VERSION}" ]; then return 0 @@ -87,11 +87,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -if [ "${INST_WITH_GUI}" = "FALSE" ] ; then - check_jb ./build.sh -d -p ${INST_ROOT} -DSALOME_BUILD_GUI=OFF HEXABLOCK -else - check_jb ./build.sh -d -p ${INST_ROOT} HEXABLOCK -fi +check_jb ./build.sh -d -p ${INST_ROOT} HEXABLOCK cd ${CUR_DIR} @@ -113,11 +109,7 @@ source ${INSTALL_WORK}/${SHRC} # create a module directory test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} -if [ "${INST_WITH_GUI}" = "FALSE" ] ; then - check_jb tar xfz ${SOURCE_DIR}/HEXABLOCKWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} -else - check_jb tar xfz ${SOURCE_DIR}/HEXABLOCKbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} -fi +check_jb tar xfz ${SOURCE_DIR}/HEXABLOCKbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} check_jb tar xfz ${SRC_DIR}/HEXABLOCKsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT} # modify all *.la files @@ -144,8 +136,6 @@ SRC_DIR=$8; shift REMOVE_SRC_TMP=$8; shift -INST_WITH_GUI=$9; -shift SINGLE_DIR=$9; if [ -n "${SINGLE_DIR}" ] ; then SINGLE_DIR=${SDIR_NAME}; fi export PRODUCT="HEXABLOCK_${SALOME_VERSION}" diff --git a/config_files/HEXABLOCKPLUGIN.sh b/config_files/HEXABLOCKPLUGIN.sh index 78859f7..55ab4dc 100755 --- a/config_files/HEXABLOCKPLUGIN.sh +++ b/config_files/HEXABLOCKPLUGIN.sh @@ -14,14 +14,12 @@ check_version(){ if [ -n "${HEXABLOCKPLUGIN_ROOT_DIR}" ]; then - check_lib_version VERSION ${HEXABLOCKPLUGIN_ROOT_DIR}/bin/salome - if [ "$?" -eq "0" ]; then + if [ -f ${HEXABLOCKPLUGIN_ROOT_DIR}/bin/salome/VERSION ]; then ver=`head -n1 ${HEXABLOCKPLUGIN_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` if [ "${ver}" = "${SALOME_VERSION}" ]; then return 0 fi fi - return 0 elif [ -n "${HEXABLOCKPLUGIN_SRC_DIR}" ]; then check_salome_src_version HEXABLOCKPLUGIN_SRC_DIR if [ $? -eq 0 ] ; then return 0 ; fi @@ -88,11 +86,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -if [ "${INST_WITH_GUI}" = "FALSE" ] ; then - check_jb ./build.sh -d -p ${INST_ROOT} -DSALOME_BUILD_GUI=OFF HEXABLOCKPLUGIN -else - check_jb ./build.sh -d -p ${INST_ROOT} HEXABLOCKPLUGIN -fi +check_jb ./build.sh -d -p ${INST_ROOT} HEXABLOCKPLUGIN cd ${CUR_DIR} @@ -114,11 +108,7 @@ source ${INSTALL_WORK}/${SHRC} # create a module directory test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} -if [ "${INST_WITH_GUI}" = "FALSE" ] ; then - check_jb tar xfz ${SOURCE_DIR}/HEXABLOCKPLUGINWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} -else - check_jb tar xfz ${SOURCE_DIR}/HEXABLOCKPLUGINbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} -fi +check_jb tar xfz ${SOURCE_DIR}/HEXABLOCKPLUGINbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} check_jb tar xfz ${SRC_DIR}/HEXABLOCKPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT} # modify all *.la files @@ -144,8 +134,6 @@ SRC_DIR=$8; shift REMOVE_SRC_TMP=$8; shift -INST_WITH_GUI=$9; -shift SINGLE_DIR=$9; if [ -n "${SINGLE_DIR}" ] ; then SINGLE_DIR=${SDIR_NAME}; fi export PRODUCT="HEXABLOCKPLUGIN_${SALOME_VERSION}" diff --git a/config_files/HOMARD.sh b/config_files/HOMARD.sh index 809afa6..fb9acea 100755 --- a/config_files/HOMARD.sh +++ b/config_files/HOMARD.sh @@ -14,8 +14,7 @@ check_version(){ if [ -n "${HOMARD_ROOT_DIR}" ]; then - check_lib_version VERSION ${HOMARD_ROOT_DIR}/bin/salome - if [ "$?" -eq "0" ]; then + if [ -f ${HOMARD_ROOT_DIR}/bin/salome/VERSION ]; then ver=`head -n1 ${HOMARD_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` if [ "${ver}" = "${SALOME_VERSION}" ]; then return 0 @@ -110,11 +109,7 @@ source ${INSTALL_WORK}/${SHRC} # create a module directory test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} -if [ "${INST_WITH_GUI}" = "FALSE" ] ; then - check_jb tar xfz ${SOURCE_DIR}/HOMARDWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} -else - check_jb tar xfz ${SOURCE_DIR}/HOMARDbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} -fi +check_jb tar xfz ${SOURCE_DIR}/HOMARDbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} check_jb tar xfz ${SRC_DIR}/HOMARDsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT} # modify all *.la files @@ -141,8 +136,6 @@ SRC_DIR=$8; shift REMOVE_SRC_TMP=$8; shift -INST_WITH_GUI=$9; -shift SINGLE_DIR=$9; if [ -n "${SINGLE_DIR}" ] ; then SINGLE_DIR=${SDIR_NAME}; fi export PRODUCT="HOMARD_${SALOME_VERSION}" diff --git a/config_files/YACS.sh b/config_files/YACS.sh index dc07d7c..a8d0b27 100755 --- a/config_files/YACS.sh +++ b/config_files/YACS.sh @@ -87,11 +87,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -if [ "${INST_WITH_GUI}" = "FALSE" ] ; then - check_jb ./build.sh -d -p ${INST_ROOT} -DSALOME_BUILD_GUI=OFF YACS -else - check_jb ./build.sh -d -p ${INST_ROOT} YACS -fi +check_jb ./build.sh -d -p ${INST_ROOT} YACS cd ${CUR_DIR} @@ -113,11 +109,7 @@ source ${INSTALL_WORK}/${SHRC} # create a module directory test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} -if [ "${INST_WITH_GUI}" = "FALSE" ] ; then - check_jb tar xfz ${SOURCE_DIR}/YACSWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} -else - check_jb tar xfz ${SOURCE_DIR}/YACSbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} -fi +check_jb tar xfz ${SOURCE_DIR}/YACSbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} check_jb tar xfz ${SRC_DIR}/YACSsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT} # modify all *.la files @@ -143,8 +135,6 @@ SRC_DIR=$8; shift REMOVE_SRC_TMP=$8; shift -INST_WITH_GUI=$9; -shift SINGLE_DIR=$9; if [ -n "${SINGLE_DIR}" ] ; then SINGLE_DIR=${SDIR_NAME}; fi export PRODUCT="YACS_${SALOME_VERSION}"