From 3edb56686d73b17637c8f89d4846765b19e1ea28 Mon Sep 17 00:00:00 2001 From: maintenance team Date: Thu, 21 Feb 2008 09:49:54 +0000 Subject: [PATCH] passing to CAS-6.2.1sp1 and med-2.3.3 --- .../{CAS-6.2sp3.sh => CAS-6.2.1sp1.sh} | 25 +++---------------- config_files/{med-2.3.2.sh => med-2.3.3.sh} | 4 +-- 2 files changed, 5 insertions(+), 24 deletions(-) rename config_files/{CAS-6.2sp3.sh => CAS-6.2.1sp1.sh} (89%) rename config_files/{med-2.3.2.sh => med-2.3.3.sh} (99%) diff --git a/config_files/CAS-6.2sp3.sh b/config_files/CAS-6.2.1sp1.sh similarity index 89% rename from config_files/CAS-6.2sp3.sh rename to config_files/CAS-6.2.1sp1.sh index c2edd1a..7fd81ec 100755 --- a/config_files/CAS-6.2sp3.sh +++ b/config_files/CAS-6.2.1sp1.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : CAS-6.2sp3.sh +# File : CAS-6.2.1sp1.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -142,17 +142,12 @@ tkdir="`where_tk`" if [ $? -eq 0 ] ; then flags="$flags --with-tk=$tkdir"; fi dpsdir="`where_dps`" if [ $? -eq 0 ] ; then flags="$flags --with-dps-include=$dpsdir/include --with-dps-library=$dpsdir/lib"; fi -flags="$flags --disable-jcas --disable-debug --enable-production" +flags="$flags --disable-wrappers --disable-wok --disable-debug --enable-production" export CASROOT=${PRODUCT_SRC_DIR} -if test `uname -m` = "x86_64" ; then -echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} $flags CFLAGS="-m64 -D_OCC64" CXXFLAGS="-m64 -D_OCC64" >> ${PRODUCT_DIR}/CONFIGURE.LOG" -./configure --prefix=${PRODUCT_DIR} $flags CFLAGS="-m64 -D_OCC64" CXXFLAGS="-m64 -D_OCC64" >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog -else echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG" ./configure --prefix=${PRODUCT_DIR} $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog -fi # make echo " +++++++++++ make" @@ -162,20 +157,6 @@ used gcc=$GCC EOF check_job ${PRODUCT_DIR}/MAKE.LOG make -j4 install-strip -# copy includes -echo " +++++++++++ copy includes" -cp -fr inc ${PRODUCT_DIR} -cp -f config.h ${PRODUCT_DIR} -(cd ${PRODUCT_DIR}/inc; ln -fs ../config.h config.h) -# copy resources -echo " +++++++++++ copy resources" -makedir ${PRODUCT_DIR}/src -for d in UnitsAPI SHMessage FontMFT Textures XSMessage DrawResources ; do - cp -rp src/${d} ${PRODUCT_DIR}/src -done -(cd ${PRODUCT_DIR}; mkdir -p Linux; cd Linux; ln -fs ../lib lib; ln -fs ../bin bin) -(cd ${PRODUCT_DIR}; mkdir -p lin; cd lin; ln -fs ../lib lib; ln -fs ../bin bin) - # fix libGL dependencies echo " +++++++++++ fix libGL dependencies" @@ -302,7 +283,7 @@ export INSTALL_PRODUCTS=$7; shift REMOVE_SRC_TMP=$8; test $# == 10 && shift && SINGLE_DIR=$9 -export PRODUCT="CAS-6.2sp3" +export PRODUCT="CAS-6.2.1sp1" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT}_SRC diff --git a/config_files/med-2.3.2.sh b/config_files/med-2.3.3.sh similarity index 99% rename from config_files/med-2.3.2.sh rename to config_files/med-2.3.3.sh index 731ad0f..9168fed 100755 --- a/config_files/med-2.3.2.sh +++ b/config_files/med-2.3.3.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : med-2.3.2.sh +# File : med-2.3.3.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -186,7 +186,7 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9 -export PRODUCT="med-2.3.2" +export PRODUCT="med-2.3.3" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT}_SRC -- 2.39.2