From: inv Date: Thu, 17 Nov 2011 10:44:46 +0000 (+0000) Subject: Update X-Git-Tag: V6_4_0~14 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8845acedf22221741c3e35154c334cdc143d69af;p=tools%2Finstall.git Update --- diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml index 8c34573..bcb75f8 100755 --- a/config_Debian_4.0.xml +++ b/config_Debian_4.0.xml @@ -936,6 +936,7 @@ Doxygen Graphviz docutils + DISTENE KERNEL GUI GEOM diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml index 2982daa..4fb34ea 100755 --- a/config_Debian_4.0_64bit.xml +++ b/config_Debian_4.0_64bit.xml @@ -936,6 +936,7 @@ Doxygen Graphviz docutils + DISTENE KERNEL GUI GEOM diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml index 150b945..911e053 100755 --- a/config_Debian_5.0_64bit.xml +++ b/config_Debian_5.0_64bit.xml @@ -936,6 +936,7 @@ Doxygen Graphviz docutils + DISTENE KERNEL GUI GEOM diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml index df3b89d..0b9f95c 100755 --- a/config_Debian_6.0_64bit.xml +++ b/config_Debian_6.0_64bit.xml @@ -936,6 +936,7 @@ Doxygen Graphviz docutils + DISTENE KERNEL GUI GEOM diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml index 6ff2624..3358827 100755 --- a/config_Mandriva_2008.0.xml +++ b/config_Mandriva_2008.0.xml @@ -936,6 +936,7 @@ Doxygen Graphviz docutils + DISTENE KERNEL GUI GEOM diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml index 8fc5c33..9f0683c 100755 --- a/config_Mandriva_2008.0_64bit.xml +++ b/config_Mandriva_2008.0_64bit.xml @@ -936,6 +936,7 @@ Doxygen Graphviz docutils + DISTENE KERNEL GUI GEOM diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml index 3122ed7..0c66dd5 100755 --- a/config_Mandriva_2010.0.xml +++ b/config_Mandriva_2010.0.xml @@ -61,7 +61,7 @@ script="MED.sh"/> OmniORB Doxygen Graphviz + DISTENE docutils KERNEL GUI diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml index d30bb2e..68cfaf9 100755 --- a/config_Mandriva_2010.0_64bit.xml +++ b/config_Mandriva_2010.0_64bit.xml @@ -923,6 +923,7 @@ Doxygen Graphviz docutils + DISTENE KERNEL GUI GEOM diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml index 6f147d5..eb3ce81 100755 --- a/config_Red_Hat_Enterprise_WS_4_64bit.xml +++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml @@ -936,6 +936,7 @@ Doxygen Graphviz docutils + DISTENE KERNEL GUI GEOM diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml index 4896c29..f1e7480 100755 --- a/config_Scientific_SL_5.1_64bit.xml +++ b/config_Scientific_SL_5.1_64bit.xml @@ -936,6 +936,7 @@ Doxygen Graphviz docutils + DISTENE KERNEL GUI GEOM diff --git a/config_files/common.sh b/config_files/common.sh index daa7a71..d950f94 100755 --- 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