From 9eacda4de8cd37d371550d21b5219a6a7573cd26 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 16 Dec 2013 14:41:23 +0000 Subject: [PATCH] SALOME 7.3.0 preparation --- config_files/PYHELLO.sh | 2 +- config_files/SMESH.sh | 1 + config_files/YACS.sh | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config_files/PYHELLO.sh b/config_files/PYHELLO.sh index 97d4d59..6c39e81 100755 --- a/config_files/PYHELLO.sh +++ b/config_files/PYHELLO.sh @@ -116,7 +116,7 @@ export PYHELLO_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePYHELLOConfig.cmake modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePYHELLOTargets-release.cmake -sed -e "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export PYHELLO_ROOT_DIR=.*%export PYHELLO_ROOT_DIR=${PYHELLO_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runAppli +sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export PYHELLO_ROOT_DIR=.*%export PYHELLO_ROOT_DIR=${PYHELLO_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runAppli # to generate environment scripts try_preinstalled diff --git a/config_files/SMESH.sh b/config_files/SMESH.sh index 7a701b9..41ef5f4 100755 --- a/config_files/SMESH.sh +++ b/config_files/SMESH.sh @@ -126,6 +126,7 @@ export SMESH_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeSMESHConfig.cmake modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeSMESHTargets-release.cmake +test -f ${PRODUCT_DIR}/bin/salome/spadder/autotest.sh && sed -i "s%INSTALL_DIR=.*%INSTALL_DIR=${PRODUCT_DIR}%g" ${PRODUCT_DIR}/bin/salome/spadder/autotest.sh # to generate environment scripts try_preinstalled diff --git a/config_files/YACS.sh b/config_files/YACS.sh index 76515cd..bc42a5c 100755 --- a/config_files/YACS.sh +++ b/config_files/YACS.sh @@ -123,8 +123,8 @@ check_jb tar xfz ${SRC_DIR}/YACSsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT} # modify all *.la files export YACS_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} -modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeYACSConfig.cmake -modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeYACSTargets-release.cmake +modif_cfg_file ${PRODUCT_DIR}/adm/cmake/SalomeYACSConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/adm/cmake/SalomeYACSTargets-release.cmake # to generate environment scripts try_preinstalled -- 2.30.2