Update

diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index 8c34573623592059cf937b26e27565480672b309..bcb75f8252bc82e06c1c86af1a5328ccb5c2f823 100755 (executable)
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -936,6 +936,7 @@
       <dep>Doxygen</dep>
       <dep>Graphviz</dep>
       <dep>docutils</dep>
+      <dep>DISTENE</dep>
       <dep>KERNEL</dep>
       <dep>GUI</dep>
       <dep>GEOM</dep>

diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index 2982daa485f61d79226a32a6c6f76db5da5029e5..4fb34ea060e81953e76d2776bd4c0b92f9119f1d 100755 (executable)
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -936,6 +936,7 @@
       <dep>Doxygen</dep>
       <dep>Graphviz</dep>
       <dep>docutils</dep>
+      <dep>DISTENE</dep>
       <dep>KERNEL</dep>
       <dep>GUI</dep>
       <dep>GEOM</dep>

diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index 150b9455f1e4863f5ab48512d859bb663db908a4..911e05349a8e7b62a5bc48594cf7c643d14f6d01 100755 (executable)
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -936,6 +936,7 @@
       <dep>Doxygen</dep>
       <dep>Graphviz</dep>
       <dep>docutils</dep>
+      <dep>DISTENE</dep>
       <dep>KERNEL</dep>
       <dep>GUI</dep>
       <dep>GEOM</dep>

diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index df3b89d5f238146504d4179c8beb5b94cdf4a44a..0b9f95cfc55b354d4f3daba168d9588649eabd7e 100755 (executable)
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -936,6 +936,7 @@
       <dep>Doxygen</dep>
       <dep>Graphviz</dep>
       <dep>docutils</dep>
+      <dep>DISTENE</dep>
       <dep>KERNEL</dep>
       <dep>GUI</dep>
       <dep>GEOM</dep>

diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index 6ff26240fc8fa4b29495e7ae9ec19a539ad0f36b..335882726db416fff03fd7702c7a542eba05a882 100755 (executable)
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -936,6 +936,7 @@
       <dep>Doxygen</dep>
       <dep>Graphviz</dep>
       <dep>docutils</dep>
+      <dep>DISTENE</dep>
       <dep>KERNEL</dep>
       <dep>GUI</dep>
       <dep>GEOM</dep>

diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 8fc5c3308952b68bfd06e0803cf2ee04e4e9669c..9f0683c00d57fdf79b1e1eb1552b552b0e40f1b8 100755 (executable)
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -936,6 +936,7 @@
       <dep>Doxygen</dep>
       <dep>Graphviz</dep>
       <dep>docutils</dep>
+      <dep>DISTENE</dep>
       <dep>KERNEL</dep>
       <dep>GUI</dep>
       <dep>GEOM</dep>

diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index 3122ed7a22bf15aaa83d7cda648e9e9f273ce2c5..0c66dd5d03962e368c55fef396f658c5ab9b7f37 100755 (executable)
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -61,7 +61,7 @@
                    script="MED.sh"/>
     </product>
     <product name="SMESH"
-             type="component"
+             type="compoent"
             description="SALOME platform SMESH module">
       <installation os="Mandriva 2010.0"
                     version="6.4.0" 
@@ -922,6 +922,7 @@
       <dep>OmniORB</dep>
       <dep>Doxygen</dep>
       <dep>Graphviz</dep>
+      <dep>DISTENE</dep>
       <dep>docutils</dep>
       <dep>KERNEL</dep>
       <dep>GUI</dep>

diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index d30bb2eaa22f4e72f910d53f77f44dca90c2d2d3..68cfaf9c82918ee72fd7be5e06c38102cdf0159b 100755 (executable)
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -923,6 +923,7 @@
       <dep>Doxygen</dep>
       <dep>Graphviz</dep>
       <dep>docutils</dep>
+      <dep>DISTENE</dep>
       <dep>KERNEL</dep>
       <dep>GUI</dep>
       <dep>GEOM</dep>

diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index 6f147d519d94175e173d6b2a49a8206dbe52b4ca..eb3ce81559781c80716cde1372adfd9472f7a7ae 100755 (executable)
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -936,6 +936,7 @@
       <dep>Doxygen</dep>
       <dep>Graphviz</dep>
       <dep>docutils</dep>
