From deaba20e5cc269d64df11b1b2e4109b5bdaa5902 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Tue, 3 Apr 2012 20:33:58 +0000
Subject: [PATCH] SALOME 6.5.0 preparation: update script for tcl/tk (8.5.8)

---
 config_CentOS_5.5_64bit.xml               |   2 +-
 config_Debian_4.0.xml                     |   2 +-
 config_Debian_4.0_64bit.xml               |   2 +-
 config_Debian_5.0_64bit.xml               |   2 +-
 config_Debian_6.0_64bit.xml               |   2 +-
 config_Mandriva_2008.0.xml                |   2 +-
 config_Mandriva_2008.0_64bit.xml          |   2 +-
 config_Mandriva_2010.0.xml                |   2 +-
 config_Mandriva_2010.0_64bit.xml          |   2 +-
 config_Red_Hat_Enterprise_WS_4_64bit.xml  |   2 +-
 config_Scientific_SL_5.1_64bit.xml        |   2 +-
 config_files/{tcltk-8.5.8.sh => tcltk.sh} | 113 +++++++++-------------
 12 files changed, 57 insertions(+), 78 deletions(-)
 rename config_files/{tcltk-8.5.8.sh => tcltk.sh} (57%)

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index a406404..b873d47 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -372,7 +372,7 @@
 	            version="8.5.8" 
 		    disable="false"
 		    installdiskspace="10765,28789,50385"
-		    script="tcltk-8.5.8.sh"/>
+		    script="tcltk.sh"/>
     </product>
     <product name="Python" 
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index 70b9a66..f7b5e0a 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -372,7 +372,7 @@
 	            version="8.5.8" 
 		    disable="false"
 		    installdiskspace="10765,28789,50385"
-		    script="tcltk-8.5.8.sh"/>
+		    script="tcltk.sh"/>
     </product>
     <product name="Python" 
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index 8fda210..242bb6f 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -372,7 +372,7 @@
 	            version="8.5.8" 
 		    disable="false"
 		    installdiskspace="10765,28789,50385"
-		    script="tcltk-8.5.8.sh"/>
+		    script="tcltk.sh"/>
     </product>
     <product name="Python" 
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index ce5b588..1349f03 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -372,7 +372,7 @@
 	            version="8.5.8" 
 		    disable="false"
 		    installdiskspace="10765,28789,50385"
-		    script="tcltk-8.5.8.sh"/>
+		    script="tcltk.sh"/>
     </product>
     <product name="Python" 
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 152dcf7..9151750 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -372,7 +372,7 @@
 	            version="8.5.8" 
 		    disable="false"
 		    installdiskspace="10765,28789,50385"
-		    script="tcltk-8.5.8.sh"/>
+		    script="tcltk.sh"/>
     </product>
     <product name="Python" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index 641b2f1..9ce738e 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -372,7 +372,7 @@
 	            version="8.5.8" 
 		    disable="false"
 		    installdiskspace="10765,28789,50385"
-		    script="tcltk-8.5.8.sh"/>
+		    script="tcltk.sh"/>
     </product>
     <product name="Python" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 3be8087..d884d0c 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -372,7 +372,7 @@
 	            version="8.5.8" 
 		    disable="false"
 		    installdiskspace="10765,28789,50385"
-		    script="tcltk-8.5.8.sh"/>
+		    script="tcltk.sh"/>
     </product>
     <product name="Python" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index b18973c..9663389 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -372,7 +372,7 @@
 	            version="8.5.8" 
 		    disable="false"
 		    installdiskspace="10765,28789,50385"
-		    script="tcltk-8.5.8.sh"/>
+		    script="tcltk.sh"/>
     </product>
     <product name="Python" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index 0e0fda5..7045751 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -372,7 +372,7 @@
 	            version="8.5.8" 
 		    disable="false"
 		    installdiskspace="10765,28789,50385"
-		    script="tcltk-8.5.8.sh"/>
+		    script="tcltk.sh"/>
     </product>
     <product name="Python" 
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index bb04654..22a0f7f 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -372,7 +372,7 @@
 	            version="8.5.8" 
 		    disable="false"
 		    installdiskspace="10765,28789,50385"
-		    script="tcltk-8.5.8.sh"/>
+		    script="tcltk.sh"/>
     </product>
     <product name="Python" 
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index 1edb774..6eafa57 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -372,7 +372,7 @@
 	            version="8.5.8" 
 		    disable="false"
 		    installdiskspace="10765,28789,50385"
-		    script="tcltk-8.5.8.sh"/>
+		    script="tcltk.sh"/>
     </product>
     <product name="Python" 
 	     type="prerequisite"
diff --git a/config_files/tcltk-8.5.8.sh b/config_files/tcltk.sh
similarity index 57%
rename from config_files/tcltk-8.5.8.sh
rename to config_files/tcltk.sh
index 6949de4..bde8412 100755
--- a/config_files/tcltk-8.5.8.sh
+++ b/config_files/tcltk.sh
@@ -1,18 +1,27 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : tcltk-8.5.8.sh
+#  File      : tcltk.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
+#  Copyright : 2002-2012 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
 ####################################################################################
 
-VERSION="8.5"
+#
+# tcl, tk and tclX versions
+#
+TCL_VERSION=8.5.8
+TK_VERSION=8.5.8
+TCLX_VERSION=8.4.0
+#
+TCL_LIBVERSION=`echo $TCL_VERSION | awk -F. '{printf("%d.%d", $1, $2)}'`
+TK_LIBVERSION=`echo $TK_VERSION | awk -F. '{printf("%d.%d", $1, $2)}'`
+TCLX_LIBVERSION=`echo $TCLX_VERSION | awk -F. '{printf("%d.%d", $1, $2)}'`
 
 check_version()
 {
@@ -23,12 +32,12 @@ fi
 
 # check tcl version
 tcl_cfg=${TCLHOME}/lib/tclConfig.sh
-if [ ! -f ${tcl_cfg} ]; then tcl_cfg=${TCLHOME}/tcl${VERSION}/lib/tclConfig.sh; fi
-if [ ! -f ${tcl_cfg} ]; then tcl_cfg=${TCLHOME}/lib/tcl${VERSION}/tclConfig.sh; fi
-if [ ! -f ${tcl_cfg} ]; then tcl_cfg=${TCLHOME}/lib/tcl${VERSION}/lib/tclConfig.sh; fi
+if [ ! -f ${tcl_cfg} ]; then tcl_cfg=${TCLHOME}/tcl${TCL_LIBVERSION}/lib/tclConfig.sh; fi
+if [ ! -f ${tcl_cfg} ]; then tcl_cfg=${TCLHOME}/lib/tcl${TCL_LIBVERSION}/tclConfig.sh; fi
+if [ ! -f ${tcl_cfg} ]; then tcl_cfg=${TCLHOME}/lib/tcl${TCL_LIBVERSION}/lib/tclConfig.sh; fi
 if [ -f ${tcl_cfg} ]; then
     tcl_ver=`awk '/^TCL_VERSION=.*/ {gsub("TCL_VERSION=","",$1);print $1}' ${tcl_cfg} | cut -d "'" -f 2`
-    if [ "$tcl_ver" != ${VERSION} ] ; then
+    if [ "$tcl_ver" != ${TCL_LIBVERSION} ] ; then
 	return 1
     fi
 else
@@ -37,12 +46,12 @@ fi
 
 # check tk version
 tk_cfg=${TCLHOME}/lib/tkConfig.sh
-if [ ! -f ${tk_cfg} ]; then tk_cfg=${TCLHOME}/tk${VERSION}/tkConfig.sh; fi
-if [ ! -f ${tk_cfg} ]; then tk_cfg=${TCLHOME}/lib/tk${VERSION}/tkConfig.sh; fi
-if [ ! -f ${tk_cfg} ]; then tk_cfg=${TCLHOME}/lib/tk${VERSION}/lib/tkConfig.sh; fi
+if [ ! -f ${tk_cfg} ]; then tk_cfg=${TCLHOME}/tk${TK_LIBVERSION}/tkConfig.sh; fi
+if [ ! -f ${tk_cfg} ]; then tk_cfg=${TCLHOME}/lib/tk${TK_LIBVERSION}/tkConfig.sh; fi
+if [ ! -f ${tk_cfg} ]; then tk_cfg=${TCLHOME}/lib/tk${TK_LIBVERSION}/lib/tkConfig.sh; fi
 if [ -f ${tk_cfg} ]; then
     tk_ver=`awk '/^TK_VERSION=.*/ {gsub("TK_VERSION=","",$1);print $1}' ${tk_cfg} | cut -d "'" -f 2`
-    if [ "$tk_ver" != ${VERSION} ] ; then
+    if [ "$tk_ver" != ${TK_LIBVERSION} ] ; then
 	return 1
     fi
 else
@@ -59,7 +68,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export TCLHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PATH=\${TCLHOME}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${TCLHOME}/lib:\${LD_LIBRARY_PATH}
-export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl${VERSION} \${TCLHOME}/lib/tk${VERSION}"
+export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl${TCL_LIBVERSION} \${TCLHOME}/lib/tk${TK_LIBVERSION}"
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -90,9 +99,9 @@ source ${INSTALL_WORK}/$SHRC
 
 mkdir -p ${PRODUCT_SRC_DIR}
 
-check_jb tar xfz ${SOURCE_DIR}/tcl8.5.8.tar.gz -C ${PRODUCT_SRC_DIR}
-check_jb tar xfz ${SOURCE_DIR}/tk8.5.8.tar.gz -C ${PRODUCT_SRC_DIR}
-check_jb tar xfz ${SOURCE_DIR}/tclx8.4.0.tar.gz -C ${PRODUCT_SRC_DIR}
+check_jb tar xfz ${SOURCE_DIR}/tcl-${TCL_VERSION}.tar.gz -C ${PRODUCT_SRC_DIR}
+check_jb tar xfz ${SOURCE_DIR}/tk-${TK_VERSION}.tar.gz -C ${PRODUCT_SRC_DIR}
+check_jb tar xfz ${SOURCE_DIR}/tclx-${TCLX_VERSION}.tar.gz -C ${PRODUCT_SRC_DIR}
 
 # to generate environment scripts
 try_preinstalled
@@ -106,14 +115,13 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-cd ${PRODUCT_SRC_DIR}/tcl8.5.8_SRC/unix
+cd ${PRODUCT_SRC_DIR}/tcl-${TCL_VERSION}_SRC/unix
 cat >> ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
 -------------------
 Configuring tcl...
 -------------------
 EOF
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --enable-gcc --enable-shared --enable-threads \
-    --prefix=${PRODUCT_DIR}
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --enable-gcc --enable-shared --enable-threads --prefix=${PRODUCT_DIR}
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
@@ -129,18 +137,17 @@ Installing tcl...
 EOF
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
-(cd ${PRODUCT_DIR}/bin; ln -fs tclsh8.5 tclsh)
-(cd ${PRODUCT_DIR}/lib; ln -fs libtcl8.5.so libtcl.so)
-(cd ${PRODUCT_DIR}/lib; ln -fs libtclstub8.5.a libtclstub.a)
+(cd ${PRODUCT_DIR}/bin; ln -fs tclsh${TCL_LIBVERSION} tclsh)
+(cd ${PRODUCT_DIR}/lib; ln -fs libtcl${TCL_LIBVERSION}.so libtcl.so)
+(cd ${PRODUCT_DIR}/lib; ln -fs libtclstub${TCL_LIBVERSION}.a libtclstub.a)
 
-cd ${PRODUCT_SRC_DIR}/tk8.5.8_SRC/unix
+cd ${PRODUCT_SRC_DIR}/tk-${TK_VERSION}_SRC/unix
 cat >> ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
 -------------------
 Configuring tk...
 -------------------
 EOF
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --enable-gcc --enable-shared --enable-threads \
-    --prefix=${PRODUCT_DIR} --with-tcl=${PRODUCT_DIR}/lib
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --enable-gcc --enable-shared --enable-threads --prefix=${PRODUCT_DIR} --with-tcl=${PRODUCT_DIR}/lib
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 -------------------
 Making tk...
@@ -154,62 +161,38 @@ Installing tk...
 EOF
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
-(cd ${PRODUCT_DIR}/bin; ln -fs wish8.5 wish)
-(cd ${PRODUCT_DIR}/lib; ln -fs libtk8.5.so libtk.so)
-(cd ${PRODUCT_DIR}/lib; ln -fs libtkstub8.5.a libtkstub.a)
-
-#vsr: patch tclx 8.4.0 to make it compiliable on Mandriva 2006.0
-#mv Common.mk.in Common.mk.in.orig
-#sed -e 's/@DEFS@/-DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void/g' Common.mk.in.orig > Common.mk.in
-#cd ${PRODUCT_SRC_DIR}/tclx8.4.0_SRC/tcl/unix
-#mv tclxConfig.sh.in tclxConfig.sh.in.orig
-#sed -e 's/@DEFS@/ -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void /g' tclxConfig.sh.in.orig > tclxConfig.sh.in
-#cd ${PRODUCT_SRC_DIR}/tclx8.4.0_SRC/tk/unix
-#mv tkxConfig.sh.in tkxConfig.sh.in.orig
-#sed -e 's/@DEFS@/ -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void /g' tkxConfig.sh.in.orig > tkxConfig.sh.in
-
-#cd ${PRODUCT_SRC_DIR}/tclx8.4.0_SRC/unix
-#VRV - bug in a tclx configure 
-#chmod +w ./configure
-#echo -e '/test "$no_create" = yes || ${CONFIG_SHELL-\/bin\/sh} $CONFIG_STATUS || exit 1\ns/test "$no_create" = yes || ${CONFIG_SHELL-\/bin\/sh} $CONFIG_STATUS || exit 1/test "$no_create" = yes || ${CONFIG_SHELL-\/bin\/sh} $CONFIG_STATUS || exit 0\nwq' | ed - configure 
-#INV - bug in a tclx configure 
+(cd ${PRODUCT_DIR}/bin; ln -fs wish${TK_VERSION} wish)
+(cd ${PRODUCT_DIR}/lib; ln -fs libtk${TK_VERSION}.so libtk.so)
+(cd ${PRODUCT_DIR}/lib; ln -fs libtkstub${TK_VERSION}.a libtkstub.a)
 
-cd ${PRODUCT_SRC_DIR}/tclx8.4.0_SRC
+cd ${PRODUCT_SRC_DIR}/tclx_${TCLX_VERSION}_SRC
 #INV - bug in a tclx configure 
-cp configure configure.orig && sed "s/relid'/relid/" configure.orig > configure
-chmod 755 ./configure
+chmod +w configure && sed -i "s/relid'/relid/" configure
 
 cat >> ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
 -------------------
 Configuring tclx...
 -------------------
 EOF
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
-    ./configure --enable-gcc --enable-shared --enable-threads \
-    --prefix=${PRODUCT_DIR}  --with-tcl=${PRODUCT_DIR}/lib  --with-tk=${PRODUCT_DIR}/lib
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --enable-gcc --enable-shared --enable-threads \
+    --prefix=${PRODUCT_DIR} --with-tcl=${PRODUCT_DIR}/lib --with-tk=${PRODUCT_DIR}/lib
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 -------------------
 Making tclx...
 -------------------
 EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make
-cat >> ${PRODUCT_DIR}/MAKEINSTALLEXEC.LOG <<EOF
+cat >> ${PRODUCT_DIR}/MAKEINSTALL.LOG <<EOF
 -------------------
 Installing tclx...
 -------------------
 EOF
-check_job ${PRODUCT_DIR}/MAKEINSTALLEXEC.LOG make install
+check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
-(cd ${PRODUCT_DIR}/lib; ln -fs tclx8.4/libtclx8.4.so libtclx.so)
-#(cd ${PRODUCT_DIR}/lib; ln -fs tclx8.4/libtclx8.4.a  libtclx.a)
-#(cd ${PRODUCT_DIR}/lib; ln -fs tclx8.4/libtkx8.4.so  libtkx.so)
-#(cd ${PRODUCT_DIR}/lib; ln -fs tclx8.4/libtkx8.4.a   libtkx.a)
+(cd ${PRODUCT_DIR}/lib; ln -fs tclx${TCLX_LIBVERSION}/libtclx${TCLX_LIBVERSION}.so libtclx.so)
 
 cd ${PRODUCT_DIR}
-
-  if test `uname -m` = "x86_64" ; then
-  if [ ! -h lib64 ]; then ln -s lib lib64; fi
-      fi
+test `uname -m` = "x86_64" && test ! -e lib64 && ln -s lib lib64
 
 # remove sources and temporary files after building
 if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
@@ -233,15 +216,11 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 # overriding installation path
 cd ${PRODUCT_DIR}/lib
 old_prefix=`grep -e "^TCL_PREFIX='.*'" tclConfig.sh | sed -e "s%^TCL_PREFIX='\(.*\)'%\1%g"`
-sed -e "s%${old_prefix}%${PRODUCT_DIR}%g" tclConfig.sh > _tclConfig.sh
-mv -f _tclConfig.sh tclConfig.sh
-sed -e "s%${old_prefix}%${PRODUCT_DIR}%g" tkConfig.sh > _tkConfig.sh
-mv -f _tkConfig.sh tkConfig.sh
+sed -i "s%${old_prefix}%${PRODUCT_DIR}%g" tclConfig.sh
+sed -i "s%${old_prefix}%${PRODUCT_DIR}%g" tkConfig.sh
 
 cd ${PRODUCT_DIR}
-  if test `uname -m` = "x86_64" ; then
-  if [ ! -h lib64 ]; then ln -s lib lib64; fi
-      fi
+test `uname -m` = "x86_64" && test ! -e lib64 && ln -s lib lib64
 
 # to generate environment scripts
 try_preinstalled
@@ -257,7 +236,7 @@ export INSTALL_PRODUCTS=$7;
 shift
 REMOVE_SRC_TMP=$8;
 test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="tcltk-8.5.8"
+export PRODUCT="tcltk-${TCL_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-- 
2.39.2