From: maintenance team Date: Tue, 24 Apr 2007 11:17:12 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3fea14a7a0d1625d2764a0c840ef294f66077efa;p=tools%2Finstall.git *** empty log message *** --- diff --git a/config_files/CAS-6.1.2sp1.sh b/config_files/CAS-6.1.2sp1.sh deleted file mode 100755 index ec9d00c..0000000 --- a/config_files/CAS-6.1.2sp1.sh +++ /dev/null @@ -1,229 +0,0 @@ -#!/bin/bash -noprofile - -#################################################################################### -# File : CAS-6.1.2sp1.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. -# -#################################################################################### - -check_version() -{ -if [ -z "$CASROOT" ]; then - return 1 -fi -check_lib_version ${CASROOT}/inc/Standard_Version.hxx -if [ "$?" -ne "0" ] ; then - return 1 -fi -ver_major=`grep "#define OCC_VERSION_MAJOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'` -ver_minor=`grep "#define OCC_VERSION_MINOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'` -ver_maint=`grep "#define OCC_VERSION_MAINTENANCE" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'` -ver="$ver_major.$ver_minor.$ver_maint" -if [ "$ver" == "6.1.1" ] ; 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`" ] ; then - str_to_replace="${gllibdir}/libGL.la" - fi - fi - if [ "$str_to_replace" == "" ] ; then - str_to_replace="-L${gllibdir} -lGL" - fi - sed -e "s%-lGL%%g" \ - -e "s%[^[:space:]]*libGL.la[[:space:]]%%g" \ - -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \ - libTKOpenGl.la > libTKOpenGl.la.new - mv -f libTKOpenGl.la.new libTKOpenGl.la -fi - -#du -sk ${PRODUCT_WORK} > ${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}/CAS-6.1.2sp1.tar.gz -C ${INSTALL_ROOT} - -# modify *.la files -ldir=${PRODUCT_DIR}/lib -if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/Linux/lib; fi -if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/lin/lib; fi -cd $ldir -# 1. set libdir correctly, correct dependencies, set tcldir correctly -tcldir=`printenv TCLHOME` -for l in X `find . -name "*.la"`; do - if [ "$l" != "X" ] ; then - l=`basename $l` - libdir=`grep -e "libdir=.*" $l | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"` - sed -e "s%${libdir}%${ldir}%g" $l > _$l - mv -f _$l $l - if [ -n "${tcldir}" ] && [ -d "${tcldir}" ] ; then - sed -e "s%-L[^[:space:]]*tcltk[^[:space:]]*/lib%-L${tcldir}/lib%g" $l > _$l - mv -f _$l $l - fi - chmod a+x $l - fi -done - -# 2. fix libGL dependencies -cd $ldir -gllibdir="`where_gl_libs`" -if [ "$gllibdir" != "" ] ; then - if [ -f ${gllibdir}/libGL.la ] ; then - libdir=`grep "libdir=" ${gllibdir}/libGL.la | sed -e "s%libdir='\(.*\)'%\1%"` - if [ "`ls $libdir/libGL.so* 2>/dev/null`" ] ; then - str_to_replace="${gllibdir}/libGL.la" - fi - fi - if [ "$str_to_replace" == "" ] ; then - str_to_replace="-L${gllibdir} -lGL" - fi - sed -e "s%-lGL%%g" \ - -e "s%[^[:space:]]*libGL.la[[:space:]]%%g" \ - -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \ - libTKOpenGl.la > libTKOpenGl.la.new - mv -f libTKOpenGl.la.new libTKOpenGl.la -fi - -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="cas" ; fi -export PRODUCT="CAS-6.1.2sp1" -export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} -export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -source ./common.sh -$PROCEDURE diff --git a/config_files/CAS-6.2.sh b/config_files/CAS-6.2.sh new file mode 100755 index 0000000..2192f11 --- /dev/null +++ b/config_files/CAS-6.2.sh @@ -0,0 +1,243 @@ +#!/bin/bash -noprofile + +#################################################################################### +# File : CAS-6.2.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. +# +#################################################################################### + +check_version() +{ +if [ -z "$CASROOT" ]; then + return 1 +fi +check_lib_version ${CASROOT}/inc/Standard_Version.hxx +if [ "$?" -ne "0" ] ; then + return 1 +fi +ver_major=`grep "#define OCC_VERSION_MAJOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'` +ver_minor=`grep "#define OCC_VERSION_MINOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'` +ver_maint=`grep "#define OCC_VERSION_MAINTENANCE" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'` +ver="$ver_major.$ver_minor.$ver_maint" +if [ "$ver" == "6.2" ] ; then + return 0 +fi +return 1 +} + +print_env() +{ +cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ./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 + +if [ "$?" -ne "0" ] ; then + cat ${PRODUCT_DIR}/CONFIGURE.LOG + cat ${INSTALL_WORK}/errlog >&2 + cat ${INSTALL_WORK}/errlog >> ${PRODUCT_DIR}/CONFIGURE.LOG + exit 1 +fi + +# make +GCC=`which gcc` +cat >> ${PRODUCT_DIR}/MAKE.LOG </dev/null`" ] ; then + str_to_replace="${gllibdir}/libGL.la" + fi + fi + if [ "$str_to_replace" == "" ] ; then + str_to_replace="-L${gllibdir} -lGL" + fi + sed -e "s%-lGL%%g" \ + -e "s%[^[:space:]]*libGL.la[[:space:]]%%g" \ + -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \ + libTKOpenGl.la > libTKOpenGl.la.new + mv -f libTKOpenGl.la.new libTKOpenGl.la +fi + +#du -sk ${PRODUCT_WORK} > ${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}/CAS-6.2.tar.gz -C ${INSTALL_ROOT} + +# modify *.la files +ldir=${PRODUCT_DIR}/lib +if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/Linux/lib; fi +if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/lin/lib; fi +cd $ldir +# 1. set libdir correctly, correct dependencies, set tcldir correctly +tcldir=`printenv TCLHOME` +for l in X `find . -name "*.la"`; do + if [ "$l" != "X" ] ; then + l=`basename $l` + libdir=`grep -e "libdir=.*" $l | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"` + sed -e "s%${libdir}%${ldir}%g" $l > _$l + mv -f _$l $l + if [ -n "${tcldir}" ] && [ -d "${tcldir}" ] ; then + sed -e "s%-L[^[:space:]]*tcltk[^[:space:]]*/lib%-L${tcldir}/lib%g" $l > _$l + mv -f _$l $l + fi + chmod a+x $l + fi +done + +# 2. fix libGL dependencies +cd $ldir +gllibdir="`where_gl_libs`" +if [ "$gllibdir" != "" ] ; then + if [ -f ${gllibdir}/libGL.la ] ; then + libdir=`grep "libdir=" ${gllibdir}/libGL.la | sed -e "s%libdir='\(.*\)'%\1%"` + if [ "`ls $libdir/libGL.so* 2>/dev/null`" ] ; then + str_to_replace="${gllibdir}/libGL.la" + fi + fi + if [ "$str_to_replace" == "" ] ; then + str_to_replace="-L${gllibdir} -lGL" + fi + sed -e "s%-lGL%%g" \ + -e "s%[^[:space:]]*libGL.la[[:space:]]%%g" \ + -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \ + libTKOpenGl.la > libTKOpenGl.la.new + mv -f libTKOpenGl.la.new libTKOpenGl.la +fi + +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="cas" ; fi +export PRODUCT="CAS-6.2" +export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} +export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} +source ./common.sh +$PROCEDURE diff --git a/config_files/Python-2.4.4.sh b/config_files/Python-2.4.4.sh index 0579252..a916c60 100755 --- a/config_files/Python-2.4.4.sh +++ b/config_files/Python-2.4.4.sh @@ -107,32 +107,29 @@ source ${INSTALL_WORK}/$SHRC makedir ${PRODUCT_DIR} if test `uname -m` = "x86_64" ; then -# export PYTHON_ARCHIVE_PREFIX="-lib64" -# export PYTHON_LIB_PREFIX="64" + export PYTHON_LIB_PREFIX="64" export CFLAGS=-m64 export CXXFLAGS=-m64 PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared CFLAGS=-m64 CXXFLAGS=-m64" else - export PYTHON_ARCHIVE_PREFIX="" PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared" fi -# INV check_jb tar xfz ${SOURCE_DIR}/Python-2.4.4${PYTHON_ARCHIVE_PREFIX}.tar.gz -C ${INSTALL_WORK} check_jb tar xfz ${SOURCE_DIR}/Python-2.4.4.tar.gz -C ${INSTALL_WORK} # apply patch for 64-bit platforms -#if test `uname -m` = "x86_64" ; then -# if [ -f patches/Python-2.4.4-lib64.patch ] ; then -# cp patches/Python-2.4.4-lib64.patch ${PRODUCT_WORK} -# ( cd ${PRODUCT_WORK} ; \ -# patch -p1 < Python-2.4.4-lib64.patch ; \ -# rm -rf aclocal.m4 ; \ -# aclocal >& /dev/null ; \ -# autoconf >& /dev/null ; \ -# aclocal >& /dev/null ; \ -# autoconf >& /dev/null ) -# fi -#fi +if test `uname -m` = "x86_64" ; then + if [ -f patches/python_patch_lib64.patch ] ; then + cp patches/python_patch_lib64.patch ${PRODUCT_WORK} + ( cd ${PRODUCT_WORK} ; \ + patch -p1 < python_patch_lib64.patch ; \ + rm -rf aclocal.m4 ; \ + aclocal >& /dev/null ; \ + autoconf >& /dev/null ; \ + aclocal >& /dev/null ; \ + autoconf >& /dev/null ) + fi +fi cd ${PRODUCT_WORK} @@ -148,8 +145,7 @@ used gcc=$GCC EOF check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/MAKINSTALL.LOG make install -# INV (cd ${PRODUCT_DIR}/lib${PYTHON_LIB_PREFIX}/python2.4/config; ln -fs ../../libpython2.4.so.1.0 libpython2.4.so) -(cd ${PRODUCT_DIR}/lib/python2.4/config; ln -fs ../../libpython2.4.so.1.0 libpython2.4.so) +(cd ${PRODUCT_DIR}/lib${PYTHON_LIB_PREFIX}/python2.4/config; ln -fs ../../libpython2.4.so.1.0 libpython2.4.so) cd ${PRODUCT_DIR}/bin for sc in idle pydoc smtpd.py ; do @@ -161,7 +157,7 @@ for sc in idle pydoc smtpd.py ; do done if test `uname -m` = "x86_64" ; then - ( cd ${PRODUCT_DIR}; ln -sf lib lib64) + ( cd ${PRODUCT_DIR}; ln -sf lib64 lib) fi #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log