+      <dep>DISTENE</dep>
       <dep>KERNEL</dep>
       <dep>GUI</dep>
       <dep>GEOM</dep>

diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index 4896c29fd093cfc39d2185dbbcf2b13024ca5ce5..f1e7480b49b2f7963b36c12fbd63213490278a26 100755 (executable)
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -936,6 +936,7 @@
       <dep>Doxygen</dep>
       <dep>Graphviz</dep>
       <dep>docutils</dep>
+      <dep>DISTENE</dep>
       <dep>KERNEL</dep>
       <dep>GUI</dep>
       <dep>GEOM</dep>

diff --git a/config_files/common.sh b/config_files/common.sh
index daa7a7173f77b6cfaa898c41bf64e90b2609ab53..d950f943a6dbe6438f6cfa93335245259c629d84 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -671,6 +671,7 @@ ldir=`pwd`
 la_files=`find . -name "*.la"`
 
 for l in X ${la_files}; do
+
 if [ "$l" != "X" ] ; then
     d=`dirname $l`
     l=`basename $l`
@@ -680,38 +681,79 @@ if [ "$l" != "X" ] ; then
     for mod in $SALOME_MODULES; do
        moddir=`printenv ${mod}_ROOT_DIR`
        if [ -n "${moddir}" ] ; then
-           #echo $l $mod $moddir
-#          sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${mod}[^[:space:]/]*/\(lib\|lib64\)% \1${moddir}/${myldir}%g" $l > $l"_"
-#          sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${mod}[^[:space:]/]*/lib% \1${moddir}/lib%g" $l > $l"_"
            sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${mod}[1]\?/lib% \1${moddir}/lib%g" \
                -e "s%^libdir='[^[:space:]]*${mod}[1]\?/\(lib.*\)'%libdir='${moddir}/\1'%g" $l > $l"_"
            mv -f $l"_" $l
-#          for mod1 in $SALOME_MODULES; do
-#              sed     -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${mod1}[^[:space:]]*/${mod1}_build%%g" $l > $l"_"
-#              mv -f $l"_" $l
-#          done
        fi
     done
 
