From ffcded120635b325611612da3397f8283b517431 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 20 Dec 2005 15:32:49 +0000 Subject: [PATCH] Debug install wizard for Debian 3.1 (Sarge) --- config.xml | 122 ++-- ...Mandrake_10.1.xml => config_Debian_3.1.xml | 114 ++-- config_RedHat_8.0.xml | 552 ------------------ config_RedHat_9.xml | 552 ------------------ config_Scientific_3.0.5.xml | 552 ------------------ config_files/BOOST-1.30.2.sh | 59 -- config_files/BOOST-1.31.0.sh | 22 +- config_files/HappyDoc-r2_1.sh | 8 +- config_files/Numeric-22.0.sh | 78 --- config_files/Numeric-23.7.sh | 23 +- .../{Python-2.3.4.sh => Python-2.3.5.sh} | 16 +- config_files/SWIG-1.3.17.sh | 99 ---- config_files/VTK-4.2.2.sh | 172 ------ config_files/VTK-4.2.6.sh | 24 +- config_files/common.sh | 2 +- config_files/doxygen-1.3-rc2.sh | 163 ------ .../{doxygen-1.3.7.sh => doxygen-1.4.2.sh} | 75 +-- config_files/gcc-3.2.sh | 127 ---- config_files/{gcc-3.4.sh => gcc-3.3.5.sh} | 18 +- config_files/graphviz-1.9.sh | 105 ---- config_files/hdf5-1.4.4.sh | 161 ----- config_files/msg2qm.sh | 3 +- config_files/{qt-3.3.3.sh => qt-3.3.4.sh} | 15 +- config_files/qwt-0.4.1.sh | 98 ---- config_files/sip-4.1.sh | 2 +- config_files/tcltk-8.3.3.sh | 218 ------- config_files/tcltk-8.4.5.sh | 7 +- 27 files changed, 249 insertions(+), 3138 deletions(-) rename config_Mandrake_10.1.xml => config_Debian_3.1.xml (91%) delete mode 100755 config_RedHat_8.0.xml delete mode 100755 config_RedHat_9.xml delete mode 100755 config_Scientific_3.0.5.xml delete mode 100755 config_files/BOOST-1.30.2.sh delete mode 100755 config_files/Numeric-22.0.sh rename config_files/{Python-2.3.4.sh => Python-2.3.5.sh} (91%) delete mode 100755 config_files/SWIG-1.3.17.sh delete mode 100755 config_files/VTK-4.2.2.sh delete mode 100755 config_files/doxygen-1.3-rc2.sh rename config_files/{doxygen-1.3.7.sh => doxygen-1.4.2.sh} (57%) delete mode 100755 config_files/gcc-3.2.sh rename config_files/{gcc-3.4.sh => gcc-3.3.5.sh} (87%) delete mode 100755 config_files/graphviz-1.9.sh delete mode 100755 config_files/hdf5-1.4.4.sh rename config_files/{qt-3.3.3.sh => qt-3.3.4.sh} (90%) delete mode 100755 config_files/qwt-0.4.1.sh delete mode 100755 config_files/tcltk-8.3.3.sh diff --git a/config.xml b/config.xml index 7b2ee3a..f865304 100644 --- a/config.xml +++ b/config.xml @@ -3,11 +3,11 @@ caption="SALOME v%1" copyright="<h5>Copyright (C) 2003-2005 OPEN CASCADE,<br>EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D,<br>LEG, PRINCIPIA R&D, BUREAU VERITAS</h5>" license="<h5>GNU LGPL</h5>" - os="Mandrake10.1"/> + os="DebianSarge"/> + script="gcc-3.3.5.sh"/> + installdiskspace="43390" + temporarydiskspace="69380" + script="Python-2.3.5.sh"/> + installdiskspace="50946" + temporarydiskspace="161340" + script="qt-3.3.4.sh"/> + installdiskspace="5116" + temporarydiskspace="38060" + script="doxygen-1.4.2.sh"/> + os="DebianSarge"/> + script="gcc-3.3.5.sh"/> + installdiskspace="43390" + temporarydiskspace="69380" + script="Python-2.3.5.sh"/> + installdiskspace="50946" + temporarydiskspace="161340" + script="qt-3.3.4.sh"/> + installdiskspace="5116" + temporarydiskspace="38060" + script="doxygen-1.4.2.sh"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config_RedHat_9.xml b/config_RedHat_9.xml deleted file mode 100755 index 87d82d6..0000000 --- a/config_RedHat_9.xml +++ /dev/null @@ -1,552 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config_Scientific_3.0.5.xml b/config_Scientific_3.0.5.xml deleted file mode 100755 index 28084a5..0000000 --- a/config_Scientific_3.0.5.xml +++ /dev/null @@ -1,552 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config_files/BOOST-1.30.2.sh b/config_files/BOOST-1.30.2.sh deleted file mode 100755 index bf0c29a..0000000 --- a/config_files/BOOST-1.30.2.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh - -check_version(){ -ver=`egrep 'BOOST_VERSION [0-9]+' ${BOOSTDIR}/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'` -if [ "$ver" = "103002" ]; then - return 0 -fi -return 1; -} - -print_env() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < /dev/null if [ "$?" -eq "0" ]; then - ver=`happydoc | grep "HappyDoc version 2.1"` ver=`happydoc | grep "HappyDoc version 2.1" | sort -u | awk '{print $NF}'` if [ "$ver" == "2.1" ]; then return 0 @@ -31,6 +30,7 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" try_native(){ happydoc="`find_in_path happydoc ${PATH}`" if [ -n "${happydoc}" ] ; then + ver=`happydoc | grep "HappyDoc version 2.1" | sort -u | awk '{print $NF}'` cat > ${INSTALL_WORK}/try_native.py </dev/null` + pythonpath=`dirname $pythonpath` + pythonpath=`dirname $pythonpath` tmp="${pythonpath} ${pythonpath} \${PYTHONPATH} ${PYTHONPATH}"; pythonpath=`sort_path ${tmp}` cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh </dev/null` -if [ "$ver" == "22.0" ]; then - return 0 -fi -return 1 -} - -print_env(){ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${PRODUCT_DIR}/size.log -cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} -print_env -} - -install_binary() -{ -check_jb tar xfz ${SOURCE_DIR}/Numeric-22.0.tar.gz -C ${INSTALL_ROOT} - -print_env -} - -export PROCEDURE=$1; -export INSTALL_WORK=$2; -export SOURCE_DIR=$3; -export INSTALL_ROOT=$4; -export PRODUCT_SEQUENCE=$5; -if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="numeric" ; fi -export PRODUCT="Numeric-22.0" -export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} -export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -source ./common.sh -$PROCEDURE diff --git a/config_files/Numeric-23.7.sh b/config_files/Numeric-23.7.sh index 57fd1d7..0f8387b 100755 --- a/config_files/Numeric-23.7.sh +++ b/config_files/Numeric-23.7.sh @@ -20,18 +20,25 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" # looks for the native product and collects it's environment (used by make_env()) try_native(){ -check_version -if [ $? -eq 0 ] ; then - pythonpath="`find_in_path Numeric.py ${PYTHONPATH}`" - tmp="${pythonpath} ${pythonpath} \${PYTHONPATH} ${PYTHONPATH}"; - pythonpath=`sort_path ${tmp}` - cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh </dev/null` +if [ -n "${numpath}" ] ; then + numpath=`dirname ${numpath}` + ver=`python -c 'import Numeric; print Numeric.__version__' 2>/dev/null | awk -F. '{v=0;for(i=1;i<=NF;i++)v=v*100+$i;print v}'` + if [ $ver -ge 2307 ] ; then + tmp="${numpath} ${numpath} \${PYTHONPATH} ${PYTHONPATH}"; + pythonpath=`sort_path ${tmp}` + cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh </dev/null` if [ -n "$isPython" ]; then # version number is calculated as: *10000+*100+ - # e.g. for Python 2.3.4 it is equal to 20304 + # e.g. for Python 2.3.5 it is equal to 20305 ver=`python -V 2>&1` ver=`echo $ver | awk '{print $2}' | awk -F. '{v1=0;v2=0;v3=0;if(NF>0)v1=$1;if(NF>1)v2=$2;if(NF>2)v3=$3;print v1*10000+v2*100+v3}'` - if [ $ver -eq 20304 ] ; then + if [ $ver -eq 20305 ] ; then return 0 fi fi @@ -44,13 +44,13 @@ if [ -n "${pythonhome}" ] ; then # get version number: , and # and numbers are checked strickly, but number can be larger than required one # version number is calculated as: *10000+*100+ - # e.g. for Python 2.3.4 it is equal to 20304 + # e.g. for Python 2.3.5 it is equal to 20305 ver=`python -V 2>&1` maj_ver=`echo $ver | awk '{print $2}' | awk -F. '{if(NF>0) print $1; else print 0}'` min_ver=`echo $ver | awk '{print $2}' | awk -F. '{if(NF>1) print $2; else print 0}'` rel_ver=`echo $ver | awk '{print $2}' | awk -F. '{if(NF>2) print $3; else print 0}'` let ver=$maj_ver*10000+$min_ver*100+$rel_ver - if [ $ver -ge 20304 ] ; then + if [ $ver -ge 20305 ] ; then tmp="\${PYTHONHOME}/bin ${pythonhome}/bin \${PATH} ${PATH}"; path=`sort_path ${tmp}` tmp="\${PYTHONHOME}/lib/python\${PYTHON_VERSION} ${pythonhome}/lib/python${maj_ver}.${min_ver} \${PYTHONPATH} ${PYTHONPATH}"; @@ -68,7 +68,7 @@ EOF ####### THIS COULD BE USED FOR STRICT COMPARISON ############################## # if [ $maj_ver -eq 2 ] && [ $min_ver -eq 3 ] && [ $rel_ver -eq 4 ] ; then ###################################################################################### - if [ $maj_ver -eq 2 ] && [ $min_ver -eq 3 ] && [ $rel_ver -ge 4 ] ; then + if [ $maj_ver -eq 2 ] && [ $min_ver -eq 3 ] && [ $rel_ver -ge 5 ] ; then return 0 else return 2 @@ -90,7 +90,7 @@ source ${INSTALL_WORK}/$SHRC makedir ${PRODUCT_DIR} -check_jb tar xfz ${SOURCE_DIR}/Python-2.3.4.tar.gz -C ${INSTALL_WORK} +check_jb tar xfz ${SOURCE_DIR}/Python-2.3.5.tar.gz -C ${INSTALL_WORK} cd ${PRODUCT_WORK} check_job ${PRODUCT_DIR}/CONFIGURE.LOG \ @@ -119,7 +119,7 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/Python-2.3.4.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/Python-2.3.5.tar.gz -C ${INSTALL_ROOT} print_env } @@ -130,7 +130,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="python" ; fi -export PRODUCT="Python-2.3.4" +export PRODUCT="Python-2.3.5" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/SWIG-1.3.17.sh b/config_files/SWIG-1.3.17.sh deleted file mode 100755 index c436ef6..0000000 --- a/config_files/SWIG-1.3.17.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/sh - -check_version(){ -if [ -n "`which swig 2>/dev/null`" ]; then - ver=`swig -version 2>&1` - ver=`echo $ver | awk '{print $3}' | grep "1.3.17"` - if [ -n "$ver" ] ; then - return 0; - fi -fi -return 1; -} - -print_env() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <&1` - ver=`echo $ver | awk '{print $3}' | grep "1.3.17"` - if [ -n "$ver" ] ; then - tmp="\${SWIG_ROOT}/bin ${swig_root}/bin \${PATH} ${PATH}"; - path=`sort_path ${tmp}` - tmp="\${SWIG_ROOT}/lib ${swig_root}/lib \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}"; - ld_library_path=`sort_path ${tmp}` - cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <> ${PRODUCT_DIR}/MAKE.LOG < ${PRODUCT_DIR}/size.log -cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} -print_env -} - -install_binary() -{ -echo "It impossible to install SWIG from binaries, try install from sources." -return 1 -} - -export PROCEDURE=$1; -export INSTALL_WORK=$2; -export SOURCE_DIR=$3; -export INSTALL_ROOT=$4; -export PRODUCT_SEQUENCE=$5; -if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="swig" ; fi -export PRODUCT="SWIG-1.3.17" -export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} -export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -source ./common.sh -$PROCEDURE diff --git a/config_files/VTK-4.2.2.sh b/config_files/VTK-4.2.2.sh deleted file mode 100755 index 1c1404d..0000000 --- a/config_files/VTK-4.2.2.sh +++ /dev/null @@ -1,172 +0,0 @@ -#!/bin/sh - -check_version() -{ -if [ -z "$VTKHOME" ]; then - return 1 -fi -check_lib_version libvtkCommon.so ${VTKHOME}/lib/vtk -if [ "$?" -eq "0" ]; then - return 0 -fi -return 1 -} - -print_env() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <> ${PRODUCT_DIR}/MAKEcmake.LOG < ${PRODUCT_DIR}/CONFIGURE.LOG < ${PRODUCT_DIR}/MAKE.LOG < ${PRODUCT_DIR}/size.log -#du -sk ${INSTALL_WORK}/cmake-1.6.6 >> ${PRODUCT_DIR}/size.log -cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} ${INSTALL_WORK}/cmake-1.6.6 - -# set correct symbolic links - bug of python wrappings installation -cd ${PRODUCT_DIR}/lib/python${python_version}/site-packages/vtk_python -ln -sf ../../../vtk/*Python*.so . - -print_env -} - -install_binary() -{ -make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} -source ${INSTALL_WORK}/$SHRC - -check_jb tar xfz ${SOURCE_DIR}/VTK-4.2.2.tar.gz -C ${INSTALL_ROOT} - -print_env -} - -export PROCEDURE=$1; -export INSTALL_WORK=$2; -export SOURCE_DIR=$3; -export INSTALL_ROOT=$4; -export PRODUCT_SEQUENCE=$5; -if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="vtk" ; fi -export PRODUCT="VTK-4.2.2" -export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} -export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -source ./common.sh -$PROCEDURE diff --git a/config_files/VTK-4.2.6.sh b/config_files/VTK-4.2.6.sh index a268794..0f3ccf8 100755 --- a/config_files/VTK-4.2.6.sh +++ b/config_files/VTK-4.2.6.sh @@ -85,9 +85,14 @@ mv -f IO/vtkImageReader.cxx.orig IO/vtkImageReader.cxx # get Python and tcl/tk version python_version="`python -c 'import sys; print sys.version[:3]'`" tcl_version="" +tcl_includes="" +tcl_libs="" tcldir="`where_tcl`" if [ $? -eq 0 ] && [ -e ${tcldir}/tclConfig.sh ] ; then tcl_version=`grep -e "TCL_VERSION=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_VERSION=[\'|\"]\(.*\)[\'|\"]%\1%g"` + tcl_includes=`grep -e "TCL_INCLUDE_SPEC=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_INCLUDE_SPEC=[\'|\"]-I\(.*\)[\'|\"]%\1%g"` + if [ -z "$tcl_includes" ] ; then tcl_includes=/usr/include ; fi + tcl_libs=`grep -e "TCL_PACKAGE_PATH=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_PACKAGE_PATH=[\'|\"]\(.*\)[\'|\"]%\1%g"` fi VTK_CMAKE_OPTIONS="" @@ -109,16 +114,17 @@ VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_INCLUDE_PATH:STRING=${PYTHONHOME} VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHONHOME}/lib/python${python_version}/config/libpython${python_version}.a" fi ### Wrap Tcl settings -if [ "${tcl_version}" != "" ]; then +if [ "${tcl_version}" != "" ] && [ "${tcl_includes}" != "" ] && [ "${tcl_libs}" != "" ] ; then +# suppose that tcl and tk are installed in the same dir VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=ON" -VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_INCLUDE_PATH:STRING=${TCLHOME}/include" -VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_LIBRARY:STRING=${TCLHOME}/lib/libtcl${tcl_version}.so" -VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_STUB_LIBRARY:STRING=${TCLHOME}/lib/libtclstub${tcl_version}.a" -VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_TCLSH:STRING=${TCLHOME}/bin/tclsh" -VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_INCLUDE_PATH:STRING=${TCLHOME}/include" -VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_LIBRARY:STRING=${TCLHOME}/lib/libtk${tcl_version}.so" -VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_STUB_LIBRARY:STRING=${TCLHOME}/lib/libtkstub${tcl_version}.a" -VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_WISH:STRING=${TCLHOME}/bin/wish" +VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_INCLUDE_PATH:STRING=${tcl_includes}" +VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_LIBRARY:STRING=${tcl_libs}/libtcl${tcl_version}.so" +VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_STUB_LIBRARY:STRING=${tcl_libs}/libtclstub${tcl_version}.a" +VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_TCLSH:STRING=${TCLHOME}/bin/tclsh${tcl_version}" +VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_INCLUDE_PATH:STRING=${tcl_includes}" +VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_LIBRARY:STRING=${tcl_libs}/libtk${tcl_version}.so" +VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_STUB_LIBRARY:STRING=${tcl_libs}/libtkstub${tcl_version}.a" +VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_WISH:STRING=${TCLHOME}/bin/wish${tcl_version}" fi ### if Mesa is pre-installed if [ -n "$MESA_HOME" ]; then diff --git a/config_files/common.sh b/config_files/common.sh index f8c08ca..9a69683 100755 --- a/config_files/common.sh +++ b/config_files/common.sh @@ -358,7 +358,7 @@ find_in_path(){ file=$1; shift; path=$* for i in `echo ${path} | sed -e"s%:% %g"` ; do - ret=`find $i -name $file 2>/dev/null` + ret=`find $i -name $file -maxdepth 1 2>/dev/null` if [ -n "$ret" ] ; then ret=`echo $ret | sed -e"s%/\$file$%%g"` echo $ret diff --git a/config_files/doxygen-1.3-rc2.sh b/config_files/doxygen-1.3-rc2.sh deleted file mode 100755 index 6784f82..0000000 --- a/config_files/doxygen-1.3-rc2.sh +++ /dev/null @@ -1,163 +0,0 @@ -#!/bin/sh - -check_version() -{ -check_lib_version doxygen $PATH -if [ "$?" -ne "0" ]; then - return 1 -fi -check_lib_version doxysearch $PATH -if [ "$?" -ne "0" ]; then - return 1 -fi -check_lib_version doxytag $PATH -if [ "$?" -ne "0" ]; then - return 1 -fi -check_lib_version doxywizard $PATH -if [ "$?" -ne "0" ]; then - return 1 -fi -ver=`doxygen --version` -if [ "$ver" == "1.3-rc2" ]; then - return 0 -fi -return 1 -} - -print_env() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <> ${PRODUCT_DIR}/MAKE.LOG </dev/null 2>&1; ISFOUND=$? -if [ ${ISFOUND} -eq 0 ] ; then which makeindex >/dev/null 2>&1; ISFOUND=$?; fi -if [ ${ISFOUND} -eq 0 ] ; then which latex >/dev/null 2>&1; ISFOUND=$?; fi -if [ ${ISFOUND} -eq 0 ] ; then which latex2html >/dev/null 2>&1; ISFOUND=$?; fi -if [ ${ISFOUND} -eq 0 ] ; then which pdflatex >/dev/null 2>&1; ISFOUND=$?; fi -if [ ${ISFOUND} -eq 0 ] ; then which pslatex >/dev/null 2>&1; ISFOUND=$?; fi -if [ ${ISFOUND} -eq 0 ] ; then which pstoimg >/dev/null 2>&1; ISFOUND=$?; fi -if [ ${ISFOUND} -eq 0 ] ; then - check_job ${PRODUCT_DIR}/MAKEDOCS.LOG make docs - check_job ${PRODUCT_DIR}/MAKEINSTALLDOCS.LOG make install_docs -else - cat >> ${PRODUCT_DIR}/MAKEDOCS.LOG < ${PRODUCT_DIR}/size.log -cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} -print_env -} - -install_binary() -{ -make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} -source ${INSTALL_WORK}/$SHRC - -check_jb tar xfz ${SOURCE_DIR}/doxygen-1.3-rc2.tar.gz -C ${INSTALL_ROOT} -which epstopdf >/dev/null 2>&1; ISFOUND=$? -if [ ${ISFOUND} -eq 0 ] ; then which makeindex >/dev/null 2>&1; ISFOUND=$?; fi -if [ ${ISFOUND} -eq 0 ] ; then which latex >/dev/null 2>&1; ISFOUND=$?; fi -if [ ${ISFOUND} -eq 0 ] ; then which latex2html >/dev/null 2>&1; ISFOUND=$?; fi -if [ ${ISFOUND} -eq 0 ] ; then which pdflatex >/dev/null 2>&1; ISFOUND=$?; fi -if [ ${ISFOUND} -eq 0 ] ; then which pslatex >/dev/null 2>&1; ISFOUND=$?; fi -if [ ${ISFOUND} -eq 0 ] ; then which pstoimg >/dev/null 2>&1; ISFOUND=$?; fi -if [ ${ISFOUND} -ne 0 ] ; then - cat >> ${PRODUCT_DIR}/DOCS.LOG < ./tmake/lib/linux-g++/tmake.conf.new +sed -e "s/-lqt$/-lqt-mt/g" ./tmake/lib/linux-g++/tmake.conf > ./tmake/lib/linux-g++/tmake.conf.new mv ./tmake/lib/linux-g++/tmake.conf.new ./tmake/lib/linux-g++/tmake.conf # vsr: fix bug - configure fails on Red Hat 9 because of incorrect autodetect check for install tool # so it is necessary to put it directly f_install="--install "`which install` +# vsr: fix bug on debianex: problem on with unistd.h file +(cd src; mv unistd.h unistd.h.backup) +files=`egrep -R -e "^[[:space:]]*unistd" * | awk -F: '{print $1}'` +for f in $files ; do + sed -e '/^[[:space:]]*unistd/d' $f > $f"_" + mv $f"_" $f +done +# configuring check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --with-doxywizard --prefix ${PRODUCT_DIR} $f_install GCC=`which gcc` cat >> ${PRODUCT_DIR}/MAKE.LOG </dev/null 2>&1; ISFOUND=$? -if [ ${ISFOUND} -eq 0 ] ; then which makeindex >/dev/null 2>&1; ISFOUND=$?; fi -if [ ${ISFOUND} -eq 0 ] ; then which latex >/dev/null 2>&1; ISFOUND=$?; fi -#if [ ${ISFOUND} -eq 0 ] ; then which latex2html >/dev/null 2>&1; ISFOUND=$?; fi -if [ ${ISFOUND} -eq 0 ] ; then which pdflatex >/dev/null 2>&1; ISFOUND=$?; fi -if [ ${ISFOUND} -eq 0 ] ; then which pslatex >/dev/null 2>&1; ISFOUND=$?; fi -#if [ ${ISFOUND} -eq 0 ] ; then which pstoimg >/dev/null 2>&1; ISFOUND=$?; fi -if [ ${ISFOUND} -eq 0 ] ; then - check_job ${PRODUCT_DIR}/MAKEDOCS.LOG make docs - check_job ${PRODUCT_DIR}/MAKEINSTALLDOCS.LOG make install_docs -else - cat >> ${PRODUCT_DIR}/MAKEDOCS.LOG </dev/null 2>&1; ISFOUND=$? +#if [ ${ISFOUND} -eq 0 ] ; then which makeindex >/dev/null 2>&1; ISFOUND=$?; fi +#if [ ${ISFOUND} -eq 0 ] ; then which latex >/dev/null 2>&1; ISFOUND=$?; fi +##if [ ${ISFOUND} -eq 0 ] ; then which latex2html >/dev/null 2>&1; ISFOUND=$?; fi +#if [ ${ISFOUND} -eq 0 ] ; then which pdflatex >/dev/null 2>&1; ISFOUND=$?; fi +#if [ ${ISFOUND} -eq 0 ] ; then which pslatex >/dev/null 2>&1; ISFOUND=$?; fi +##if [ ${ISFOUND} -eq 0 ] ; then which pstoimg >/dev/null 2>&1; ISFOUND=$?; fi +#if [ ${ISFOUND} -eq 0 ] ; then # check_job ${PRODUCT_DIR}/MAKEDOCS.LOG make docs -# rm -fr ${PRODUCT_WORK} -# echo -e "Can't find \"epstopdf\" and \"latex\" or another executables on the computer." -# echo -e "doxygen documentation will not be built!" -# echo -e "SALOME DOCUMENTATION ALSO CAN NOT BE BUILT!" -# echo -n "Would you like continue : (Y,N) [Y] : " -# read rep; -# rep=`echo $rep | tr "[A-Z]" "[a-z]"` -# if test -z $rep || [ $rep != "y" ] ; then -# rm -fr ${PRODUCT_WORK} -# exit 1 -# fi -fi +# check_job ${PRODUCT_DIR}/MAKEINSTALLDOCS.LOG make install_docs +#else +# cat >> ${PRODUCT_DIR}/MAKEDOCS.LOG < ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} @@ -118,7 +127,7 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/doxygen-1.3.7.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/doxygen-1.4.2.tar.gz -C ${INSTALL_ROOT} print_env } @@ -129,7 +138,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="doxygen" ; fi -export PRODUCT="doxygen-1.3.7" +export PRODUCT="doxygen-1.4.2" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/gcc-3.2.sh b/config_files/gcc-3.2.sh deleted file mode 100755 index 958ba32..0000000 --- a/config_files/gcc-3.2.sh +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/sh - -check_version(){ -# version number is calculated as: *10000+*100+ -# e.g. for gcc 3.2 it is equal to 30200, for gcc 3.3.2 - 30202 -gcc_ver=`gcc -dumpversion | awk -F. '{v1=0;v2=0;v3=0;if(NF>0)v1=$1;if(NF>1)v2=$2;if(NF>2)v3=$3;print v1*10000+v2*100+v3}'` -if [ $gcc_ver -eq 30200 ] ; then - return 0 -fi -return 1 -} - -print_env(){ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <, and - # and numbers are checked strickly, but number can be larger than required one - # version number is calculated as: *10000+*100+ - # e.g. for gcc 3.2 it is equal to 30200, for gcc 3.3.2 - 30202 - maj_ver=`gcc -dumpversion | awk -F. '{if(NF>0) print $1; else print 0}'` - min_ver=`gcc -dumpversion | awk -F. '{if(NF>1) print $2; else print 0}'` - rel_ver=`gcc -dumpversion | awk -F. '{if(NF>2) print $3; else print 0}'` - let gcc_ver=$maj_ver*10000+$min_ver*100+$rel_ver - if [ $gcc_ver -ge 30200 ] ; then - tmp="\${GCC_ROOT}/bin ${gcc_root}/bin \${PATH} ${PATH}"; - path=`sort_path ${tmp}` - tmp="\${GCC_ROOT}/lib ${gcc_root}/lib \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}"; - ld_library_path=`sort_path ${tmp}` - cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <*10000+*100+ -# e.g. for gcc 3.2 it is equal to 30200, for gcc 3.4.1 - 30401 +# e.g. for gcc 3.2 it is equal to 30200, for gcc 3.4.1 - 30401, for gcc 3.3.5 - 30305 gcc_ver=`gcc -dumpversion | awk -F. '{v1=0;v2=0;v3=0;if(NF>0)v1=$1;if(NF>1)v2=$2;if(NF>2)v3=$3;print v1*10000+v2*100+v3}'` -if [ $gcc_ver -eq 30401 ] ; then +if [ $gcc_ver -eq 30305 ] ; then return 0 fi return 1 @@ -35,12 +35,12 @@ if [ -n "${gcc_root}" ] ; then # get version number: , and # and numbers are checked strickly, but number can be larger than required one # version number is calculated as: *10000+*100+ - # e.g. for gcc 3.2 it is equal to 30200, for gcc 3.4.1 - 30401 + # e.g. for gcc 3.2 it is equal to 30200, for gcc 3.4.1 - 30401, for gcc 3.3.5 - 30305 maj_ver=`gcc -dumpversion | awk -F. '{if(NF>0) print $1; else print 0}'` min_ver=`gcc -dumpversion | awk -F. '{if(NF>1) print $2; else print 0}'` rel_ver=`gcc -dumpversion | awk -F. '{if(NF>2) print $3; else print 0}'` let gcc_ver=$maj_ver*10000+$min_ver*100+$rel_ver - if [ $gcc_ver -ge 30401 ] ; then + if [ $gcc_ver -ge 30305 ] ; then tmp="\${GCC_ROOT}/bin ${gcc_root}/bin \${PATH} ${PATH}"; path=`sort_path ${tmp}` tmp="\${GCC_ROOT}/lib ${gcc_root}/lib \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}"; @@ -58,7 +58,7 @@ EOF ####### THIS COULD BE USED FOR STRICT COMPARISON ############################## # if [ $maj_ver -eq 3 ] && [ $min_ver -eq 4 ] && [ $rel_ver -eq 1 ] ; then ###################################################################################### - if [ $maj_ver -eq 3 ] && [ $min_ver -eq 4 ] && [ $rel_ver -ge 1 ] ; then + if [ $maj_ver -eq 3 ] && [ $min_ver -eq 3 ] && [ $rel_ver -ge 5 ] ; then return 0 else return 2 @@ -75,13 +75,13 @@ return $? install_source() { -echo "The installation of gcc 3.4.1 from sources is not provided! Use native gcc." +echo "The installation of gcc 3.3.5 from sources is not provided! Use native gcc." return 1 } install_binary() { -echo "The installation of gcc 3.4.1 from binaries is not provided! Use native gcc." +echo "The installation of gcc 3.3.5 from binaries is not provided! Use native gcc." return 1 } @@ -91,8 +91,8 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="gcc" ; fi -export PRODUCT="gcc-3.4.1" +export PRODUCT="gcc-3.3.5" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh -$PROCEDURE \ No newline at end of file +$PROCEDURE diff --git a/config_files/graphviz-1.9.sh b/config_files/graphviz-1.9.sh deleted file mode 100755 index a3dea55..0000000 --- a/config_files/graphviz-1.9.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh - -check_version() -{ -isdot=`which dot 2>/dev/null` -if [ -n "$isdot" ]; then - ver=`dot -V 2>&1 | awk '{print $3}'` - if [ "$ver" == "1.9" ]; then - return 0 - fi -fi -return 1 -} - -print_env() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <> ${PRODUCT_DIR}/MAKE.LOG < ${PRODUCT_DIR}/size.log -cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} -print_env -} - -install_binary() -{ -make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} -source ${INSTALL_WORK}/$SHRC - -check_jb tar xfz ${SOURCE_DIR}/graphviz-1.9.tar.gz -C ${INSTALL_ROOT} -cd ${PRODUCT_DIR}/lib/graphviz -for l in `ls *.la`; do - libdir=`grep -e "libdir=.*" $l | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"` - sed -e "s%${libdir}%${PRODUCT_DIR}/lib/graphviz%g" $l > _$l - libdir=`dirname $libdir` - sed -e "s%${libdir}%${PRODUCT_DIR}/lib/graphviz%g" _$l > $l - rm -f _$l - chmod a+x $l -done - -print_env -} - -export PROCEDURE=$1; -export INSTALL_WORK=$2; -export SOURCE_DIR=$3; -export INSTALL_ROOT=$4; -export PRODUCT_SEQUENCE=$5; -if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="graphviz" ; fi -export PRODUCT="graphviz-1.9" -export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} -export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -source ./common.sh -$PROCEDURE diff --git a/config_files/hdf5-1.4.4.sh b/config_files/hdf5-1.4.4.sh deleted file mode 100755 index b5abd9b..0000000 --- a/config_files/hdf5-1.4.4.sh +++ /dev/null @@ -1,161 +0,0 @@ -#!/bin/sh - -check_version() -{ -if [ -z "$HDF5HOME" ]; then - return 1 -fi -check_lib_version libhdf5.so.0.0.0 ${HDF5HOME}/lib -if [ "$?" -ne "0" ]; then - return 1 -fi -check_lib_version libhdf5.settings ${HDF5HOME}/lib -if [ "$?" -eq "0" ]; then - ver=`grep "HDF5 Version:" ${HDF5HOME}/lib/libhdf5.settings | awk '{print $3}'` - if [ "$ver" = "1.4.4" ]; then - return 0 - fi -fi -return 1 -} - -print_env() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <> ${PRODUCT_DIR}/MAKE0.LOG < ./src/.dependnew -mv ./src/.dependnew ./src/.depend -cat >> ${PRODUCT_DIR}/MAKE1.LOG < ./test/.dependnew -mv ./test/.dependnew ./test/.depend -cat >> ${PRODUCT_DIR}/MAKE2.LOG < ./tools/lib/.dependnew -mv ./tools/lib/.dependnew ./tools/lib/.depend -cat >> ${PRODUCT_DIR}/MAKE3.LOG < ./tools/h5dump/.dependnew -mv ./tools/h5dump/.dependnew ./tools/h5dump/.depend -cat >> ${PRODUCT_DIR}/MAKE4.LOG < ./tools/h5ls/.dependnew -mv ./tools/h5ls/.dependnew ./tools/h5ls/.depend -cat >> ${PRODUCT_DIR}/MAKE5.LOG < ./tools/misc/.dependnew -mv ./tools/misc/.dependnew ./tools/misc/.depend -cat >> ${PRODUCT_DIR}/MAKE6.LOG < ./examples/.dependnew -#mv ./examples/.dependnew ./examples/.depend -#cat >> ${PRODUCT_DIR}/MAKE7.LOG < ${PRODUCT_DIR}/size.log -cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} -print_env -} - -install_binary() -{ -make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} -source ${INSTALL_WORK}/$SHRC - -check_jb tar xfz ${SOURCE_DIR}/hdf5-1.4.4.tar.gz -C ${INSTALL_ROOT} - -### modify libhdf5.la file to correct direct path to hdf5 library -### no need to do this for sources installation because 'make install' does it! -cd ${PRODUCT_DIR}/lib -sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libhdf5.la > libhdf5.la.new -mv -f libhdf5.la.new libhdf5.la - -print_env -} - -export PROCEDURE=$1; -export INSTALL_WORK=$2; -export SOURCE_DIR=$3; -export INSTALL_ROOT=$4; -export PRODUCT_SEQUENCE=$5; -if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="hdf" ; fi -export PRODUCT="hdf5-1.4.4" -export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} -export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -source ./common.sh -$PROCEDURE diff --git a/config_files/msg2qm.sh b/config_files/msg2qm.sh index 42c4f2f..26b8f69 100755 --- a/config_files/msg2qm.sh +++ b/config_files/msg2qm.sh @@ -25,8 +25,7 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" try_native(){ msg2qmroot="`find_in_path msg2qm ${PATH}`" if [ -n "${msg2qmroot}" ] ; then - msg2qmroot=`cd ${msg2qmroot}/..; pwd` - tmp="\${msg2qmroot} ${MSG2QM_ROOT} \${PATH} ${PATH}"; + tmp="\${MSG2QM_ROOT} ${msg2qmroot} \${PATH} ${PATH}"; path=`sort_path ${tmp}` cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < libqt-mt.la.new @@ -136,7 +139,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="qt" ; fi -export PRODUCT="qt-3.3.3" +export PRODUCT="qt-3.3.4" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/qwt-0.4.1.sh b/config_files/qwt-0.4.1.sh deleted file mode 100755 index 1656160..0000000 --- a/config_files/qwt-0.4.1.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh - -check_version() -{ -if [ -z "$QWTHOME" ]; then - #echo "QWTHOME doesn't set" - return 1 -fi -check_lib_version libqwt.so.0.4.1 ${QWTHOME}/lib -if [ "$?" -eq "0" ]; then - #echo "The product ${PRODUCT} has been already installed on yours system" - return 0 -fi -return 1 -} - -print_env() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <> ${PRODUCT_DIR}/MAKE.LOG < ${PRODUCT_DIR}/size.log -cd ${PRODUCT_DIR}; rm -rf ${PRODUCT_WORK} - -print_env -} - -install_binary() -{ -make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} -source ${INSTALL_WORK}/$SHRC - -check_jb tar xfz ${SOURCE_DIR}/qwt-0.4.1.tar.gz -C ${INSTALL_ROOT} - -print_env -} - -export PROCEDURE=$1; -export INSTALL_WORK=$2; -export SOURCE_DIR=$3; -export INSTALL_ROOT=$4; -export PRODUCT_SEQUENCE=$5; -if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="qwt" ; fi -export PRODUCT="qwt-0.4.1" -export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} -export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -source ./common.sh -$PROCEDURE diff --git a/config_files/sip-4.1.sh b/config_files/sip-4.1.sh index ccafacf..05aa4da 100755 --- a/config_files/sip-4.1.sh +++ b/config_files/sip-4.1.sh @@ -40,7 +40,7 @@ if [ -n "${sipdir}" ] ; then if [ -n "${sippython}" ]; then tmp="${sipdir} ${sipdir} \${PATH} ${PATH}"; path=`sort_path ${tmp}` - tmp="${sipdir} ${sipdir} \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}"; + tmp="${sippython} ${sippython} \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}"; ld_library_path=`sort_path ${tmp}` tmp="${sippython} ${sippython} \${PYTHONPATH} ${PYTHONPATH}"; pythonpath=`sort_path ${tmp}` diff --git a/config_files/tcltk-8.3.3.sh b/config_files/tcltk-8.3.3.sh deleted file mode 100755 index 74c7ffa..0000000 --- a/config_files/tcltk-8.3.3.sh +++ /dev/null @@ -1,218 +0,0 @@ -#!/bin/sh - -check_version() -{ -VERSION="8.3" -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() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.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 -#du -sk ${INSTALL_WORK}/tk8.3.3 >> ${PRODUCT_DIR}/size.log -#du -sk ${INSTALL_WORK}/tclx8.3 >> ${PRODUCT_DIR}/size.log -cd ${PRODUCT_DIR} -rm -fr ${INSTALL_WORK}/tcl8.3.3 ${INSTALL_WORK}/tk8.3.3 ${INSTALL_WORK}/tclx8.3 -print_env -} - -install_binary() -{ -make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} -source ${INSTALL_WORK}/$SHRC - -check_jb tar xfz ${SOURCE_DIR}/tcltk-8.3.3.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 - -print_env -} - -export PROCEDURE=$1; -export INSTALL_WORK=$2; -export SOURCE_DIR=$3; -export INSTALL_ROOT=$4; -export PRODUCT_SEQUENCE=$5; -if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="tcl" ; fi -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.5.sh b/config_files/tcltk-8.4.5.sh index 934b879..14d0cef 100755 --- a/config_files/tcltk-8.4.5.sh +++ b/config_files/tcltk-8.4.5.sh @@ -1,8 +1,9 @@ #!/bin/sh +VERSION="8.4" + check_version() { -VERSION="8.4" if [ -z "$TCLHOME" ]; then echo "TCLHOME doesn't set" return 1 @@ -46,7 +47,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <