#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${BLSURFPLUGIN_ROOT_DIR}" ]; then
cd ${PRODUCT_SRC_DIR}/tools/jam/src
check_job ${PRODUCT_DIR}/BUILD.LOG ./build.sh --debug --with-python=${python_root}
-# apply patch to avoid conflicts with Qt signals
-# VSR 07/03/06 : this is no more needed
-#cd ${PRODUCT_SRC_DIR}/boost/signals/detail
-#sed -e "s%# define BOOST_SIGNALS_NAMESPACE signals%# define BOOST_SIGNALS_NAMESPACE bsignals%g" \
-# signals_common.hpp > signals_common.hpp.orig
-#mv -f signals_common.hpp.orig signals_common.hpp
-
# install
cd ${PRODUCT_SRC_DIR}
else
export binfolder=bin.linuxx86.debug
fi
-echo "`pwd` -> ./tools/jam/src/${binfolder}/bjam >> ${PRODUCT_DIR}/INSTALL.LOG"
-./tools/jam/src/${binfolder}/bjam --toolset=gcc "-sBOOST_ALL_DYN_LINK=1" \
- "-sBUILD=release <runtime-link>dynamic <threading>multi" \
- --prefix=${PRODUCT_DIR} --builddir=${PRODUCT_SRC_DIR} \
- install >> ${PRODUCT_DIR}/INSTALL.LOG 2> $INSTALL_WORK/errlog
+
+OPTIONS="toolset=gcc variant=release"
+OPTIONS="${OPTIONS} runtime-link=shared threading=multi"
+OPTIONS="${OPTIONS} -sBOOST_ALL_DYN_LINK=1"
+OPTIONS="${OPTIONS} --prefix=${PRODUCT_DIR} --builddir=${PRODUCT_SRC_DIR} install"
+
+echo "`pwd` -> ./tools/jam/src/${binfolder}/bjam ${OPTIONS} >> ${PRODUCT_DIR}/INSTALL.LOG"
+./tools/jam/src/${binfolder}/bjam ${OPTIONS} >> ${PRODUCT_DIR}/INSTALL.LOG 2> $INSTALL_WORK/errlog
if [ "$?" -ne "0" ] ; then
cat ${PRODUCT_DIR}/INSTALL.LOG
fi
done
- if test `uname -m` = "x86_64" ; then
- cd ${PRODUCT_DIR}; ln -sf lib lib64
- fi
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR};
# remove sources and temporary files after building
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${CALCULATOR_ROOT_DIR}" ]; then
+++ /dev/null
-#!/bin/bash -noprofile
-
-####################################################################################
-# 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
-# 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_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export CASROOT=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${CASROOT}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${CASROOT}/lib:\${CASROOT}/lin/lib:\${LD_LIBRARY_PATH}
-# Variable for Foundation Classes :
-export CSF_UnitsLexicon=\${CASROOT}/src/UnitsAPI/Lexi_Expr.dat
-export CSF_UnitsDefinition=\${CASROOT}/src/UnitsAPI/Units.dat
-# Variable for DataExchange :
-export CSF_SHMessage=\${CASROOT}/src/SHMessage
-export CSF_XSMessage=\${CASROOT}/src/XSMessage
-# Variable for Font :
-export CSF_MDTVFontDirectory=\${CASROOT}/src/FontMFT
-export CSF_MDTVTexturesDirectory=\${CASROOT}/src/Textures
-# Activation of OCCT Kernel multithreading :
-export MMGT_REENTRANT=1
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled()
-{
-try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-# unpack
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-cd ${PRODUCT_SRC_DIR}
-
-# configure
-
-echo " +++++++++++ configure"
-
-is_mandriva2007=0
-is_mandriva2008=0
-is_debian40=0
-
-if [ -e /etc/issue ] ; then
- grep -e "Mandriva Linux release 2007.0" /etc/issue > /dev/null
- if [ $? == 0 ] ; then is_mandriva2007=1 ; fi
-fi
-
-if [ -e /etc/issue ] ; then
- grep -e "Mandriva Linux release 2008.0" /etc/issue > /dev/null
- if [ $? == 0 ] ; then is_mandriva2008=1 ; fi
-fi
-
-if [ -e /etc/issue ] ; then
- grep -e "Debian GNU/Linux 4.0" /etc/issue > /dev/null
- if [ $? == 0 ] ; then is_debian40=1 ; fi
-fi
-
-if [ $is_mandriva2007 == 1 ] || [ $is_mandriva2008 == 1 ] || [ $is_debian40 == 1 ] ; then
-where_xmu_include=/usr/include/X11
-else
-where_xmu_include=/usr/X11R6/include/X11
-fi
-
-flags="$flags --with-xmu-include=$where_xmu_include"
-
-if test `uname -m` = "x86_64" ; then
- flags="$flags --with-xmu-library=/usr/lib64"
-else
- flags="$flags --with-xmu-library=/usr/X11R6/lib"
-fi
-
- flags="$flags LDFLAGS=-lpthread"
-glincdir="`where_gl_includes`"
-if [ $? -eq 0 ] ; then flags="$flags --with-gl-include=$glincdir"; fi
-gllibdir="`where_gl_libs`"
-if [ $? -eq 0 ] ; then flags="$flags --with-gl-library=$gllibdir"; fi
-tcldir="`where_tcl`"
-if [ $? -eq 0 ] ; then flags="$flags --with-tcl=$tcldir"; fi
-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-wrappers --disable-wok --disable-debug --enable-production"
-
-export CASROOT=${PRODUCT_SRC_DIR}
-
-echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG"
-./configure --prefix=${PRODUCT_DIR} $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog
-
-# make
-echo " +++++++++++ make"
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make -j4 install-strip
-
-# fix libGL dependencies
-echo " +++++++++++ fix libGL dependencies"
-
-cd ${PRODUCT_DIR}/lib
-
-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
-
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
-cd ${PRODUCT_DIR};
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
- test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-# create a product directory
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-
-is_mandriva2008=0
-
-if [ -e /etc/issue ] ; then
- grep -e "Mandriva Linux release 2008.0" /etc/issue > /dev/null
- if [ $? == 0 ] ; then is_mandriva2008=1 ; fi
-fi
-
-# 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
-
-#if test "$is_mandriva2008" = "1" && test `uname -m` = "x86_64" ; then
-
-#echo " +++++++++++ libGL dependencies are not updated"
-
-#else
-
-#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
-
- if test `uname -m` = "x86_64" ; then
- libGLpath=/usr/lib64/libGL.la
- else
- libGLpath=/usr/lib/libGL.la
- fi
- sed -e "s%$libGLpath%""%g" \
- libTKOpenGl.la > libTKOpenGl.la.new
- mv -f libTKOpenGl.la.new libTKOpenGl.la
-
-# 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
-#fi
-
-# to generate environment script for sources
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INSTALL_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-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
-source ./common.sh
-$PROCEDURE
--- /dev/null
+#!/bin/bash -noprofile
+
+####################################################################################
+# File : CAS-6.2.1sp2.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_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export CASROOT=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${CASROOT}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${CASROOT}/lib:\${CASROOT}/lin/lib:\${LD_LIBRARY_PATH}
+# Variable for Foundation Classes :
+export CSF_UnitsLexicon=\${CASROOT}/src/UnitsAPI/Lexi_Expr.dat
+export CSF_UnitsDefinition=\${CASROOT}/src/UnitsAPI/Units.dat
+# Variable for DataExchange :
+export CSF_SHMessage=\${CASROOT}/src/SHMessage
+export CSF_XSMessage=\${CASROOT}/src/XSMessage
+# Variable for Font :
+export CSF_MDTVFontDirectory=\${CASROOT}/src/FontMFT
+export CSF_MDTVTexturesDirectory=\${CASROOT}/src/Textures
+# Activation of OCCT Kernel multithreading :
+export MMGT_REENTRANT=1
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled()
+{
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+# unpack
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR}
+
+# configure
+
+echo " +++++++++++ configure"
+
+is_mandriva2007=0
+is_mandriva2008=0
+is_debian40=0
+
+if [ -e /etc/issue ] ; then
+ grep -e "Mandriva Linux release 2007.0" /etc/issue > /dev/null
+ if [ $? == 0 ] ; then is_mandriva2007=1 ; fi
+fi
+
+if [ -e /etc/issue ] ; then
+ grep -e "Mandriva Linux release 2008.0" /etc/issue > /dev/null
+ if [ $? == 0 ] ; then is_mandriva2008=1 ; fi
+fi
+
+if [ -e /etc/issue ] ; then
+ grep -e "Debian GNU/Linux 4.0" /etc/issue > /dev/null
+ if [ $? == 0 ] ; then is_debian40=1 ; fi
+fi
+
+if [ $is_mandriva2007 == 1 ] || [ $is_mandriva2008 == 1 ] || [ $is_debian40 == 1 ] ; then
+where_xmu_include=/usr/include/X11
+else
+where_xmu_include=/usr/X11R6/include/X11
+fi
+
+flags="$flags --with-xmu-include=$where_xmu_include"
+
+if test `uname -m` = "x86_64" ; then
+ flags="$flags --with-xmu-library=/usr/lib64"
+else
+ flags="$flags --with-xmu-library=/usr/X11R6/lib"
+fi
+
+ flags="$flags LDFLAGS=-lpthread"
+glincdir="`where_gl_includes`"
+if [ $? -eq 0 ] ; then flags="$flags --with-gl-include=$glincdir"; fi
+gllibdir="`where_gl_libs`"
+if [ $? -eq 0 ] ; then flags="$flags --with-gl-library=$gllibdir"; fi
+tcldir="`where_tcl`"
+if [ $? -eq 0 ] ; then flags="$flags --with-tcl=$tcldir"; fi
+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-wrappers --disable-wok --disable-debug --enable-production"
+
+export CASROOT=${PRODUCT_SRC_DIR}
+
+echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG"
+./configure --prefix=${PRODUCT_DIR} $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog
+
+# make
+echo " +++++++++++ make"
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE.LOG make -j4 install-strip
+
+# fix libGL dependencies
+echo " +++++++++++ fix libGL dependencies"
+
+cd ${PRODUCT_DIR}/lib
+
+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
+
+#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
+cd ${PRODUCT_DIR};
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+ test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+# create a product directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
+
+is_mandriva2008=0
+
+if [ -e /etc/issue ] ; then
+ grep -e "Mandriva Linux release 2008.0" /etc/issue > /dev/null
+ if [ $? == 0 ] ; then is_mandriva2008=1 ; fi
+fi
+
+# 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
+
+#if test "$is_mandriva2008" = "1" && test `uname -m` = "x86_64" ; then
+
+#echo " +++++++++++ libGL dependencies are not updated"
+
+#else
+
+#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
+
+ if test `uname -m` = "x86_64" ; then
+ libGLpath=/usr/lib64/libGL.la
+ else
+ libGLpath=/usr/lib/libGL.la
+ fi
+ sed -e "s%$libGLpath%""%g" \
+ libTKOpenGl.la > libTKOpenGl.la.new
+ mv -f libTKOpenGl.la.new libTKOpenGl.la
+
+# 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
+#fi
+
+# to generate environment script for sources
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="CAS-6.2.1sp2"
+export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT}_SRC
+source ./common.sh
+$PROCEDURE
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${COMPONENT_ROOT_DIR}" ]; then
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
# There is no possibility to check version number
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${FILTER_ROOT_DIR}" ]; then
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${GEOM_ROOT_DIR}" ]; then
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${GHS3DPLUGIN_ROOT_DIR}" ]; then
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${GHS3DPRLPLUGIN_ROOT_DIR}" ]; then
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${GUI_ROOT_DIR}" ]; then
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${HELLO_ROOT_DIR}" ]; then
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
# No way to check version!
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
# No way to check version!
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${HexoticPLUGIN_ROOT_DIR}" ]; then
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${KERNEL_ROOT_DIR}" ]; then
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${LIGHT_ROOT_DIR}" ]; then
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${MED_ROOT_DIR}" ]; then
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${MULTIPR_ROOT_DIR}" ]; then
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${NETGENPLUGIN_ROOT_DIR}" ]; then
check_job ${PRODUCT_DIR}/INSTALL.LOG python setup.py install --prefix=${PRODUCT_DIR}
- if test `uname -m` = "x86_64" ; then
- cd ${PRODUCT_DIR}; ln -sf lib64 lib
- fi
-
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR};
# remove sources and temporary files after building
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${PYCALCULATOR_ROOT_DIR}" ]; then
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${PYHELLO_ROOT_DIR}" ]; then
check_job ${PRODUCT_DIR}/MAKE.LOG make
check_job ${PRODUCT_DIR}/INSTALL.LOG make install
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR};
# remove sources and temporary files after building
source ${INSTALL_WORK}/$SHRC
if test `uname -m` = "x86_64" ; then
- export PYTHON_LIB_PREFIX="64"
+# export PYTHON_LIB_PREFIX="64"
+ export PYTHON_ARCHIVE_PREFIX=""
export CFLAGS=-m64
export CXXFLAGS=-m64
PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared CFLAGS=-m64 CXXFLAGS=-m64"
check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT}
# apply patch for 64-bit platforms
-if test `uname -m` = "x86_64" ; then
- if [ -f patches/python_patch_lib64.patch ] ; then
- cp patches/python_patch_lib64.patch ${PRODUCT_SRC_DIR}
- ( cd ${PRODUCT_SRC_DIR} ; \
- patch -p1 < python_patch_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_SRC_DIR}
+# ( cd ${PRODUCT_SRC_DIR} ; \
+# patch -p1 < python_patch_lib64.patch ; \
+# rm -rf aclocal.m4 ; \
+# aclocal >& /dev/null ; \
+# autoconf >& /dev/null ; \
+# aclocal >& /dev/null ; \
+# autoconf >& /dev/null )
+# fi
+#fi
# to generate environment scripts
try_preinstalled
fi
done
-if test `uname -m` = "x86_64" ; then
- ( cd ${PRODUCT_DIR}; ln -sf lib64 lib )
-fi
-
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR};
# remove sources and temporary files after building
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${RANDOMIZER_ROOT_DIR}" ]; then
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
# There is no possibility to check version number
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${SIERPINSKY_ROOT_DIR}" ]; then
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${SMESH_ROOT_DIR}" ]; then
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${SUPERV_ROOT_DIR=}" ]; then
check_job ${PRODUCT_DIR}/MAKE.LOG make
check_job ${PRODUCT_DIR}/INSTALL.LOG make install
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR};
# remove sources and temporary files after building
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${VISU_ROOT_DIR}" ]; then
# cd ${PRODUCT_DIR}/include
# ln -sf vtk-5.0 vtk
- if test `uname -m` = "x86_64" ; then
- cd ${PRODUCT_DIR}/lib; ln -s ../lib64/python${python_version} .
- fi
+# if test `uname -m` = "x86_64" ; then
+# cd ${PRODUCT_DIR}/lib; ln -s ../lib64/python${python_version} .
+# fi
# cd ${PRODUCT_DIR}/lib/python${python_version}/site-packages
# ln -sf vtk vtk_python
# cd ${PRODUCT_DIR}/lib
# ln -sf ../lib vtk
- if test `uname -m` = "x86_64" ; then
- cd ${PRODUCT_DIR}/lib64; ln -sf ../lib/* .
- fi
+# if test `uname -m` = "x86_64" ; then
+# cd ${PRODUCT_DIR}/lib64; ln -sf ../lib/* .
+# fi
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR};
# remove sources and temporary files after building
#
####################################################################################
-VERSION="4.1.1"
+VERSION="4.1.2"
check_version(){
if [ -n "${YACS_ROOT_DIR}" ]; then
chmod a+x rst2html.py
ln -sf rst2html.py rst2html
- if test `uname -m` = "x86_64" ; then
- cd ${PRODUCT_DIR}; ln -sf lib64 lib
- fi
-
# remove sources and temporary files after building
if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
# build sources
cd ${PRODUCT_SRC_DIR}
test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-# vsr: fix a bug on Mandrake-10.1: wrong qt library reference
-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: removed --with-doxywizard option (not compilable on some platforms)
+
check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix ${PRODUCT_DIR} $f_install
GCC=`which gcc`
cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
check_job ${PRODUCT_DIR}/MAKE.LOG make
check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
-#vsr : disable make docs steps because of bugs in make procedure
-#which epstopdf >/dev/null 2>&1; ISFOUND=$?
-#if [ ${ISFOUND} -eq 0 ] ; then which dot >/dev/null 2>&1; ISFOUND=$?; fi
-#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 <<EOF
-#Can't find \"epstopdf\", \"latex\" or another documentation tool on the computer.
-#doxygen documentation can not be built!
-#SALOME DOCUMENTATION MIGHT NOT BE BUILT ALSO!
-#EOF
-#fi
-
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR};
# remove sources and temporary files after building
check_job ${PRODUCT_DIR}/MAKE.LOG make
check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR};
# remove sources and temporary files after building
check_job ${PRODUCT_DIR}/MAKE.LOG make
check_job ${PRODUCT_DIR}/INSTALL.LOG make install
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR};
# remove sources and temporary files after building
check_job ${PRODUCT_DIR}/MAKE.LOG make
check_job ${PRODUCT_DIR}/INSTALL.LOG make install
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR};
# remove sources and temporary files after building
test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
#vsr: provide additional flags for f95 (Mandriva 2006.0, Fedora Core 4)
-is_mandriva=0
+is_mandriva2006=0
is_mandriva2007=0
is_mandriva2008=0
-is_fedora=0
-if [ -e /etc/redhat-release ] ; then
- grep -e "Mandriva Linux release 2006.0" /etc/redhat-release > /dev/null
- if [ $? == 0 ] ; then is_mandriva=1 ; fi
- grep -e "Mandriva Linux release 2007.0" /etc/redhat-release > /dev/null
+is_debian40=0
+is_fedora4=0
+is_fedora6=0
+
+if [ -e /etc/issue ] ; then
+ grep -e "Mandriva Linux release 2006.0" /etc/issue > /dev/null
+ if [ $? == 0 ] ; then is_mandriva2006=1 ; fi
+ grep -e "Mandriva Linux release 2007.0" /etc/issue > /dev/null
if [ $? == 0 ] ; then is_mandriva2007=1 ; fi
- grep -e "Mandriva Linux release 2008.0" /etc/redhat-release > /dev/null
+ grep -e "Mandriva Linux release 2008.0" /etc/issue > /dev/null
if [ $? == 0 ] ; then is_mandriva2008=1 ; fi
- grep -e "Fedora Core release 4" /etc/redhat-release > /dev/null
- if [ $? == 0 ] ; then is_fedora=1 ; fi
+ grep -e "Debian GNU/Linux 4.0" /etc/issue > /dev/null
+ if [ $? == 0 ] ; then is_debian40=1 ; fi
+ grep -e "Fedora Core release 4" /etc/issue > /dev/null
+ if [ $? == 0 ] ; then is_fedora4=1 ; fi
+ grep -e "Fedora Core release 6" /etc/issue > /dev/null
+ if [ $? == 0 ] ; then is_fedora6=1 ; fi
fi
-if [ $is_mandriva2007 == 1 ] || [ $is_mandriva2007 == 1 ] ; then
+if [ $is_mandriva2007 == 1 ] || [ $is_mandriva2008 == 1 ] || [ $is_fedora6 == 1 ] ; then
chmod +w ./Makefile.am
mv Makefile.am Makefile.am.orig
sed -e 's/ include src tests tools doc / include src tools doc /g' Makefile.am.orig > Makefile.am
fi
-if [ $is_mandriva == 1 ] || [ $is_mandriva2007 == 1 ] || [ $is_mandriva2008 == 1 ] || [ $is_fedora == 1 ] ; then
+if [ $is_mandriva2006 == 1 ] || [ $is_mandriva2007 == 1 ] || [ $is_mandriva2008 == 1 ] || [ $is_fedora4 == 1 ] || [ $is_fedora6 == 1 ] || [ $is_debian40 == 1 ] ; then
if test `uname -m` = "x86_64" ; then
echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} FFLAGS='-g -O2 -ffixed-line-length-none' CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG"
./configure --prefix=${PRODUCT_DIR} FFLAGS="-g -O2 -ffixed-line-length-none" CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog
check_job ${PRODUCT_DIR}/MAKE.LOG make
check_job ${PRODUCT_DIR}/INSTALL.LOG make install
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR};
# remove sources and temporary files after building
check_job ${PRODUCT_DIR}/MAKE.LOG make
cp -f msg2qm ${PRODUCT_DIR}
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR};
# remove sources and temporary files after building
done
cp -f ${PRODUCT_SRC_DIR}/libsrc/include/mystdlib.h ${PRODUCT_SRC_DIR}/libsrc/include/mydefs.hpp ${PRODUCT_DIR}/include
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR};
# remove sources and temporary files after building
mkdir build
cd build
-if [ -e /etc/redhat-release ] ; then
- grep -e "Red Hat" /etc/redhat-release > /dev/null
- if [ $? == 0 ] ; then is_redhat=1 ; fi
-fi
-
-if [ "X$is_redhat" == "X1" ] ; then
- check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORB.LOG ../configure --prefix=${PRODUCT_DIR} --disable-ipv6
-else
- check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORB.LOG ../configure --prefix=${PRODUCT_DIR}
-fi
+check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORB.LOG ../configure --prefix=${PRODUCT_DIR}
GCC=`which gcc`
cat >> ${PRODUCT_DIR}/MAKE_OMNIORB.LOG <<EOF
check_job ${PRODUCT_DIR}/MAKE_OMNIORB.LOG make
check_job ${PRODUCT_DIR}/INSTALL_OMNIORB.LOG make install
-if test `uname -m` = "x86_64" ; then
-cd ${PRODUCT_DIR}/lib; ln -s ../lib64/python2.4 .
-fi
-
# install omniORBpy
cd ${PRODUCT_SRC_DIR}/omniORBpy-3.0_SRC
mkdir build
mv -f _omniidlrun.py omniidlrun.py
chmod a+x omniidlrun.py
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR}
# remove sources and temporary files after building
check_job ${PRODUCT_DIR}/MAKE.LOG make
check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
-if test `uname -m` = "x86_64" ; then
- cd ${PRODUCT_DIR}; ln -sf lib lib64
-fi
-
export INSTALL_ROOT=$INSTALL_ROOT_BACKUP
for b in `find bin -mindepth 1 -maxdepth 1 -name "*"`; do
print_env_bin()
{
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then
- LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then
- LIB_PREFIX=""
-else
- LIB_PREFIX=64
-fi
+
cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
#$DELIM ${PRODUCT_TYPE} $DELIM
export SIPDIR=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
export PATH=\${SIPDIR}/bin:\${PATH}
-export PYTHONPATH=\${SIPDIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
-export LD_LIBRARY_PATH=\${SIPDIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages:\${LD_LIBRARY_PATH}
+export PYTHONPATH=\${SIPDIR}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
+export LD_LIBRARY_PATH=\${SIPDIR}/lib/python\${PYTHON_VERSION}/site-packages:\${LD_LIBRARY_PATH}
##
EOF
(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
cd ${PRODUCT_SRC_DIR}
if test `uname -m` = "x86_64" ; then
- SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR}/bin -d ${PRODUCT_DIR}/lib64/python${PYTHON_VERSION}/site-packages -e ${PRODUCT_DIR}/include/python${PYTHON_VERSION} -v ${PRODUCT_DIR}/sip -p linux-g++-64"
+ SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR}/bin -d ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages -e ${PRODUCT_DIR}/include/python${PYTHON_VERSION} -v ${PRODUCT_DIR}/sip -p linux-g++-64"
else
SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR}/bin -d ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages -e ${PRODUCT_DIR}/include/python${PYTHON_VERSION} -v ${PRODUCT_DIR}/sip"
fi
# modify sipconfig.py file
if [ -n "${PYTHONHOME}" ] && [ -n "${QTDIR}" ] ; then
- if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then
- LIB_PREFIX=64
- elif [ -d ${PRODUCT_DIR}/lib ] ; then
- LIB_PREFIX=""
- else
- LIB_PREFIX=64
- fi
- cd ${PRODUCT_DIR}/lib${LIB_PREFIX}/python${PYTHON_VERSION}/site-packages
+
+ cd ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages
python_version=`python -V 2>&1 | awk '{print $2}' | awk -F. '{printf("0x%02d%02d%02d",$1,$2,$3)}'`
qt_version=`grep -e "^#define[[:space:]]\+QT_VERSION[[:space:]]\+" ${QTDIR}/include/qglobal.h | sed -e 's%^#define[[:space:]\+QT_VERSION[[:space:]]\+\(.*\)$%\1%g'`
sed -e "s%\('default_bin_dir':[[:space:]]*\).*%\1'${PYTHONHOME}/bin',%g" sipconfig.py > sipconfig.py.1
sed -e "s%\('default_sip_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/sip',%g" sipconfig.py > sipconfig.py.1
sed -e "s%\('sip_bin':[[:space:]]*\).*%\1'${PRODUCT_DIR}/bin/sip',%g" sipconfig.py.1 > sipconfig.py
sed -e "s%\('sip_inc_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/include/python${PYTHON_VERSION}',%g" sipconfig.py > sipconfig.py.1
- sed -e "s%\('sip_mod_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/lib${LIB_PREFIX}/python${PYTHON_VERSION}/site-packages',%g" sipconfig.py.1 > sipconfig.py
+ sed -e "s%\('sip_mod_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages',%g" sipconfig.py.1 > sipconfig.py
sed -e "s%\('qt_dir':[[:space:]]*\).*%\1'${QTDIR}',%g" sipconfig.py > sipconfig.py.1
sed -e "s%\('qt_version':[[:space:]]*\).*%\1${qt_version},%g" sipconfig.py.1 > sipconfig.py
sed -e "s%\('qt_inc_dir':[[:space:]]*\).*%\1'${QTDIR}/include',%g" sipconfig.py > sipconfig.py.1
(cd ${PRODUCT_DIR}/lib; ln -fs libtkx8.3.so libtkx.so)
(cd ${PRODUCT_DIR}/lib; ln -fs libtkx8.3.a libtkx.a)
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR}
# remove sources and temporary files after building
check_job ${PRODUCT_DIR}/MAKE.LOG make
check_job ${PRODUCT_DIR}/INSTALL.LOG make install
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR};
# remove sources and temporary files after building
