Update for Salome 5.1.4

diff --git a/config_files/JOBMANAGER.sh b/config_files/JOBMANAGER.sh
index db1214c723624bd81b1abecfceed876317f6dc60..92a47d5beb1d3fdce061e8f34b765fafd134046f 100755 (executable)
--- a/config_files/JOBMANAGER.sh
+++ b/config_files/JOBMANAGER.sh
@@ -22,7 +22,6 @@ fi
 return 1
 }
 
-
 print_env_bin(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
@@ -62,7 +61,7 @@ install_source()
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/JOBMANAGERsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/JOBMANAGERsourcesV${JOBMANAGER_VERSION}.tar.gz -C ${INST_ROOT}
 
 # to generate environment scripts
 try_preinstalled
@@ -99,8 +98,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}/JOBMANAGERbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
-check_jb tar xfz ${SRC_DIR}/JOBMANAGERsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/JOBMANAGERbinariesV${JOBMANAGER_VERSION}.tar.gz -C ${PRODUCT_DIR}
+check_jb tar xfz ${SRC_DIR}/JOBMANAGERsourcesV${JOBMANAGER_VERSION}.tar.gz -C ${INST_ROOT}
 
 # modify all *.la files
 export JOBMANAGER_ROOT_DIR=${PRODUCT_DIR}
@@ -125,8 +124,8 @@ REMOVE_SRC_TMP=$8;
 shift
 SINGLE_DIR=$9;
 if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi
-export PRODUCT="JOBMANAGER_${SALOME_VERSION}"
-export PRODUCT_SRC="JOBMANAGER_SRC_${SALOME_VERSION}"
+export PRODUCT="JOBMANAGER_${JOBMANAGER_VERSION}"
+export PRODUCT_SRC="JOBMANAGER_SRC_${JOBMANAGER_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
 $PROCEDURE 

diff --git a/config_files/YACSGEN.sh b/config_files/YACSGEN.sh
index 9fc6c6a2bded6e651146bdf05826e07c4ecff407..e0566e14c11e329fe19f53df3c3567075e0a1175 100755 (executable)
--- a/config_files/YACSGEN.sh
+++ b/config_files/YACSGEN.sh
@@ -62,7 +62,7 @@ install_source()
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/YACSGENsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
+check_jb tar xfz ${SRC_DIR}/YACSGENsourcesV${YACSGEN_VERSION}.tar.gz -C ${INST_ROOT}
 
 # to generate environment scripts
 try_preinstalled
@@ -93,21 +93,7 @@ try_preinstalled
 
 install_binary()
 {
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-# create a module directory
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/YACSGENbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
-check_jb tar xfz ${SRC_DIR}/YACSGENsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
-
-# modify all *.la files
-export YACSGEN_ROOT_DIR=${PRODUCT_DIR}
-test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-
-# to generate environment scripts
-try_preinstalled
+install_source_and_build
 }
 
 source ./common.sh
@@ -125,8 +111,8 @@ REMOVE_SRC_TMP=$8;
 shift
 SINGLE_DIR=$9;
 if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi
-export PRODUCT="YACSGEN_${SALOME_VERSION}"
-export PRODUCT_SRC="YACSGEN_SRC_${SALOME_VERSION}"
+export PRODUCT="YACSGEN_${YACSGEN_VERSION}"
+export PRODUCT_SRC="YACSGEN_SRC_${YACSGEN_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
 $PROCEDURE 

diff --git a/config_files/common.sh b/config_files/common.sh
index 7582c54d460aabbb68238908ae140244fa77144d..803f59229a092e3eeb7e1c7a22f122ec15d9e067 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -20,6 +20,8 @@ export CSHRC="salome.csh"
 # !WARNING! This is current SALOME version number 
 ####################################################
 export SALOME_VERSION="5.1.3"
+export YACSGEN_VERSION="5.1.3"
+export JOBMANAGER_VERSION="0.1"
 
 # Name of the single directory for SALOME modules
 export SDIR_NAME="SALOME_${SALOME_VERSION}"