From 8ed3f3462856ae07e3a43ce6956f1c7e86c75dea Mon Sep 17 00:00:00 2001
From: inv <inv@opencascade.com>
Date: Wed, 7 Apr 2010 09:49:25 +0000
Subject: [PATCH] Update for Salome 5.1.4

---
 ...AS-6.3sp8-patch.sh => CAS-6.3sp9-patch.sh} |   6 +-
 config_files/{CAS-6.3sp8.sh => CAS-6.3sp9.sh} |   4 +-
 config_files/JOBMANAGER.sh                    | 132 ++++++++++++++++++
 config_files/YACSGEN.sh                       |  10 +-
 4 files changed, 141 insertions(+), 11 deletions(-)
 rename config_files/{CAS-6.3sp8-patch.sh => CAS-6.3sp9-patch.sh} (97%)
 rename config_files/{CAS-6.3sp8.sh => CAS-6.3sp9.sh} (99%)
 create mode 100755 config_files/JOBMANAGER.sh

diff --git a/config_files/CAS-6.3sp8-patch.sh b/config_files/CAS-6.3sp9-patch.sh
similarity index 97%
rename from config_files/CAS-6.3sp8-patch.sh
rename to config_files/CAS-6.3sp9-patch.sh
index 61b4a99..2556da9 100755
--- a/config_files/CAS-6.3sp8-patch.sh
+++ b/config_files/CAS-6.3sp9-patch.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : CAS-6.3sp8.sh
+#  File      : CAS-6.3sp9.sh
 #  Created   : Thu Dec 18 12:01:00 2002
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
@@ -36,7 +36,7 @@ print_env_bin()
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 ##
-# Patch for Open CASCADE 6.3sp8 has been installed
+# Patch for Open CASCADE 6.3sp9 has been installed
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -126,7 +126,7 @@ export INSTALL_PRODUCTS=$7;
 shift
 REMOVE_SRC_TMP=$8;
 test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="CAS-6.3sp8"
+export PRODUCT="CAS-6.3sp9"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
diff --git a/config_files/CAS-6.3sp8.sh b/config_files/CAS-6.3sp9.sh
similarity index 99%
rename from config_files/CAS-6.3sp8.sh
rename to config_files/CAS-6.3sp9.sh
index 487a5b8..45d7c07 100755
--- a/config_files/CAS-6.3sp8.sh
+++ b/config_files/CAS-6.3sp9.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : CAS-6.3sp8.sh
+#  File      : CAS-6.3sp9.sh
 #  Created   : Thu Dec 18 12:01:00 2002
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
@@ -275,7 +275,7 @@ export INSTALL_PRODUCTS=$7;
 shift
 REMOVE_SRC_TMP=$8;
 test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="CAS-6.3sp8"
+export PRODUCT="CAS-6.3sp9"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
diff --git a/config_files/JOBMANAGER.sh b/config_files/JOBMANAGER.sh
new file mode 100755
index 0000000..db1214c
--- /dev/null
+++ b/config_files/JOBMANAGER.sh
@@ -0,0 +1,132 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : JOBMANAGER.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-2008 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+check_version(){
+if [ -n "${JOBMANAGER_SRC_DIR}" ]; then
+  check_salome_src_version JOBMANAGER_SRC_DIR
+	if [ "$ver" = "${JOBMANAGER_VERSION}" ]; then
+	    return 0
+	fi
+fi
+return 1
+}
+
+
+print_env_bin(){
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export JOBMANAGER_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${JOBMANAGER_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${JOBMANAGER_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${JOBMANAGER_ROOT_DIR}/bin/salome:\${JOBMANAGER_ROOT_DIR}/lib/salome:\${JOBMANAGER_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src(){
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+export JOBMANAGER_SRC_DIR=\${INST_ROOT}/${PRODUCT_SRC}
+##
+EOF
+
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+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}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+
+cd ${PRODUCT_SRC_DIR}
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_job ${PRODUCT_DIR}/MAKE.LOG ./setup.py install --prefix=${PRODUCT_DIR}
+
+cd ${PRODUCT_DIR};
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+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}/JOBMANAGERbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
+check_jb tar xfz ${SRC_DIR}/JOBMANAGERsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
+
+# modify all *.la files
+export JOBMANAGER_ROOT_DIR=${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+source ./common.sh
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+SRC_DIR=$8;
+shift
+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_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 dbca20f..9fc6c6a 100755
--- a/config_files/YACSGEN.sh
+++ b/config_files/YACSGEN.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : YACSGEN-5.1.4.sh
+#  File      : YACSGEN.sh
 #  Created   : Thu Dec 18 12:01:00 2002
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
@@ -17,7 +17,7 @@ if [ -n "${YACSGEN_SRC_DIR}" ]; then
     cfg_file=setup.py   
     if [ -f ${YACSGEN_SRC_DIR}/${cfg_file} ] ; then
 	ver=`grep -e "version" ${YACSGEN_SRC_DIR}/${cfg_file} | sed s/\[A-z=,\']//g`
-	if [ "$ver" = "${SALOME_VERSION}" ]; then
+	if [ "$ver" = "${YACSGEN_VERSION}" ]; then
 	    return 0
 	fi
     fi
@@ -25,8 +25,7 @@ fi
 return 1
 }
 
-print_env_bin()
-{
+print_env_bin(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export YACSGEN_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
@@ -41,8 +40,7 @@ EOF
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 }
 
-print_env_src()
-{
+print_env_src(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE}_src $DELIM
 export YACSGEN_SRC_DIR=\${INST_ROOT}/${PRODUCT_SRC}
-- 
2.39.2