From e2d6492f94d2de31506198c5020e764d6de783d3 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 20 Feb 2013 16:15:34 +0000 Subject: [PATCH] Merge from SALOME_6 branch (20/02/2013) --- config_files/DISTENE.sh | 23 +++++++++-------------- config_files/OCCT.sh | 17 +++++++++++------ config_files/PARAVIS.sh | 2 +- config_files/Python.sh | 2 +- config_files/common.sh | 11 +++++++++++ config_files/freetype.sh | 7 ++++--- config_files/ftgl.sh | 20 ++++++++++++++------ config_files/hdf5.sh | 4 ++++ config_files/homard.sh | 2 +- config_files/libBatch.sh | 2 +- config_files/med.sh | 18 +++++++++++------- config_files/netgen.sh | 2 +- config_files/omniORB.sh | 11 +++++------ config_files/xdata.sh | 2 +- 14 files changed, 75 insertions(+), 48 deletions(-) diff --git a/config_files/DISTENE.sh b/config_files/DISTENE.sh index 12359f2..bdb956a 100755 --- a/config_files/DISTENE.sh +++ b/config_files/DISTENE.sh @@ -13,18 +13,12 @@ #################################################################################### # -# ghs3d &blsurf versions +# products versions # +MESHGEMS_VERSION=1.0 +HEXOTIC_VERSION=1.0 if test `uname -m` = "x86_64" ; then -GHS3D41_VERSION=4.1_64 -GHS3D42_VERSION=4.2_64 -BLSURF_VERSION=3.1_64 -HEXOTIC_VERSION=1.0_64 -else -GHS3D41_VERSION=4.1_32 -GHS3D42_VERSION=4.2_32 -BLSURF_VERSION=3.1_32 -HEXOTIC_VERSION=1.0_32 + PLT_SUFFIX="_64" fi @@ -38,10 +32,11 @@ print_env_bin() cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < libTKOpenGl.la.new - mv -f libTKOpenGl.la.new libTKOpenGl.la + la_files=`find . -name "*.la"` + for la_file in ${la_files} XXX ; do + if [ "${la_file}" = "XXX" ] ; then continue; fi + grep -e "libGL.la" ${la_file} >& /dev/null || grep -e "-lGL\b" ${la_file} >& /dev/null && + sed -e "s%-lGL\b%%g" \ + -e "s%[^[:space:]']*libGL.la[[:space:]]%%g" \ + -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \ + ${la_file} > ${la_file}.new && + mv -f ${la_file}.new ${la_file} + done fi #du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log diff --git a/config_files/PARAVIS.sh b/config_files/PARAVIS.sh index 9e75679..86d7df9 100755 --- a/config_files/PARAVIS.sh +++ b/config_files/PARAVIS.sh @@ -38,7 +38,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then export PATH=\${PARAVIS_ROOT_DIR}/bin/salome:\${PATH} export LD_LIBRARY_PATH=\${PARAVIS_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH} export PYTHONPATH=\${PARAVIS_ROOT_DIR}/bin/salome:\${PARAVIS_ROOT_DIR}/lib/salome:\${PARAVIS_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} - export PV_PLUGIN_PATH=\${PARAVIS_ROOT_DIR}/lib/paraview:\${PV_PLUGIN_PATH} + export PV_PLUGIN_PATH="\${PARAVIS_ROOT_DIR}/lib/paraview;\${PV_PLUGIN_PATH}" fi fi ## diff --git a/config_files/Python.sh b/config_files/Python.sh index 53c75e9..d07929f 100755 --- a/config_files/Python.sh +++ b/config_files/Python.sh @@ -91,7 +91,7 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} cd ${PRODUCT_SRC_DIR} export PYTHON_ARCHIVE_PREFIX="" -PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared --without-test --with-libs=-lstdc++" +PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared --without-test --with-libs=-lstdc++ --without-pymalloc" ### --with-pydebug ### (for debug) tcl_dir=`where_tcl` diff --git a/config_files/common.sh b/config_files/common.sh index 5b0a9d2..dbdb3e4 100755 --- a/config_files/common.sh +++ b/config_files/common.sh @@ -755,6 +755,12 @@ expatdir=${EXPAT_ROOT}/lib paraviewdir=`printenv PVHOME`/lib # qt dir qtdir=`printenv QTDIR`/lib +# distene meshgems dir +if test `uname -m` = "x86_64" ; then + mgemsdir=`printenv MESHGEMSHOME`/lib/Linux_64 +else + mgemsdir=`printenv MESHGEMSHOME`/lib/Linux +fi for l in X ${la_files}; do @@ -920,6 +926,11 @@ if [ "$l" != "X" ] ; then sed -i "s%[[:space:]]\(-L\)\?[^[:space:]]*ParaView-[0-9]\.[0-9]\+\.[0-9]/lib% \1${paraviewdir}%g" $l fi + # . process DISTENE MeshGems dependencies + if [ -n "${mgemsdir}" ] && [ -d "${mgemsdir}" ] ; then + sed -i "s%[[:space:]]\(-L\)\?[^[:space:]]*MeshGems-[0-9.]\+/Products/lib/Linux\(_64\)\?% \1${mgemsdir}%g" $l + fi + fi done diff --git a/config_files/freetype.sh b/config_files/freetype.sh index b8eb11b..2bc2072 100755 --- a/config_files/freetype.sh +++ b/config_files/freetype.sh @@ -15,7 +15,7 @@ # # freetype version # -FREETYPE_VERSION=2.3.7 +FREETYPE_VERSION=2.4.10 check_version() { @@ -120,8 +120,9 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR} ### modifing la files -cd ${PRODUCT_DIR}/lib -sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g;" libfreetype.la +if [ -f ${PRODUCT_DIR}/lib/libfreetype.la ] ; then + ( cd ${PRODUCT_DIR}/lib && sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g;" libfreetype.la ) +fi # modify pkgconfig if [ -d ${PRODUCT_DIR}/lib/pkgconfig ] ; then diff --git a/config_files/ftgl.sh b/config_files/ftgl.sh index 5f6164a..e76b82a 100755 --- a/config_files/ftgl.sh +++ b/config_files/ftgl.sh @@ -15,7 +15,7 @@ # # ftgl version # -FTGL_VERSION=2.1.2 +FTGL_VERSION=2.1.3 check_version() { @@ -61,6 +61,12 @@ source ${INSTALL_WORK}/$SHRC # unpack check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT} +# patch for problem with generation of latex documentation on some platforms: +patch_for_latex=1 +if [ "${patch_for_latex}" = "1" ] ; then + ( cd ${PRODUCT_SRC_DIR}/docs && sed -i "s%pdfdoc_DATA =%pdfdoc_DATA = #%g" Makefile.in ) +fi + # to generate environment scripts try_preinstalled } @@ -73,12 +79,12 @@ install_source # build sources test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} -cd ${PRODUCT_SRC_DIR}/unix +cd ${PRODUCT_SRC_DIR} FTGL_CONFIGURE_OPTIONS="" FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --enable-shared=yes --prefix=${PRODUCT_DIR}" -FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-freetype-prefix=${FREETYPEDIR}" +FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-ft-prefix=${FREETYPEDIR}" FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-gl-inc=/usr/include" if test `uname -m` = "x86_64" ; then @@ -118,9 +124,11 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR} ### modifing la files -cd ${PRODUCT_DIR}/lib -sed -i "s%\(.*\)\([[:space:]].*libfreetype.la\)\(.*\)%\1 -lfreetype\3%g;s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libftgl.la -sed -i "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${FREETYPEDIR}/lib \3%g" libftgl.la +if [ -f ${PRODUCT_DIR}/lib/libftgl.la ] ; then + cd ${PRODUCT_DIR}/lib + sed -i "s%\(.*\)\([[:space:]].*libfreetype.la\)\(.*\)%\1 -lfreetype\3%g;s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libftgl.la + sed -i "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${FREETYPEDIR}/lib \3%g" libftgl.la +fi # modify pkgconfig if [ -d ${PRODUCT_DIR}/lib/pkgconfig ] ; then diff --git a/config_files/hdf5.sh b/config_files/hdf5.sh index 88b8ad0..d17ea80 100755 --- a/config_files/hdf5.sh +++ b/config_files/hdf5.sh @@ -16,6 +16,10 @@ # HDF5 version # HDF5_VERSION=1.8.8 +# +# Default API version for hdf5: 1.6 +# +V16_COMPATIBILITY=yes check_version() { diff --git a/config_files/homard.sh b/config_files/homard.sh index 491f5a4..bcaed0e 100755 --- a/config_files/homard.sh +++ b/config_files/homard.sh @@ -15,7 +15,7 @@ # # homard version # -HOMARD_VERSION=10.4 +HOMARD_VERSION=10.5 # # homard's bin directory (platform) diff --git a/config_files/libBatch.sh b/config_files/libBatch.sh index 4d41477..6aec7dc 100755 --- a/config_files/libBatch.sh +++ b/config_files/libBatch.sh @@ -12,7 +12,7 @@ # #################################################################################### -LIBBATCH_VERSION=1.5.0 +LIBBATCH_VERSION=1.6.0 check_version(){ # No way to check version! diff --git a/config_files/med.sh b/config_files/med.sh index b816e26..5bff322 100755 --- a/config_files/med.sh +++ b/config_files/med.sh @@ -15,7 +15,7 @@ # # med library version # -MED_VERSION=3.0.5 +MED_VERSION=3.0.6 check_version() { @@ -82,12 +82,13 @@ install_source cd ${PRODUCT_SRC_DIR} test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} +# --disable-mesgerr if test `uname -m` = "x86_64" ; then - echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS='-g -O2 -fPIC' CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG" - ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS="-g -O2 -fPIC" CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog + echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} FFLAGS='-g -O2 -ffixed-line-length-none -fPIC' CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG" + ./configure --prefix=${PRODUCT_DIR} FFLAGS="-g -O2 -ffixed-line-length-none -fPIC" CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog else - echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS='-g -O2' >> ${PRODUCT_DIR}/CONFIGURE.LOG" - ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS="-g -O2" >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog + echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} FFLAGS='-g -O2 -ffixed-line-length-none' >> ${PRODUCT_DIR}/CONFIGURE.LOG" + ./configure --prefix=${PRODUCT_DIR} FFLAGS="-g -O2 -ffixed-line-length-none" >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog fi if [ "$?" -ne "0" ] ; then cat ${PRODUCT_DIR}/CONFIGURE.LOG @@ -107,8 +108,11 @@ check_job ${PRODUCT_DIR}/INSTALL.LOG make install cd ${PRODUCT_DIR}/lib ### patch badly created libmedimport.la -### this pb should be fixed in med 3.0.5 or newer version -sed -i "s%\(.*\)\([[:space:]].*-L../../src/\)\(.*\)%\1\3%g" libmedimport.la +### fixed in med 3.0.6 +need_patch_la=0 +if [ "${need_patch_la}" = "1" ] ; then + sed -i "s%\(.*\)\([[:space:]].*-L../../src/\)\(.*\)%\1\3%g" libmedimport.la +fi cd ${PRODUCT_DIR}; diff --git a/config_files/netgen.sh b/config_files/netgen.sh index 25f683f..b33aed0 100755 --- a/config_files/netgen.sh +++ b/config_files/netgen.sh @@ -97,7 +97,7 @@ NETGEN_CONFIGURE_OPTIONS="${NETGEN_CONFIGURE_OPTIONS} --with-tcl=${TCLHOME}/lib if test `uname -m` = "x86_64" ; then ./configure ${NETGEN_CONFIGURE_OPTIONS} CXXFLAGS='-O2 -m64' >> ${PRODUCT_DIR}/CONFIGURE.LOG else - ./configure ${NETGEN_CONFIGURE_OPTIONS} CXXFLAGS=-O2 >> ${PRODUCT_DIR}/CONFIGURE.LOG + ./configure ${NETGEN_CONFIGURE_OPTIONS} CXXFLAGS=-O0 >> ${PRODUCT_DIR}/CONFIGURE.LOG fi # compile diff --git a/config_files/omniORB.sh b/config_files/omniORB.sh index 67a2f15..8d00975 100755 --- a/config_files/omniORB.sh +++ b/config_files/omniORB.sh @@ -67,17 +67,16 @@ fi cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${PRODUCT_DIR}/.omniORB.cfg < ${PRODUCT_DIR}/.omniORB.cfg <