-    # . process netgen dependencies (WARNING! It should be before CAS.CADE)
-       netgendir=`printenv NETGENHOME`/lib
-        sed -e "s%[[:space:]]-L[^[:space:]]*Netgen[^[:space:]]*/lib\?% -L${netgendir}%g" \
-            -e "s%[[:space:]][^[:space:]]*Netgen[^[:space:]]*/lib/lib\?% ${netgendir}/lib%g" $l > $l"_"
-       chmod -f --reference=$l $l"_"
-       mv -f $l"_" $l          
+   # . process CASCASDE products dependencies
+    netgendir=`printenv NETGENHOME`
+    freetypedir=`printenv FREETYPEDIR`
+    ftgldir=`printenv FTGLDIR`
+    gl2psdir=`printenv GL2PSHOME`
+    freeimagedir=`printenv FREEIMAGEDIR`
+    tbbbasedir=`printenv TBBHOME`
+    cgnslibdir=`printenv CGNSHOME`
+
+    TBBKERNEL='cc4.1.0_libc2.4_kernel2.6.16.21'
+    if test `uname -m` = "x86_64" ; then
+       export TBBMODE="intel64/$TBBKERNEL"
+    else
+       export TBBMODE="ia32/$TBBKERNEL"
+    fi
+
+    tbbdir=${tbbbasedir}/lib/$TBBMODE
+
+       if [ -n "${netgendir}" ] && [ -d "${netgendir}" ] ; then
+           sed -e "s%\(.*\)\([[:space:]].*-L.*/netgen-[0-9]\.[0-9]\.[0-9][0-9]/lib[[:space:]]\)\(.*\)%\1 -L${netgendir}/lib \3%g" \
+               -e 's%\(.*\)\([[:space:]].*libnglib.la\)\(.*\)%\1 -lnglib \3%g' $l > _$l
+           mv -f _$l $l
+       fi
+       chmod a+x $l    
+       if [ -n "${freetypedir}" ] && [ -d "${freetypedir}" ] ; then
+           sed -e "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freetypedir}/lib \3%g" \
+               -e 's%\(.*\)\([[:space:]].*libfreetype.la\)\(.*\)%\1 -lfreetype \3%g' $l > _$l
+           mv -f _$l $l
+       fi
+       chmod a+x $l
+       if [ -n "${ftgldir}" ] && [ -d "${ftgldir}" ] ; then
+           sed -e "s%\(.*\)\([[:space:]].*-L.*/ftgl-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${ftgldir}/lib \3%g" \
+               -e 's%\(.*\)\([[:space:]].*libftgl.la\)\(.*\)%\1 -lftgl \3%g' $l > _$l
+           mv -f _$l $l
+       fi
+       chmod a+x $l
+       if [ -n "${gl2psdir}" ] && [ -d "${gl2psdir}" ] ; then
+           sed -e "s%\(.*\)\([[:space:]].*-L.*/gl2ps-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${gl2psdir}/lib \3%g" $l > _$l
+           mv -f _$l $l
+       fi
+       chmod a+x $l
+       if [ -n "${freeimagedir}" ] && [ -d "${freeimagedir}" ] ; then
+           sed -e "s%\(.*\)\([[:space:]].*-L.*/freeimage-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freeimagedir}/lib \3%g" $l > _$l
+           mv -f _$l $l
+       fi
+       chmod a+x $l
+       if [ -n "${freeimagedir}" ] && [ -d "${freeimagedir}" ] ; then
+           sed -e "s%\(.*\)\([[:space:]].*-L.*/freeimage-[0-9]\.[0-9][0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freeimagedir}/lib \3%g" $l > _$l
+           mv -f _$l $l
+       fi
+       chmod a+x $l
+       if [ -n "${tbbdir}" ] && [ -d "${tbbdir}" ] ; then
+           sed -e "s%\(.*\)\([[:space:]].*-L.*/tbb[^[:space:]]*/lib[^[:space:]]*\)\(.*\)%\1 -L${tbbdir} \3%g" $l > _$l
+           mv -f _$l $l
+       fi
+       chmod a+x $l
+       if [ -n "${cgnslibdir}" ] && [ -d "${cgnslibdir}" ] ; then
+           sed -e "s%\(.*\)\([[:space:]].*-L.*/cgnslib-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${cgnslibdir}/lib \3%g" $l > _$l
+           mv -f _$l $l
+       fi
+       chmod a+x $l
 
     # . process CAS.CADE dependencies
     casdir=`printenv CASROOT`/lib
     if [ ! -d ${casdir} ] ; then casdir=`printenv CASROOT`/Linux/lib ; fi
     if [ ! -d ${casdir} ] ; then casdir=`printenv CASROOT`/lin/lib ; fi
     if [ -n "${CASROOT}" ] && [ -d "${casdir}" ] ; then
-       # echo $l $CASROOT $casdir
-#      sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*\(OCT\|CAS\)[^[:space:]/]*/Linux/lib% \1${casdir}%g" \
-#          -e "s%[[:space:]]\(-L\)\?[^[:space:]]*\(OCT\|CAS\)[^[:space:]/]*/lin/lib% \1${casdir}%g"   \
-#          -e "s%[[:space:]]\(-L\)\?[^[:space:]]*\(OCT\|CAS\)[^[:space:]/]*/lib% \1${casdir}%g" $l > $l"_"
-#      mv -f $l"_" $l
-#      sed -e "s%-L[^[:space:]]*OCCT[^[:space:]]*/install/lib%-L${casdir}%g" \
-#          -e "s%[^[:space:]]*OCCT[^[:space:]]*/install/lib/%${casdir}/%g" $l > $l"_"
         sed -e "s%-L[^[:space:]]*OCCT[^[:space:]]*/install/lib%-L${casdir}%g" \
            -e "s%[^[:space:]]*OCCT[^[:space:]]*/install/lib/%${casdir}/%g"   \
            -e "s%[[:space:]]-L[^[:space:]]*\(OCCT\|CAS\)[^[:space:]]*/lib\?% -L${CASROOT}/lib%g" \
@@ -830,13 +872,6 @@ if [ "$l" != "X" ] ; then
        mv -f $l"_" $l
     fi
 
