From 4d43c373816b9f5bc87eacf6aca8f68f772250ef Mon Sep 17 00:00:00 2001
From: maintenance team <salome-mnt@opencascade.com>
Date: Tue, 2 Jun 2009 11:06:45 +0000
Subject: [PATCH] Update for 5.1.2

---
 ...AS-6.3sp5-patch.sh => CAS-6.3sp6-patch.sh} |   6 +-
 config_files/{CAS-6.3sp5.sh => CAS-6.3sp6.sh} |   4 +-
 config_files/PYLIGHT.sh                       | 147 ++++++++++++++++++
 config_files/build.csh                        |   2 +-
 config_files/build.sh                         |   2 +-
 config_files/common.sh                        |   2 +-
 6 files changed, 155 insertions(+), 8 deletions(-)
 rename config_files/{CAS-6.3sp5-patch.sh => CAS-6.3sp6-patch.sh} (97%)
 rename config_files/{CAS-6.3sp5.sh => CAS-6.3sp6.sh} (99%)
 create mode 100755 config_files/PYLIGHT.sh

diff --git a/config_files/CAS-6.3sp5-patch.sh b/config_files/CAS-6.3sp6-patch.sh
similarity index 97%
rename from config_files/CAS-6.3sp5-patch.sh
rename to config_files/CAS-6.3sp6-patch.sh
index d4c1997..652645e 100755
--- a/config_files/CAS-6.3sp5-patch.sh
+++ b/config_files/CAS-6.3sp6-patch.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : CAS-6.3sp5.sh
+#  File      : CAS-6.3sp6.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.3sp5 has been installed
+# Patch for Open CASCADE 6.3sp6 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.3sp5"
+export PRODUCT="CAS-6.3sp6"
 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.3sp5.sh b/config_files/CAS-6.3sp6.sh
similarity index 99%
rename from config_files/CAS-6.3sp5.sh
rename to config_files/CAS-6.3sp6.sh
index 9a72c0e..6b112c8 100755
--- a/config_files/CAS-6.3sp5.sh
+++ b/config_files/CAS-6.3sp6.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : CAS-6.3sp5.sh
+#  File      : CAS-6.3sp6.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.3sp5"
+export PRODUCT="CAS-6.3sp6"
 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/PYLIGHT.sh b/config_files/PYLIGHT.sh
new file mode 100755
index 0000000..71464dc
--- /dev/null
+++ b/config_files/PYLIGHT.sh
@@ -0,0 +1,147 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : PYLIGHT.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 "${PYLIGHT_ROOT_DIR}" ]; then
+    if [ -f ${PYLIGHT_ROOT_DIR}/bin/salome/VERSION ]; then
+	ver=`cat ${PYLIGHT_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` 
+	if [ "$ver" = "${SALOME_VERSION}" ]; then
+	    return 0
+	fi
+    fi
+elif [ -n "${PYLIGHT_SRC_DIR}" ]; then
+  check_salome_src_version PYLIGHT_SRC_DIR
+  if [ $? -eq 0 ] ; then return 0 ; fi
+  return 1
+fi
+return 1
+}
+
+print_env_bin(){
+if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
+    LIB_PREFIX=64
+elif [ -d ${PRODUCT_DIR}/lib ] ; then 
+    LIB_PREFIX=""
+else 
+    LIB_PREFIX=64
+fi
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PYLIGHT_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export LD_LIBRARY_PATH=\${PYLIGHT_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
+  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 PYLIGHT_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}/PYLIGHTsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+if [ -e ./build.sh ] ; then
+    cp -f ./build.sh ${INST_ROOT}
+fi
+
+CUR_DIR=`pwd`
+cd ${INST_ROOT}
+check_jb ./build.sh -o -b -d -v 0 -p $INST_ROOT PYLIGHT
+
+cd $CUR_DIR
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+    test -d ${INST_ROOT}/"PYLIGHT_BUILD" && rm -fr ${INST_ROOT}/"PYLIGHT_BUILD"
+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}/PYLIGHTbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
+check_jb tar xfz ${SRC_DIR}/PYLIGHTsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
+
+# modify all *.la files
+export PYLIGHT_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="PYLIGHT_${SALOME_VERSION}"
+export PRODUCT_SRC="PYLIGHT_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/build.csh b/config_files/build.csh
index 9bcf894..6ffee6a 100755
--- a/config_files/build.csh
+++ b/config_files/build.csh
@@ -22,7 +22,7 @@ set is_delete=0
 set verbose_level=2
 set params=""
 set b_params=""
-set modules=(KERNEL GUI GEOM MED SMESH VISU NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT SIERPINSKY RANDOMIZER YACS)
+set modules=(KERNEL GUI GEOM MED SMESH VISU NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER YACS)
 set optim=""
 set is_install=0
 set is_help=0
diff --git a/config_files/build.sh b/config_files/build.sh
index a58c421..178cae2 100755
--- a/config_files/build.sh
+++ b/config_files/build.sh
@@ -88,7 +88,7 @@ is_delete=0
 verbose_level=2
 params=""
 b_params=""
-modules="KERNEL GUI GEOM MED SMESH VISU NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT SIERPINSKY RANDOMIZER YACS"
+modules="KERNEL GUI GEOM MED SMESH VISU NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER YACS"
 optim=""
 is_install=0
 is_tui=0
diff --git a/config_files/common.sh b/config_files/common.sh
index d4108ba..01b490f 100755
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -19,7 +19,7 @@ export CSHRC="salome.csh"
 #####################################################
 # !WARNING! This is current SALOME version number 
 ####################################################
-export SALOME_VERSION="5.1.1"
+export SALOME_VERSION="5.1.2"
 
 # Name of the single directory for SALOME modules
 export SDIR_NAME="SALOME_${SALOME_VERSION}"
-- 
2.39.2