From 1a68c73e1396a53237d6ee1bd63b674ae9ca8249 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 16 Dec 2005 09:00:08 +0000 Subject: [PATCH] Prepare version 3.1.0 --- config.xml | 64 ++++++++++++++--------------- config_Mandrake_10.1.xml | 64 ++++++++++++++--------------- config_RedHat_8.0.xml | 70 ++++++++++++++++---------------- config_RedHat_9.xml | 70 ++++++++++++++++---------------- config_Scientific_3.0.5.xml | 70 ++++++++++++++++---------------- config_files/BOOST-1.30.2.sh | 2 +- config_files/BOOST-1.31.0.sh | 2 +- config_files/CALCULATOR_BIN.sh | 6 +-- config_files/CALCULATOR_SRC.sh | 6 +-- config_files/CAS-6.0.sh | 2 +- config_files/COMPONENT_BIN.sh | 6 +-- config_files/COMPONENT_SRC.sh | 6 +-- config_files/GEOM_BIN.sh | 6 +-- config_files/GEOM_SRC.sh | 6 +-- config_files/GHS3DPLUGIN_BIN.sh | 6 +-- config_files/GHS3DPLUGIN_SRC.sh | 6 +-- config_files/GUI_BIN.sh | 6 +-- config_files/GUI_SRC.sh | 6 +-- config_files/HELLO_BIN.sh | 6 +-- config_files/HELLO_SRC.sh | 6 +-- config_files/HappyDoc-r2_1.sh | 2 +- config_files/KERNEL_BIN.sh | 6 +-- config_files/KERNEL_SRC.sh | 6 +-- config_files/LIGHT_BIN.sh | 6 +-- config_files/LIGHT_SRC.sh | 6 +-- config_files/MED_BIN.sh | 6 +-- config_files/MED_SRC.sh | 6 +-- config_files/NETGENPLUGIN_BIN.sh | 6 +-- config_files/NETGENPLUGIN_SRC.sh | 6 +-- config_files/Numeric-22.0.sh | 2 +- config_files/Numeric-23.7.sh | 2 +- config_files/PYCALCULATOR_BIN.sh | 6 +-- config_files/PYCALCULATOR_SRC.sh | 6 +-- config_files/PYHELLO_BIN.sh | 6 +-- config_files/PYHELLO_SRC.sh | 6 +-- config_files/PyQt-3.13.sh | 2 +- config_files/Python-2.3.4.sh | 4 +- config_files/SAMPLES.sh | 4 +- config_files/SMESH_BIN.sh | 6 +-- config_files/SMESH_SRC.sh | 6 +-- config_files/SUPERV_BIN.sh | 6 +-- config_files/SUPERV_SRC.sh | 6 +-- config_files/SWIG-1.3.17.sh | 4 +- config_files/SWIG-1.3.24.sh | 4 +- config_files/VISU_BIN.sh | 6 +-- config_files/VISU_SRC.sh | 6 +-- config_files/VTK-4.2.2.sh | 2 +- config_files/VTK-4.2.6.sh | 2 +- config_files/doxygen-1.3-rc2.sh | 2 +- config_files/doxygen-1.3.7.sh | 2 +- config_files/gcc-3.2.sh | 4 +- config_files/graphviz-1.9.sh | 2 +- config_files/graphviz-2.2.1.sh | 2 +- config_files/hdf5-1.4.4.sh | 2 +- config_files/hdf5-1.6.3.sh | 2 +- config_files/med-2.2.2.sh | 2 +- config_files/msg2qm.sh | 2 +- config_files/netgen-4.3.sh | 2 +- config_files/omniORB-4.0.5.sh | 1 + config_files/qt-3.3.3.sh | 2 +- config_files/qwt-0.4.1.sh | 2 +- config_files/qwt-4.2.0.sh | 2 +- config_files/sip-4.1.sh | 2 +- config_files/tcltk-8.3.3.sh | 1 + config_files/tcltk-8.4.5.sh | 7 ++-- 65 files changed, 297 insertions(+), 294 deletions(-) diff --git a/config.xml b/config.xml index 2b7f353..7b2ee3a 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - - - + script="hdf5-1.6.3.sh"/> - + script="hdf5-1.6.3.sh"/> - + script="hdf5-1.6.3.sh"/> ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } diff --git a/config_files/COMPONENT_BIN.sh b/config_files/COMPONENT_BIN.sh index 2670259..798ecad 100755 --- a/config_files/COMPONENT_BIN.sh +++ b/config_files/COMPONENT_BIN.sh @@ -5,7 +5,7 @@ if [ -n "${COMPONENT_ROOT_DIR}" ]; then check_lib_version VERSION ${COMPONENT_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${COMPONENT_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -67,7 +67,7 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/COMPONENTbinariesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/COMPONENTbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT} # modify all *.la files modif_la_files ${PRODUCT_DIR}/lib/salome @@ -81,7 +81,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="ComponentBin" ; fi -export PRODUCT="COMPONENT_3.1.0b1" +export PRODUCT="COMPONENT_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/COMPONENT_SRC.sh b/config_files/COMPONENT_SRC.sh index da0d27b..e45ce68 100755 --- a/config_files/COMPONENT_SRC.sh +++ b/config_files/COMPONENT_SRC.sh @@ -5,7 +5,7 @@ if [ -n "${COMPONENT_SRC_DIR}" ]; then check_lib_version VERSION ${COMPONENT_SRC_DIR}/bin if [ "$?" -eq "0" ]; then ver=`cat ${COMPONENT_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -48,7 +48,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/COMPONENTsourcesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/COMPONENTsourcesV3.1.0.tar.gz -C ${INSTALL_ROOT} print_env } @@ -64,7 +64,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="ComponentSrc" ; fi -export PRODUCT="COMPONENT_SRC_3.1.0b1" +export PRODUCT="COMPONENT_SRC_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/GEOM_BIN.sh b/config_files/GEOM_BIN.sh index d19f62a..4af986f 100755 --- a/config_files/GEOM_BIN.sh +++ b/config_files/GEOM_BIN.sh @@ -5,7 +5,7 @@ if [ -n "${GEOM_ROOT_DIR}" ]; then check_lib_version VERSION ${GEOM_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${GEOM_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -67,7 +67,7 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/GEOMbinariesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/GEOMbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT} # modify all *.la files modif_la_files ${PRODUCT_DIR}/lib/salome @@ -81,7 +81,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="GeomBin" ; fi -export PRODUCT="GEOM_3.1.0b1" +export PRODUCT="GEOM_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/GEOM_SRC.sh b/config_files/GEOM_SRC.sh index af7468d..683c58e 100755 --- a/config_files/GEOM_SRC.sh +++ b/config_files/GEOM_SRC.sh @@ -5,7 +5,7 @@ if [ -n "${GEOM_SRC_DIR}" ]; then check_lib_version VERSION ${GEOM_SRC_DIR}/bin if [ "$?" -eq "0" ]; then ver=`cat ${GEOM_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -48,7 +48,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/GEOMsourcesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/GEOMsourcesV3.1.0.tar.gz -C ${INSTALL_ROOT} print_env } @@ -64,7 +64,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="GeomSrc" ; fi -export PRODUCT="GEOM_SRC_3.1.0b1" +export PRODUCT="GEOM_SRC_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/GHS3DPLUGIN_BIN.sh b/config_files/GHS3DPLUGIN_BIN.sh index 33b3db8..055ceb0 100755 --- a/config_files/GHS3DPLUGIN_BIN.sh +++ b/config_files/GHS3DPLUGIN_BIN.sh @@ -5,7 +5,7 @@ if [ -n "${GHS3DPLUGIN_ROOT_DIR}" ]; then check_lib_version VERSION ${GHS3DPLUGIN_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${GHS3DPLUGIN_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -66,7 +66,7 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINbinariesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT} # modify all *.la files modif_la_files ${PRODUCT_DIR}/lib/salome @@ -80,7 +80,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="GHS3DPLUGINBin" ; fi -export PRODUCT="GHS3DPLUGIN_3.1.0b1" +export PRODUCT="GHS3DPLUGIN_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/GHS3DPLUGIN_SRC.sh b/config_files/GHS3DPLUGIN_SRC.sh index 168e61c..e5acb51 100755 --- a/config_files/GHS3DPLUGIN_SRC.sh +++ b/config_files/GHS3DPLUGIN_SRC.sh @@ -5,7 +5,7 @@ if [ -n "${GHS3DPLUGIN_SRC_DIR}" ]; then check_lib_version VERSION ${GHS3DPLUGIN_SRC_DIR}/bin if [ "$?" -eq "0" ]; then ver=`cat ${GHS3DPLUGIN_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -49,7 +49,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINsourcesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINsourcesV3.1.0.tar.gz -C ${INSTALL_ROOT} print_env } @@ -65,7 +65,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="GHS3DPLUGINSrc" ; fi -export PRODUCT="GHS3DPLUGIN_SRC_3.1.0b1" +export PRODUCT="GHS3DPLUGIN_SRC_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/GUI_BIN.sh b/config_files/GUI_BIN.sh index bfc0a11..608feb9 100755 --- a/config_files/GUI_BIN.sh +++ b/config_files/GUI_BIN.sh @@ -5,7 +5,7 @@ if [ -n "${GUI_ROOT_DIR}" ]; then check_lib_version VERSION ${GUI_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${GUI_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -71,7 +71,7 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/GUIbinariesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/GUIbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT} # modify all *.la files modif_la_files ${PRODUCT_DIR}/lib/salome @@ -85,7 +85,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="GUIBin" ; fi -export PRODUCT="GUI_3.1.0b1" +export PRODUCT="GUI_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/GUI_SRC.sh b/config_files/GUI_SRC.sh index a14f226..8550a87 100755 --- a/config_files/GUI_SRC.sh +++ b/config_files/GUI_SRC.sh @@ -5,7 +5,7 @@ if [ -n "${GUI_SRC_DIR}" ]; then check_lib_version VERSION ${GUI_SRC_DIR}/bin if [ "$?" -eq "0" ]; then ver=`cat ${GUI_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -48,7 +48,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/GUIsourcesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/GUIsourcesV3.1.0.tar.gz -C ${INSTALL_ROOT} print_env } @@ -64,7 +64,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="GUISrc" ; fi -export PRODUCT="GUI_SRC_3.1.0b1" +export PRODUCT="GUI_SRC_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/HELLO_BIN.sh b/config_files/HELLO_BIN.sh index e3f4375..e51adb1 100755 --- a/config_files/HELLO_BIN.sh +++ b/config_files/HELLO_BIN.sh @@ -4,7 +4,7 @@ check_version(){ if [ -n "${HELLO_ROOT_DIR}" ]; then if [ -f ${HELLO_ROOT_DIR}/bin/salome/VERSION ]; then ver=`cat ${HELLO_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -66,7 +66,7 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/HELLObinariesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/HELLObinariesV3.1.0.tar.gz -C ${INSTALL_ROOT} # modify all *.la files modif_la_files ${PRODUCT_DIR}/lib/salome @@ -80,7 +80,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="HelloBin" ; fi -export PRODUCT="HELLO_3.1.0b1" +export PRODUCT="HELLO_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/HELLO_SRC.sh b/config_files/HELLO_SRC.sh index 68947d5..0d3bf5f 100755 --- a/config_files/HELLO_SRC.sh +++ b/config_files/HELLO_SRC.sh @@ -4,7 +4,7 @@ check_version(){ if [ -n "${HELLO_SRC_DIR}" ]; then if [ -f ${HELLO_SRC_DIR}/bin/VERSION ]; then ver=`cat ${HELLO_SRC_DIR}/bin/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -47,7 +47,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/HELLOsourcesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/HELLOsourcesV3.1.0.tar.gz -C ${INSTALL_ROOT} print_env } @@ -63,7 +63,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="HelloSrc" ; fi -export PRODUCT="HELLO_SRC_3.1.0b1" +export PRODUCT="HELLO_SRC_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/HappyDoc-r2_1.sh b/config_files/HappyDoc-r2_1.sh index f1181f9..ba6d1a0 100755 --- a/config_files/HappyDoc-r2_1.sh +++ b/config_files/HappyDoc-r2_1.sh @@ -85,7 +85,7 @@ check_job ${PRODUCT_DIR}/INSTALL.LOG python setup.py install --prefix=${PRODUCT_ #fi #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } diff --git a/config_files/KERNEL_BIN.sh b/config_files/KERNEL_BIN.sh index 0ed51e7..48102c7 100755 --- a/config_files/KERNEL_BIN.sh +++ b/config_files/KERNEL_BIN.sh @@ -5,7 +5,7 @@ if [ -n "${KERNEL_ROOT_DIR}" ]; then check_lib_version VERSION ${KERNEL_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${KERNEL_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -67,7 +67,7 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/KERNELbinariesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/KERNELbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT} # The next two symbolic links are created only for Red Hat 9 and Scientific Linux 3.0.5 if [ -f /lib/libcrypto.so.0.9.7a ]; then @@ -94,7 +94,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="KernelBin" ; fi -export PRODUCT="KERNEL_3.1.0b1" +export PRODUCT="KERNEL_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/KERNEL_SRC.sh b/config_files/KERNEL_SRC.sh index e7192c3..c3585c4 100755 --- a/config_files/KERNEL_SRC.sh +++ b/config_files/KERNEL_SRC.sh @@ -5,7 +5,7 @@ if [ -n "${KERNEL_SRC_DIR}" ]; then check_lib_version VERSION ${KERNEL_SRC_DIR}/bin if [ "$?" -eq "0" ]; then ver=`cat ${KERNEL_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -48,7 +48,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/KERNELsourcesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/KERNELsourcesV3.1.0.tar.gz -C ${INSTALL_ROOT} print_env } @@ -69,7 +69,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="KernelSrc" ; fi -export PRODUCT="KERNEL_SRC_3.1.0b1" +export PRODUCT="KERNEL_SRC_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/LIGHT_BIN.sh b/config_files/LIGHT_BIN.sh index 68d00d2..0414554 100755 --- a/config_files/LIGHT_BIN.sh +++ b/config_files/LIGHT_BIN.sh @@ -4,7 +4,7 @@ check_version(){ if [ -n "${LIGHT_ROOT_DIR}" ]; then if [ -f ${LIGHT_ROOT_DIR}/bin/salome/VERSION ]; then ver=`cat ${LIGHT_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -62,7 +62,7 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/LIGHTbinariesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/LIGHTbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT} # modify all *.la files modif_la_files ${PRODUCT_DIR}/lib/salome @@ -76,7 +76,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="LIGHTBin" ; fi -export PRODUCT="LIGHT_3.1.0b1" +export PRODUCT="LIGHT_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/LIGHT_SRC.sh b/config_files/LIGHT_SRC.sh index cf0fa7b..3e9603d 100755 --- a/config_files/LIGHT_SRC.sh +++ b/config_files/LIGHT_SRC.sh @@ -4,7 +4,7 @@ check_version(){ if [ -n "${LIGHT_SRC_DIR}" ]; then if [ -f ${LIGHT_SRC_DIR}/bin/VERSION ]; then ver=`cat ${LIGHT_SRC_DIR}/bin/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -47,7 +47,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/LIGHTsourcesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/LIGHTsourcesV3.1.0.tar.gz -C ${INSTALL_ROOT} print_env } @@ -63,7 +63,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="LIGHTSrc" ; fi -export PRODUCT="LIGHT_SRC_3.1.0b1" +export PRODUCT="LIGHT_SRC_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/MED_BIN.sh b/config_files/MED_BIN.sh index 4a0eca9..7e894ce 100755 --- a/config_files/MED_BIN.sh +++ b/config_files/MED_BIN.sh @@ -5,7 +5,7 @@ if [ -n "${MED_ROOT_DIR}" ]; then check_lib_version VERSION ${MED_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${MED_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -67,7 +67,7 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/MEDbinariesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/MEDbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT} # modify all *.la files modif_la_files ${PRODUCT_DIR}/lib/salome @@ -81,7 +81,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="MedBin" ; fi -export PRODUCT="MED_3.1.0b1" +export PRODUCT="MED_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/MED_SRC.sh b/config_files/MED_SRC.sh index a494bb3..fa87234 100755 --- a/config_files/MED_SRC.sh +++ b/config_files/MED_SRC.sh @@ -5,7 +5,7 @@ if [ -n "${MED_SRC_DIR}" ]; then check_lib_version VERSION ${MED_SRC_DIR}/bin if [ "$?" -eq "0" ]; then ver=`cat ${MED_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -48,7 +48,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/MEDsourcesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/MEDsourcesV3.1.0.tar.gz -C ${INSTALL_ROOT} print_env } @@ -64,7 +64,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="MedSrc" ; fi -export PRODUCT="MED_SRC_3.1.0b1" +export PRODUCT="MED_SRC_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/NETGENPLUGIN_BIN.sh b/config_files/NETGENPLUGIN_BIN.sh index e9dbadb..bbfe4f0 100755 --- a/config_files/NETGENPLUGIN_BIN.sh +++ b/config_files/NETGENPLUGIN_BIN.sh @@ -5,7 +5,7 @@ if [ -n "${NETGENPLUGIN_ROOT_DIR}" ]; then check_lib_version VERSION ${NETGENPLUGIN_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${NETGENPLUGIN_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -66,7 +66,7 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINbinariesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT} # modify all *.la files modif_la_files ${PRODUCT_DIR}/lib/salome @@ -80,7 +80,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="NETGENPLUGINBin" ; fi -export PRODUCT="NETGENPLUGIN_3.1.0b1" +export PRODUCT="NETGENPLUGIN_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/NETGENPLUGIN_SRC.sh b/config_files/NETGENPLUGIN_SRC.sh index 1da5b4c..23b4de7 100755 --- a/config_files/NETGENPLUGIN_SRC.sh +++ b/config_files/NETGENPLUGIN_SRC.sh @@ -5,7 +5,7 @@ if [ -n "${NETGENPLUGIN_SRC_DIR}" ]; then check_lib_version VERSION ${NETGENPLUGIN_SRC_DIR}/bin if [ "$?" -eq "0" ]; then ver=`cat ${NETGENPLUGIN_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -49,7 +49,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINsourcesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINsourcesV3.1.0.tar.gz -C ${INSTALL_ROOT} print_env } @@ -65,7 +65,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="NETGENPLUGINSrc" ; fi -export PRODUCT="NETGENPLUGIN_SRC_3.1.0b1" +export PRODUCT="NETGENPLUGIN_SRC_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/Numeric-22.0.sh b/config_files/Numeric-22.0.sh index 63a36ff..a1584c4 100755 --- a/config_files/Numeric-22.0.sh +++ b/config_files/Numeric-22.0.sh @@ -54,7 +54,7 @@ cd ${PRODUCT_WORK} check_job ${PRODUCT_DIR}/INSTALL.LOG python setup.py install --prefix=${PRODUCT_DIR} #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } diff --git a/config_files/Numeric-23.7.sh b/config_files/Numeric-23.7.sh index d632fa2..57fd1d7 100755 --- a/config_files/Numeric-23.7.sh +++ b/config_files/Numeric-23.7.sh @@ -85,7 +85,7 @@ fi check_job ${PRODUCT_DIR}/INSTALL.LOG python setup.py install --prefix=${PRODUCT_DIR} #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } diff --git a/config_files/PYCALCULATOR_BIN.sh b/config_files/PYCALCULATOR_BIN.sh index 5a39090..d3e0c2a 100755 --- a/config_files/PYCALCULATOR_BIN.sh +++ b/config_files/PYCALCULATOR_BIN.sh @@ -5,7 +5,7 @@ if [ -n "${PYCALCULATOR_ROOT_DIR}" ]; then check_lib_version VERSION ${PYCALCULATOR_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${PYCALCULATOR_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -65,7 +65,7 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/PYCALCULATORbinariesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/PYCALCULATORbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT} # modify all *.la files modif_la_files ${PRODUCT_DIR}/lib/salome @@ -79,7 +79,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="PyCalculatorBin" ; fi -export PRODUCT="PYCALCULATOR_3.1.0b1" +export PRODUCT="PYCALCULATOR_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/PYCALCULATOR_SRC.sh b/config_files/PYCALCULATOR_SRC.sh index 8c0083c..30dfb49 100755 --- a/config_files/PYCALCULATOR_SRC.sh +++ b/config_files/PYCALCULATOR_SRC.sh @@ -5,7 +5,7 @@ if [ -n "${PYCALCULATOR_SRC_DIR}" ]; then check_lib_version VERSION ${PYCALCULATOR_SRC_DIR}/bin if [ "$?" -eq "0" ]; then ver=`cat ${PYCALCULATOR_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -48,7 +48,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/PYCALCULATORsourcesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/PYCALCULATORsourcesV3.1.0.tar.gz -C ${INSTALL_ROOT} print_env } @@ -64,7 +64,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="PyCalculatorSrc" ; fi -export PRODUCT="PYCALCULATOR_SRC_3.1.0b1" +export PRODUCT="PYCALCULATOR_SRC_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/PYHELLO_BIN.sh b/config_files/PYHELLO_BIN.sh index 3e05ac1..6b14fdb 100755 --- a/config_files/PYHELLO_BIN.sh +++ b/config_files/PYHELLO_BIN.sh @@ -4,7 +4,7 @@ check_version(){ if [ -n "${PYHELLO_ROOT_DIR}" ]; then if [ -f ${PYHELLO_ROOT_DIR}/bin/salome/VERSION ]; then ver=`cat ${PYHELLO_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -64,7 +64,7 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/PYHELLObinariesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/PYHELLObinariesV3.1.0.tar.gz -C ${INSTALL_ROOT} # modify all *.la files modif_la_files ${PRODUCT_DIR}/lib/salome @@ -78,7 +78,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="PyHelloBin" ; fi -export PRODUCT="PYHELLO_3.1.0b1" +export PRODUCT="PYHELLO_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/PYHELLO_SRC.sh b/config_files/PYHELLO_SRC.sh index 764f755..ada9ab1 100755 --- a/config_files/PYHELLO_SRC.sh +++ b/config_files/PYHELLO_SRC.sh @@ -4,7 +4,7 @@ check_version(){ if [ -n "${PYHELLO_SRC_DIR}" ]; then if [ -f ${PYHELLO_SRC_DIR}/bin/VERSION ]; then ver=`cat ${PYHELLO_SRC_DIR}/bin/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -47,7 +47,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/PYHELLOsourcesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/PYHELLOsourcesV3.1.0.tar.gz -C ${INSTALL_ROOT} print_env } @@ -63,7 +63,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="PyHelloSrc" ; fi -export PRODUCT="PYHELLO_SRC_3.1.0b1" +export PRODUCT="PYHELLO_SRC_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/PyQt-3.13.sh b/config_files/PyQt-3.13.sh index ab9f7fc..3d87870 100755 --- a/config_files/PyQt-3.13.sh +++ b/config_files/PyQt-3.13.sh @@ -95,7 +95,7 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/INSTALL.LOG make install #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } diff --git a/config_files/Python-2.3.4.sh b/config_files/Python-2.3.4.sh index 3f13dee..8b4b476 100755 --- a/config_files/Python-2.3.4.sh +++ b/config_files/Python-2.3.4.sh @@ -110,7 +110,7 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/MAKINSTALL.LOG make install #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } @@ -134,4 +134,4 @@ export PRODUCT="Python-2.3.4" 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/SAMPLES.sh b/config_files/SAMPLES.sh index 7bfd062..21d81eb 100755 --- a/config_files/SAMPLES.sh +++ b/config_files/SAMPLES.sh @@ -40,7 +40,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/SAMPLESsourcesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/SAMPLESsourcesV3.1.0.tar.gz -C ${INSTALL_ROOT} print_env } @@ -56,7 +56,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="Samples" ; fi -export PRODUCT="SAMPLES_SRC_3.1.0b1" +export PRODUCT="SAMPLES_SRC_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/SMESH_BIN.sh b/config_files/SMESH_BIN.sh index c30e8b2..fb39833 100755 --- a/config_files/SMESH_BIN.sh +++ b/config_files/SMESH_BIN.sh @@ -5,7 +5,7 @@ if [ -n "${SMESH_ROOT_DIR}" ]; then check_lib_version VERSION ${SMESH_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${SMESH_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -67,7 +67,7 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/SMESHbinariesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/SMESHbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT} # modify all *.la files modif_la_files ${PRODUCT_DIR}/lib/salome @@ -81,7 +81,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="SmeshBin" ; fi -export PRODUCT="SMESH_3.1.0b1" +export PRODUCT="SMESH_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/SMESH_SRC.sh b/config_files/SMESH_SRC.sh index eb5d502..7f6f89f 100755 --- a/config_files/SMESH_SRC.sh +++ b/config_files/SMESH_SRC.sh @@ -5,7 +5,7 @@ if [ -n "${SMESH_SRC_DIR}" ]; then check_lib_version VERSION ${SMESH_SRC_DIR}/bin if [ "$?" -eq "0" ]; then ver=`cat ${SMESH_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -48,7 +48,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/SMESHsourcesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/SMESHsourcesV3.1.0.tar.gz -C ${INSTALL_ROOT} print_env } @@ -64,7 +64,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="SmeshSrc" ; fi -export PRODUCT="SMESH_SRC_3.1.0b1" +export PRODUCT="SMESH_SRC_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/SUPERV_BIN.sh b/config_files/SUPERV_BIN.sh index 09a960c..c2b18d4 100755 --- a/config_files/SUPERV_BIN.sh +++ b/config_files/SUPERV_BIN.sh @@ -5,7 +5,7 @@ if [ -n "${SUPERV_ROOT_DIR=}" ]; then check_lib_version VERSION ${SUPERV_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${SUPERV_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -67,7 +67,7 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/SUPERVbinariesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/SUPERVbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT} # modify all *.la files modif_la_files ${PRODUCT_DIR}/lib/salome @@ -81,7 +81,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="SupervBin" ; fi -export PRODUCT="SUPERV_3.1.0b1" +export PRODUCT="SUPERV_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/SUPERV_SRC.sh b/config_files/SUPERV_SRC.sh index a28131a..41aa3ef 100755 --- a/config_files/SUPERV_SRC.sh +++ b/config_files/SUPERV_SRC.sh @@ -5,7 +5,7 @@ if [ -n "${SUPERV_SRC_DIR}" ]; then check_lib_version VERSION ${SUPERV_SRC_DIR}/bin if [ "$?" -eq "0" ]; then ver=`cat ${SUPERV_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -48,7 +48,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/SUPERVsourcesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/SUPERVsourcesV3.1.0.tar.gz -C ${INSTALL_ROOT} print_env } @@ -64,7 +64,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="SupervSrc" ; fi -export PRODUCT="SUPERV_SRC_3.1.0b1" +export PRODUCT="SUPERV_SRC_3.1.0" 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 index 79e36dc..c436ef6 100755 --- a/config_files/SWIG-1.3.17.sh +++ b/config_files/SWIG-1.3.17.sh @@ -76,7 +76,7 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/MAKINSTALL.LOG make install #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } @@ -96,4 +96,4 @@ export PRODUCT="SWIG-1.3.17" 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/SWIG-1.3.24.sh b/config_files/SWIG-1.3.24.sh index 566ae77..af134eb 100755 --- a/config_files/SWIG-1.3.24.sh +++ b/config_files/SWIG-1.3.24.sh @@ -70,7 +70,7 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/INSTALL.LOG make install #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } @@ -90,4 +90,4 @@ export PRODUCT="SWIG-1.3.24" 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/VISU_BIN.sh b/config_files/VISU_BIN.sh index eeb8cfe..6255734 100755 --- a/config_files/VISU_BIN.sh +++ b/config_files/VISU_BIN.sh @@ -5,7 +5,7 @@ if [ -n "${VISU_ROOT_DIR}" ]; then check_lib_version VERSION ${VISU_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${VISU_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -67,7 +67,7 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/VISUbinariesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/VISUbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT} # modify all *.la files modif_la_files ${PRODUCT_DIR}/lib/salome @@ -81,7 +81,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="VisuBin" ; fi -export PRODUCT="VISU_3.1.0b1" +export PRODUCT="VISU_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/VISU_SRC.sh b/config_files/VISU_SRC.sh index d90c802..ec7af64 100755 --- a/config_files/VISU_SRC.sh +++ b/config_files/VISU_SRC.sh @@ -5,7 +5,7 @@ if [ -n "${VISU_SRC_DIR}" ]; then check_lib_version VERSION ${VISU_SRC_DIR}/bin if [ "$?" -eq "0" ]; then ver=`cat ${VISU_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0b1" ]; then + if [ "$ver" = "3.1.0" ]; then return 0 fi fi @@ -48,7 +48,7 @@ install_source() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/VISUsourcesV3.1.0b1.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/VISUsourcesV3.1.0.tar.gz -C ${INSTALL_ROOT} print_env } @@ -64,7 +64,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="VisuSrc" ; fi -export PRODUCT="VISU_SRC_3.1.0b1" +export PRODUCT="VISU_SRC_3.1.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/VTK-4.2.2.sh b/config_files/VTK-4.2.2.sh index 830d862..1c1404d 100755 --- a/config_files/VTK-4.2.2.sh +++ b/config_files/VTK-4.2.2.sh @@ -140,7 +140,7 @@ check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PROD #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log #du -sk ${INSTALL_WORK}/cmake-1.6.6 >> ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} ${INSTALL_WORK}/cmake-1.6.6 +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 diff --git a/config_files/VTK-4.2.6.sh b/config_files/VTK-4.2.6.sh index 56ae5f7..a268794 100755 --- a/config_files/VTK-4.2.6.sh +++ b/config_files/VTK-4.2.6.sh @@ -146,7 +146,7 @@ check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PROD #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log #du -sk ${INSTALL_WORK}/cmake-1.6.6 >> ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} ${INSTALL_WORK}/cmake-1.6.6 +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 diff --git a/config_files/doxygen-1.3-rc2.sh b/config_files/doxygen-1.3-rc2.sh index 315ffd2..6784f82 100755 --- a/config_files/doxygen-1.3-rc2.sh +++ b/config_files/doxygen-1.3-rc2.sh @@ -110,7 +110,7 @@ EOF fi #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } diff --git a/config_files/doxygen-1.3.7.sh b/config_files/doxygen-1.3.7.sh index 39e39cc..df29004 100755 --- a/config_files/doxygen-1.3.7.sh +++ b/config_files/doxygen-1.3.7.sh @@ -109,7 +109,7 @@ EOF fi #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } diff --git a/config_files/gcc-3.2.sh b/config_files/gcc-3.2.sh index 58a8832..958ba32 100755 --- a/config_files/gcc-3.2.sh +++ b/config_files/gcc-3.2.sh @@ -104,7 +104,7 @@ check_job ${PRODUCT_DIR}/CONFIGURE.LOG ${PRODUCT_WORK}/configure --prefix=${PROD check_job ${PRODUCT_DIR}/BOOTSTRAP.LOG make bootstrap check_job ${PRODUCT_DIR}/INSTALL.LOG make install -rm -fr ${PRODUCT_WORK} ${PRODUCT_WORK}-build +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} ${PRODUCT_WORK}-build print_env } @@ -124,4 +124,4 @@ export PRODUCT="gcc-3.2" 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 index 2d4d694..a3dea55 100755 --- a/config_files/graphviz-1.9.sh +++ b/config_files/graphviz-1.9.sh @@ -69,7 +69,7 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } diff --git a/config_files/graphviz-2.2.1.sh b/config_files/graphviz-2.2.1.sh index 4e8b94f..f818a35 100755 --- a/config_files/graphviz-2.2.1.sh +++ b/config_files/graphviz-2.2.1.sh @@ -69,7 +69,7 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } diff --git a/config_files/hdf5-1.4.4.sh b/config_files/hdf5-1.4.4.sh index fdce780..b5abd9b 100755 --- a/config_files/hdf5-1.4.4.sh +++ b/config_files/hdf5-1.4.4.sh @@ -128,7 +128,7 @@ check_job ${PRODUCT_DIR}/MAKE6.LOG make check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } diff --git a/config_files/hdf5-1.6.3.sh b/config_files/hdf5-1.6.3.sh index bd56c8e..046d63c 100755 --- a/config_files/hdf5-1.6.3.sh +++ b/config_files/hdf5-1.6.3.sh @@ -77,7 +77,7 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/INSTALL.LOG make install #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } diff --git a/config_files/med-2.2.2.sh b/config_files/med-2.2.2.sh index 3f5142e..b454521 100755 --- a/config_files/med-2.2.2.sh +++ b/config_files/med-2.2.2.sh @@ -74,7 +74,7 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/INSTALL.LOG make install #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} ### modify libmed.la libmedC.la files to correct direct path to hdf5 library cd ${PRODUCT_DIR}/lib diff --git a/config_files/msg2qm.sh b/config_files/msg2qm.sh index b640597..42c4f2f 100755 --- a/config_files/msg2qm.sh +++ b/config_files/msg2qm.sh @@ -65,7 +65,7 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make cp -f msg2qm ${PRODUCT_DIR} #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -rf ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -rf ${PRODUCT_WORK} print_env } diff --git a/config_files/netgen-4.3.sh b/config_files/netgen-4.3.sh index 2df6bd4..f05e846 100755 --- a/config_files/netgen-4.3.sh +++ b/config_files/netgen-4.3.sh @@ -63,7 +63,7 @@ mkdir -p ${PRODUCT_DIR}/include cp -f ${PRODUCT_WORK}/libsrc/interface/nglib.h ${PRODUCT_DIR}/include #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } diff --git a/config_files/omniORB-4.0.5.sh b/config_files/omniORB-4.0.5.sh index 3c13fe3..2f0feef 100755 --- a/config_files/omniORB-4.0.5.sh +++ b/config_files/omniORB-4.0.5.sh @@ -132,6 +132,7 @@ check_job ${PRODUCT_DIR}/MAKE_OMNINOTIFY.LOG make check_job ${PRODUCT_DIR}/INSTALL_OMNINOTIFY.LOG make install #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log +cd ${PRODUCT_DIR} rm -fr ${PRODUCT_WORK} rm -fr ${PRODUCT_WORK}/omniORBpy-2.5 rm -fr ${PRODUCT_WORK}/omniNotify diff --git a/config_files/qt-3.3.3.sh b/config_files/qt-3.3.3.sh index ec914d4..675e270 100755 --- a/config_files/qt-3.3.3.sh +++ b/config_files/qt-3.3.3.sh @@ -109,7 +109,7 @@ done #rm -rf ${PRODUCT_DIR}/doc #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } diff --git a/config_files/qwt-0.4.1.sh b/config_files/qwt-0.4.1.sh index 514652f..1656160 100755 --- a/config_files/qwt-0.4.1.sh +++ b/config_files/qwt-0.4.1.sh @@ -70,7 +70,7 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make cp -rf include lib ${PRODUCT_DIR} #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -rf ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -rf ${PRODUCT_WORK} print_env } diff --git a/config_files/qwt-4.2.0.sh b/config_files/qwt-4.2.0.sh index 6ceebaf..d91c2f0 100755 --- a/config_files/qwt-4.2.0.sh +++ b/config_files/qwt-4.2.0.sh @@ -67,7 +67,7 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make cp -rf include lib ${PRODUCT_DIR} #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -rf ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -rf ${PRODUCT_WORK} print_env } diff --git a/config_files/sip-4.1.sh b/config_files/sip-4.1.sh index 1d5a082..ccafacf 100755 --- a/config_files/sip-4.1.sh +++ b/config_files/sip-4.1.sh @@ -83,7 +83,7 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/INSTALL.LOG make install #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -rm -fr ${PRODUCT_WORK} +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} print_env } diff --git a/config_files/tcltk-8.3.3.sh b/config_files/tcltk-8.3.3.sh index 2e0b9cd..74c7ffa 100755 --- a/config_files/tcltk-8.3.3.sh +++ b/config_files/tcltk-8.3.3.sh @@ -182,6 +182,7 @@ check_job ${PRODUCT_DIR}/MAKEINSTALLEXEC.LOG make install-exec #du -sk ${INSTALL_WORK}/tcl8.3.3 > ${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 } diff --git a/config_files/tcltk-8.4.5.sh b/config_files/tcltk-8.4.5.sh index 94b74a6..934b879 100755 --- a/config_files/tcltk-8.4.5.sh +++ b/config_files/tcltk-8.4.5.sh @@ -179,9 +179,10 @@ check_job ${PRODUCT_DIR}/MAKEINSTALLEXEC.LOG make install-exec (cd ${PRODUCT_DIR}/lib; ln -s libtkx8.3.so libtkx.so) (cd ${PRODUCT_DIR}/lib; ln -s libtkx8.3.a libtkx.a) -du -sk ${INSTALL_WORK}/tcl8.4.5 > ${PRODUCT_DIR}/size.log -du -sk ${INSTALL_WORK}/tk8.4.5 >> ${PRODUCT_DIR}/size.log -du -sk ${INSTALL_WORK}/tclx8.3.5 >> ${PRODUCT_DIR}/size.log +#du -sk ${INSTALL_WORK}/tcl8.4.5 > ${PRODUCT_DIR}/size.log +#du -sk ${INSTALL_WORK}/tk8.4.5 >> ${PRODUCT_DIR}/size.log +#du -sk ${INSTALL_WORK}/tclx8.3.5 >> ${PRODUCT_DIR}/size.log +cd ${PRODUCT_DIR} rm -fr ${INSTALL_WORK}/tcl8.4.5 ${INSTALL_WORK}/tk8.4.5 ${INSTALL_WORK}/tclx8.3.5 print_env } -- 2.39.2