-#    # . modify libdir
-#    #sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib/salome'%g" $l > $l"_"
-#    mod=`basename $ldir | awk -F_ '{print $1}'`
-#    moddir=`printenv ${mod}_ROOT_DIR`
-#    sed -e "s%^libdir='[^[:space:]]*${mod}[^[:space:]]*/\(lib.*\)'%libdir='${moddir}/\1'%g" $l > $l"_"
-#    mv -f $l"_" $l
-
     # . process libxml dependencies
     libxmldir=`printenv LIBXML_DIR`/lib
     if [ ! -d ${libxmldir} ] ; then libxmldir=`printenv  LIBXML_DIR`/lib ; fi
@@ -899,62 +934,6 @@ if [ "$l" != "X" ] ; then
     chmod -f --reference=$l $l"_"
     mv -f $l"_" $l 
 
-    # . process CASCASDE products dependencies
-
-freetypedir=`printenv FREETYPEDIR`
-ftgldir=`printenv FTGLDIR`
-gl2psdir=`printenv GL2PSHOME`
-freeimagedir=`printenv FREEIMAGEDIR`
-tbbbasedir=`printenv TBBHOME`
-cgnslibdir=`printenv CGNSHOME`
-
-TBBKERNEL='cc4.1.0_libc2.4_kernel2.6.16.21'
-if test `uname -m` = "x86_64" ; then
-    export TBBMODE="intel64/$TBBKERNEL"
-else
-    export TBBMODE="ia32/$TBBKERNEL"
-fi
-
-tbbdir=${tbbbasedir}/lib/$TBBMODE
-
-       if [ -n "${freetypedir}" ] && [ -d "${freetypedir}" ] ; then
-           sed -e "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freetypedir}/lib \3%g" \
-               -e 's%\(.*\)\([[:space:]].*libfreetype.la\)\(.*\)%\1 -lfreetype \3%g' $l > _$l
-           mv -f _$l $l
-       fi
-       chmod a+x $l
-       if [ -n "${ftgldir}" ] && [ -d "${ftgldir}" ] ; then
-           sed -e "s%\(.*\)\([[:space:]].*-L.*/ftgl-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${ftgldir}/lib \3%g" \
-               -e 's%\(.*\)\([[:space:]].*libftgl.la\)\(.*\)%\1 -lftgl \3%g' $l > _$l
-           mv -f _$l $l
-       fi
-       chmod a+x $l
-       if [ -n "${gl2psdir}" ] && [ -d "${gl2psdir}" ] ; then
-           sed -e "s%\(.*\)\([[:space:]].*-L.*/gl2ps-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${gl2psdir}/lib \3%g" $l > _$l
-           mv -f _$l $l
-       fi
-       chmod a+x $l
-       if [ -n "${freeimagedir}" ] && [ -d "${freeimagedir}" ] ; then
-           sed -e "s%\(.*\)\([[:space:]].*-L.*/freeimage-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freeimagedir}/lib \3%g" $l > _$l
-           mv -f _$l $l
-       fi
-       chmod a+x $l
-       if [ -n "${freeimagedir}" ] && [ -d "${freeimagedir}" ] ; then
-           sed -e "s%\(.*\)\([[:space:]].*-L.*/freeimage-[0-9]\.[0-9][0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freeimagedir}/lib \3%g" $l > _$l
-           mv -f _$l $l
-       fi
-       chmod a+x $l
-       if [ -n "${tbbdir}" ] && [ -d "${tbbdir}" ] ; then
-           sed -e "s%\(.*\)\([[:space:]].*-L.*/tbb[^[:space:]]*/lib[^[:space:]]*\)\(.*\)%\1 -L${tbbdir} \3%g" $l > _$l
-           mv -f _$l $l
-       fi
-       chmod a+x $l
-       if [ -n "${cgnslibdir}" ] && [ -d "${cgnslibdir}" ] ; then
-           sed -e "s%\(.*\)\([[:space:]].*-L.*/cgnslib-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${cgnslibdir}/lib \3%g" $l > _$l
-           mv -f _$l $l
-       fi
-       chmod a+x $l
-
 fi
 done