From 7cefa7c7ade011c2e852f3b56ea7b3c35858820a Mon Sep 17 00:00:00 2001 From: maintenance team Date: Mon, 29 Oct 2007 12:28:06 +0000 Subject: [PATCH] Update for Salome 4X --- config_files/tcltk-8.3.3.sh | 237 ---------------- .../{tcltk-8.4.7.sh => tcltk-8.4.14.sh} | 8 +- config_files/tcltk-8.4.5.sh | 253 ------------------ 3 files changed, 5 insertions(+), 493 deletions(-) delete mode 100755 config_files/tcltk-8.3.3.sh rename config_files/{tcltk-8.4.7.sh => tcltk-8.4.14.sh} (97%) delete mode 100755 config_files/tcltk-8.4.5.sh diff --git a/config_files/tcltk-8.3.3.sh b/config_files/tcltk-8.3.3.sh deleted file mode 100755 index eb5911b..0000000 --- a/config_files/tcltk-8.3.3.sh +++ /dev/null @@ -1,237 +0,0 @@ -#!/bin/bash -noprofile - -#################################################################################### -# File : tcltk-8.3.3.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-2007 CEA -# -# This script is the part of the SALOME installation procedure. -# -#################################################################################### - -VERSION="8.3" - -check_version() -{ -if [ -z "$TCLHOME" ]; then - echo "TCLHOME doesn't set" - return 1 -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_ver=`awk '/^TCL_VERSION=.*/ {gsub("TCL_VERSION=","",$1);print $1}' ${tcl_cfg} | cut -d "'" -f 2` - if [ "$tcl_ver" != ${VERSION} ] ; then - return 1 - fi -else - return 1 -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_ver=`awk '/^TK_VERSION=.*/ {gsub("TK_VERSION=","",$1);print $1}' ${tk_cfg} | cut -d "'" -f 2` - if [ "$tk_ver" != ${VERSION} ] ; then - return 1 - fi -else - return 1 -fi - -return 0 -} - -print_env_bin() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <> ${PRODUCT_DIR}/CONFIGURE.LOG <> ${PRODUCT_DIR}/MAKE.LOG <> ${PRODUCT_DIR}/MAKEINSTALL.LOG <> ${PRODUCT_DIR}/CONFIGURE.LOG <> ${PRODUCT_DIR}/MAKE.LOG <> ${PRODUCT_DIR}/MAKEINSTALL.LOG <> ${PRODUCT_DIR}/CONFIGURE.LOG <> ${PRODUCT_DIR}/MAKE.LOG <> ${PRODUCT_DIR}/MAKEINSTALLEXEC.LOG < ${PRODUCT_DIR}/size.log -cd ${PRODUCT_DIR} - -# remove sources and temporary files after building -if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then - test -d ${PRODUCT_DIR}_SRC && rm -fr ${PRODUCT_DIR}_SRC -fi - -# to generate environment scripts -try_preinstalled -} - -install_binary() -{ -make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE} -source ${INSTALL_WORK}/$SHRC - -check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} - -# 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 - -# to generate environment scripts -try_preinstalled -} - -export PROCEDURE=$1; -export INSTALL_WORK=$2; -export SOURCE_DIR=$3; -export INSTALL_ROOT=$4; -export PRODUCT_SEQUENCE=$5; -export PRODUCT_TYPE=$6; -export INSTALL_PRODUCTS=$7; -shift -REMOVE_SRC_TMP=$8; -export PRODUCT="tcltk-8.3.3" -export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} -export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -source ./common.sh -$PROCEDURE diff --git a/config_files/tcltk-8.4.7.sh b/config_files/tcltk-8.4.14.sh similarity index 97% rename from config_files/tcltk-8.4.7.sh rename to config_files/tcltk-8.4.14.sh index 20082d8..b12369a 100755 --- a/config_files/tcltk-8.4.7.sh +++ b/config_files/tcltk-8.4.14.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : tcltk-8.4.7.sh +# File : tcltk-8.4.14.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -173,7 +173,9 @@ cd ${PRODUCT_DIR}_SRC/tclx-8.3.5_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 -chmod -w ./configure +#INV - bug in a tclx configure +cp configure configure.orig && sed "s/relid'/relid/" configure.orig > configure +chmod 755 ./configure #VRV - bug in a tclx configure cat >> ${PRODUCT_DIR}/CONFIGURE.LOG < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <> ${PRODUCT_DIR}/CONFIGURE.LOG <> ${PRODUCT_DIR}/MAKE.LOG <> ${PRODUCT_DIR}/MAKEINSTALL.LOG <> ${PRODUCT_DIR}/CONFIGURE.LOG <> ${PRODUCT_DIR}/MAKE.LOG <> ${PRODUCT_DIR}/MAKEINSTALL.LOG < Common.mk.in -cd ${PRODUCT_DIR}_SRC/tclx-8.3.5_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_DIR}_SRC/tclx-8.3.5_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_DIR}_SRC/tclx-8.3.5_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 -chmod -w ./configure -#VRV - bug in a tclx configure -cat >> ${PRODUCT_DIR}/CONFIGURE.LOG <> ${PRODUCT_DIR}/MAKE.LOG <> ${PRODUCT_DIR}/MAKEINSTALLEXEC.LOG < ${PRODUCT_DIR}/size.log -cd ${PRODUCT_DIR}; - - -# remove sources and temporary files after building -if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then - test -d ${PRODUCT_DIR}_SRC && rm -fr ${PRODUCT_DIR}_SRC -fi - -# to generate environment scripts -try_preinstalled -} - -install_binary() -{ -make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE} -source ${INSTALL_WORK}/$SHRC - -check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} - -# 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 - -# to generate environment scripts -try_preinstalled -} - -export PROCEDURE=$1; -export INSTALL_WORK=$2; -export SOURCE_DIR=$3; -export INSTALL_ROOT=$4; -export PRODUCT_SEQUENCE=$5; -export PRODUCT_TYPE=$6; -export INSTALL_PRODUCTS=$7; -export PRODUCT="tcltk-8.4.5" -shift -REMOVE_SRC_TMP=$8; -export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} -export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -source ./common.sh -$PROCEDURE -- 2.39.2