Merge from SALOME_6 branch (20/02/2013)

diff --git a/config_files/DISTENE.sh b/config_files/DISTENE.sh
index 12359f21bea6c1f82b2525fde18a1913b3172d90..bdb956ab0a62b6da63c13ea818a6142207d3b9a3 100755 (executable)
--- 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 <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export DISTENE_HOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export BLSURFHOME=\${DISTENE_HOME}/Tools/BLSurf-${BLSURF_VERSION}
-export HEXOTICHOME=\${DISTENE_HOME}/Tools/Hexotic-V${HEXOTIC_VERSION}
-export LD_LIBRARY_PATH=\${BLSURFHOME}/lib:\${LD_LIBRARY_PATH} 
-export PATH=\${HEXOTICHOME}/bin:\${DISTENE_HOME}/Tools/TetMesh-GHS3D${GHS3D41_VERSION}:\${DISTENE_HOME}/Tools/TetMesh-GHS3D${GHS3D42_VERSION}:\${PATH}
+export MESHGEMSHOME=\${DISTENE_HOME}/MeshGems-${MESHGEMS_VERSION}/Products
+export LD_LIBRARY_PATH=\${MESHGEMSHOME}/lib/Linux${PLT_SUFFIX}:\${LD_LIBRARY_PATH} 
+export PATH=\${MESHGEMSHOME}/bin/Linux${PLT_SUFFIX}:\${PATH} 
+export HEXOTICHOME=\${DISTENE_HOME}/Hexotic-${HEXOTIC_VERSION}
+export PATH=\${HEXOTICHOME}/bin/Linux${PLT_SUFFIX}:\${PATH} 
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})

diff --git a/config_files/OCCT.sh b/config_files/OCCT.sh
index fa32276193c07910fe641539f3415bb7aebd2f88..73ac34ac6793e13ae6dd9d99576c0f23ad29512e 100755 (executable)
--- a/config_files/OCCT.sh
+++ b/config_files/OCCT.sh
@@ -15,7 +15,7 @@
 #
 # Open CASCADE Technology version
 #
-OCCT_VERSION=6.5.3
+OCCT_VERSION=6.5.4
 
 check_version()
 {
@@ -179,11 +179,16 @@ if [ "$gllibdir" != "" ] ; then
        str_to_replace="-L${gllibdir} -lGL"
     fi
 
-    sed -e "s%-lGL\b%%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
+    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 9e7567950ba4b38b2eb347884e966d522797b2c9..86d7df97189b5aef2302c4a09fcebd062b9b3c1d 100755 (executable)
--- 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 53c75e9d4e752747816b6130be1701a88c7705c1..d07929f9abb9f6dd13a25eb0435d45c5b8e7b9ff 100755 (executable)
--- 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 5b0a9d27ee9de7bc1493ea8cfafaa7926d110cec..dbdb3e4c89985196449595260064f99cb03d70c4 100755 (executable)
--- 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 b8eb11b480c6c1314b0946435b4fddfc9b9ccad0..2bc207225d767d416cc0f6788b1dc53b730f9e68 100755 (executable)
--- 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 5f6164a5b458e00f76b6450a94ca3c5f9ac2437a..e76b82ae6e0ef0f5d2f1c74f49d2f53596ae495e 100755 (executable)
--- 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 88b8ad062f0efdaebc7507a8a1cc5f517ef69ec8..d17ea8035c58a62c38d771dc8f092d41e6779b35 100755 (executable)
--- 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 491f5a4510c7a52ff561aca7b5bfd8b7e7217b7d..bcaed0e585e5b86dda72ba0b43352b639e46d660 100755 (executable)
--- 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 4d41477953108704eb4e4273d56a757b9b006c43..6aec7dcf255097129093776ee00427a22e96f007 100755 (executable)
--- 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 b816e264cd1a332f139113cd7caa525ff3521fc6..5bff32221dae6611a994563b0e4a5337905ca5ed 100755 (executable)
--- 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 25f683fee92d86386fd4229dc9ffe27096e31c49..b33aed0ab363be2fb1b595219de38e6227457edf 100755 (executable)
--- 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 67a2f156fd90b6b4d74d5f84c5ada5adeaedf0a2..8d00975160e2c59179546ce32173e2d56bcd9cb6 100755 (executable)
--- a/config_files/omniORB.sh
+++ b/config_files/omniORB.sh
@@ -67,17 +67,16 @@ fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export OMNIORBDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export OMNIORB_CONFIG=\${OMNIORBDIR}/.omniORB.cfg
 export PYTHONPATH=\${OMNIORBDIR}/lib:\${OMNIORBDIR}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
 export PATH=\$OMNIORBDIR/bin:\$PATH
 export LD_LIBRARY_PATH=\$OMNIORBDIR/lib:\$LD_LIBRARY_PATH 
 ##
 EOF
-if [ $PROCEDURE != "try_preinstalled" ] && [ -w ${PRODUCT_DIR} ] ; then
-    cat > ${PRODUCT_DIR}/.omniORB.cfg <<EOF
-InitRef = NameService=corbaname::`hostname`:2810
-EOF
-fi
+#if [ $PROCEDURE != "try_preinstalled" ] && [ -w ${PRODUCT_DIR} ] ; then
+#    cat > ${PRODUCT_DIR}/.omniORB.cfg <<EOF
+#InitRef = NameService=corbaname::`hostname`:2810
+#EOF
+#fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 }

diff --git a/config_files/xdata.sh b/config_files/xdata.sh
index 52612ed77c99663c0fe4ffbfdfb4447c4a553e3e..5c53098451e8a6e0a83eb94c9ccf8b231b1e4833 100755 (executable)
--- a/config_files/xdata.sh
+++ b/config_files/xdata.sh
@@ -15,7 +15,7 @@
 #
 # xdata version
 #
-XDATA_VERSION=0.9.3
+XDATA_VERSION=0.9.6
 
 check_version(){
 # No way to check version!