Prepare SALOME 2.2.6 installation

diff --git a/config_files/VTK-4.2.2.sh b/config_files/VTK-4.2.2.sh
index eb79db8bb5f81e7309c4bd433d385e599cb9fa36..1bb584f9fe0b02a85d0f5bb023aff2cf0d0a9262 100755 (executable)
--- a/config_files/VTK-4.2.2.sh
+++ b/config_files/VTK-4.2.2.sh
@@ -139,7 +139,7 @@ cd ${PRODUCT_WORK}/Wrapping/Python
 check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PRODUCT_DIR}
 
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
-#du -sk ${INSTALL_WORK}/cmake-1.6.6 > ${PRODUCT_DIR}/size1.log
+#du -sk ${INSTALL_WORK}/cmake-1.6.6 >> ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK} ${INSTALL_WORK}/cmake-1.6.6
 
 # set correct symbolic links - bug of python wrappings installation

diff --git a/config_files/VTK-4.2.6.sh b/config_files/VTK-4.2.6.sh
index 8b446eb5a37c507058ad978ffa47f113c1cd0ee3..56ae5f7b7ebad78f7adcf32070952917f2f75c3e 100755 (executable)
--- a/config_files/VTK-4.2.6.sh
+++ b/config_files/VTK-4.2.6.sh
@@ -145,7 +145,7 @@ cd ${PRODUCT_WORK}/Wrapping/Python
 check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PRODUCT_DIR}
 
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
-#du -sk ${INSTALL_WORK}/cmake-1.6.6 > ${PRODUCT_DIR}/size1.log
+#du -sk ${INSTALL_WORK}/cmake-1.6.6 >> ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK} ${INSTALL_WORK}/cmake-1.6.6
 
 # set correct symbolic links - bug of python wrappings installation

diff --git a/config_files/build.csh b/config_files/build.csh
index 50529458e51714832763918b2a49bb2e0189df7b..401351ab8fa7990c78a7f9ed15a04c816554ca62 100755 (executable)
--- a/config_files/build.csh
+++ b/config_files/build.csh
@@ -12,7 +12,7 @@ set is_delete=0
 set verbose_level=2
 set params=""
 set b_params=""
-set modules=(KERNEL GEOM MED SMESH VISU SUPERV NETGENPLUGIN GHS3DPLUGIN COMPONENT PYCALCULATOR HELLO PYHELLO)
+set modules=(KERNEL GEOM MED SMESH VISU SUPERV NETGENPLUGIN GHS3DPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO)
 set optim=""
 set is_install=0
 set is_help=0

diff --git a/config_files/common.sh b/config_files/common.sh
index 917e4840b8033b18b658c367f272756d81aabc01..a7c0c47baba3f49bfa0f35b2d2bcaf27fb687bdd 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -386,4 +386,50 @@ else
     echo $arg1:$arg2
 fi
 return $to_tail
-}
\ No newline at end of file
+}
+
+where_tcl(){
+if test -z "${TCLHOME}"; then
+    TCLHOME=/usr
+fi
+tclcfg=`find ${TCLHOME}/lib -name "tclConfig.sh" 2> /dev/null`
+file=""
+maxver=0
+for f in $tclcfg; do
+    ver=`cat $f | grep -e "TCL_VERSION=.*" | sed -e "s%TCL_VERSION=[\'|\"]\(.*\)[\'|\"]%\1%g" | awk -F. '{x=0;for(i=1;i<=3;i++){x=x*100;if(i<=NF)x+=$i;}print x;}'`
+    if [ $maxver -lt $ver ]; then
+        maxver=$ver
+       file=$f
+    fi
+done
+if test -n "$file"; then
+    echo `dirname $file`
+    return 0
+else
+    echo ""
+    return 1
+fi
+}
+
+where_tk(){
+if test -z "${TCLHOME}"; then
+    TCLHOME=/usr
+fi
+tclcfg=`find ${TCLHOME}/lib -name "tkConfig.sh" 2> /dev/null`
+file=""
+maxver=0
+for f in $tclcfg; do
+    ver=`cat $f | grep -e "TK_VERSION=.*" | sed -e "s%TK_VERSION=[\'|\"]\(.*\)[\'|\"]%\1%g" | awk -F. '{x=0;for(i=1;i<=3;i++){x=x*100;if(i<=NF)x+=$i;}print x;}'`
+    if [ $maxver -lt $ver ]; then
+        maxver=$ver
+       file=$f
+    fi
+done
+if test -n "$file"; then
+    echo `dirname $file`
+    return 0
+else
+    echo ""
+    return 1
+fi
+}

diff --git a/config_files/doxygen-1.3-rc2.sh b/config_files/doxygen-1.3-rc2.sh
index 2aaf2f329cedaf5e04577cd029b2b48cfc85ab4f..315ffd29374811c3919eca7cb6eb4f00f5da1a3c 100755 (executable)
--- a/config_files/doxygen-1.3-rc2.sh
+++ b/config_files/doxygen-1.3-rc2.sh
@@ -61,7 +61,7 @@ return $?
 
 install_source()
 {
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" env_${PRODUCT_TYPE}.sh
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/doxygen-1.3-rc2.tar.gz -C ${INSTALL_WORK}
@@ -71,7 +71,7 @@ makedir ${PRODUCT_DIR}
 # 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`
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG configure --with-doxywizard --prefix ${PRODUCT_DIR} $f_install
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --with-doxywizard --prefix ${PRODUCT_DIR} $f_install
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
@@ -96,7 +96,7 @@ doxygen documentation will not be built!
 SALOME DOCUMENTATION ALSO CAN NOT BE BUILT!
 EOF
     check_job ${PRODUCT_DIR}/MAKEDOCS.LOG make docs
-    rm -fr ${PRODUCT_WORK}
+#    rm -fr ${PRODUCT_WORK}
 #    echo -e "Can't find \"epstopdf\" and \"latex\" or another executables on the computer."
 #    echo -e "doxygen documentation will not be built!"
 #    echo -e "SALOME DOCUMENTATION ALSO CAN NOT BE BUILT!"
@@ -109,13 +109,14 @@ EOF
 #    fi
 fi
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }
 
 install_binary()
 {
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" env_${PRODUCT_TYPE}.sh
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/doxygen-1.3-rc2.tar.gz -C ${INSTALL_ROOT}
@@ -133,7 +134,7 @@ doxygen documentation will not be built!
 SALOME DOCUMENTATION ALSO CAN NOT BE BUILT!
 EOF
     check_job ${PRODUCT_DIR}/DOCS.LOG make
-    rm -fr ${PRODUCT_WORK}
+#    rm -fr ${PRODUCT_WORK}
 #    echo -e "Can't find \"epstopdf\" and \"latex\" or another executables on the computer."
 #    echo -e "doxygen documentation will not be built!"
 #    echo -e "SALOME DOCUMENTATION ALSO CAN NOT BE BUILT!"

diff --git a/config_files/doxygen-1.3.7.sh b/config_files/doxygen-1.3.7.sh
index 96175b95b7fdbfcdc450efb7601196fb055ee3da..39e39cc28c41b9619805faae559f740480a1dfa9 100755 (executable)
--- a/config_files/doxygen-1.3.7.sh
+++ b/config_files/doxygen-1.3.7.sh
@@ -57,8 +57,60 @@ return $?
 
 install_source()
 {
-echo "The installation of doxygen 1.3.7 from sources is not provided! Use native doxygen."
-return 1
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/doxygen-1.3.7.tar.gz -C ${INSTALL_WORK}
+
+cd ${PRODUCT_WORK}
+makedir ${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`
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --with-doxywizard --prefix ${PRODUCT_DIR} $f_install
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE.LOG make
+check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
+
+which epstopdf >/dev/null 2>&1;  ISFOUND=$?
+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\" and \"latex\" or another executables on the computer.
+doxygen documentation will not be built!
+SALOME DOCUMENTATION ALSO CAN NOT BE BUILT!
+EOF
+#    check_job ${PRODUCT_DIR}/MAKEDOCS.LOG make docs
+#    rm -fr ${PRODUCT_WORK}
+#    echo -e "Can't find \"epstopdf\" and \"latex\" or another executables on the computer."
+#    echo -e "doxygen documentation will not be built!"
+#    echo -e "SALOME DOCUMENTATION ALSO CAN NOT BE BUILT!"
+#    echo -n "Would you like continue : (Y,N) [Y] : "
+#    read rep;
+#    rep=`echo $rep  | tr "[A-Z]" "[a-z]"`
+#    if test -z $rep || [ $rep != "y" ] ; then
+#      rm -fr ${PRODUCT_WORK}
+#      exit 1
+#    fi
+fi
+
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+rm -fr ${PRODUCT_WORK}
+print_env
 }
 
 install_binary()

diff --git a/config_files/graphviz-1.9.sh b/config_files/graphviz-1.9.sh
index b28c4bcfc1da9da03db109c7622d8de6403e8022..2d4d6947cd499651c2d50c8eaa538e2db05248b9 100755 (executable)
--- a/config_files/graphviz-1.9.sh
+++ b/config_files/graphviz-1.9.sh
@@ -60,7 +60,7 @@ check_jb tar xfz ${SOURCE_DIR}/graphviz-1.9.tar.gz -C ${INSTALL_WORK}
 
 cd ${PRODUCT_WORK}
 makedir ${PRODUCT_DIR}
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG configure --prefix=${PRODUCT_DIR} --with-tcl=$TCLHOME --disable-rpath 
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG configure --prefix=${PRODUCT_DIR} --with-tcl=${TCLHOME} --disable-rpath 
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
@@ -68,6 +68,7 @@ EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }
@@ -78,6 +79,15 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/graphviz-1.9.tar.gz -C ${INSTALL_ROOT}
+cd ${PRODUCT_DIR}/lib/graphviz
+for l in `ls *.la`; do
+    libdir=`grep -e "libdir=.*" $l | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"`
+    sed -e "s%${libdir}%${PRODUCT_DIR}/lib/graphviz%g" $l > _$l
+    libdir=`dirname $libdir`
+    sed -e "s%${libdir}%${PRODUCT_DIR}/lib/graphviz%g" _$l > $l
+    rm -f _$l
+    chmod a+x $l
+done
 
 print_env
 }

diff --git a/config_files/graphviz-2.2.1.sh b/config_files/graphviz-2.2.1.sh
index e2302c70fd6982179f74627ab140c33da70b9ae9..4e8b94f11acc8d15bef49b1f714b3394ee056428 100755 (executable)
--- a/config_files/graphviz-2.2.1.sh
+++ b/config_files/graphviz-2.2.1.sh
@@ -66,7 +66,7 @@ cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
 EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make
-check_job ${PRODUCT_DIR}/INSTALL.LOG make install
+check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
@@ -79,6 +79,15 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/graphviz-2.2.1.tar.gz -C ${INSTALL_ROOT}
+cd ${PRODUCT_DIR}/lib/graphviz
+for l in `ls *.la`; do
+    libdir=`grep -e "libdir=.*" $l | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"`
+    sed -e "s%${libdir}%${PRODUCT_DIR}/lib/graphviz%g" $l > _$l
+    libdir=`dirname $libdir`
+    sed -e "s%${libdir}%${PRODUCT_DIR}/lib/graphviz%g" _$l > $l
+    rm -f _$l
+    chmod a+x $l
+done
 
 print_env
 }

diff --git a/config_files/hdf5-1.4.4.sh b/config_files/hdf5-1.4.4.sh
index 2cd2e53ce1d9e6d1ccee0be57ffbb556ee7f97e3..fdce78079c430225a7afb26681393a91f6b728d2 100755 (executable)
--- a/config_files/hdf5-1.4.4.sh
+++ b/config_files/hdf5-1.4.4.sh
@@ -3,22 +3,16 @@
 check_version()
 {
 if [ -z "$HDF5HOME" ]; then
-    #echo "HDF5HOME doesn't set"
     return 1 
 fi
 check_lib_version libhdf5.so.0.0.0 ${HDF5HOME}/lib
 if [ "$?" -ne "0" ]; then
     return 1
 fi
-#check libhdf5.settings file in a  ${HDF5HOME}/lib
 check_lib_version libhdf5.settings ${HDF5HOME}/lib
 if [ "$?" -eq "0" ]; then
-   #check that libhdf5.settings file contains following entry:
-   #HDF5 Version:              hdf5-1.4.4
-    entry=`grep "HDF5 Version:" ${HDF5HOME}/lib/libhdf5.settings`
-    ver=`echo $entry | awk '{print $3}'` 
+    ver=`grep "HDF5 Version:" ${HDF5HOME}/lib/libhdf5.settings | awk '{print $3}'` 
     if [ "$ver" = "1.4.4" ]; then 
-       #echo "The product ${PRODUCT} has been already installed on yours system"
        return 0
     fi
 fi
@@ -29,7 +23,7 @@ print_env()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export HDF5HOME=\${INSTALL_ROOT}/hdf5-1.4.4
+export HDF5HOME=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${HDF5HOME}/bin:\$PATH
 export LD_LIBRARY_PATH=\${HDF5HOME}/lib:\${LD_LIBRARY_PATH}
 ##
@@ -75,7 +69,6 @@ makedir ${PRODUCT_DIR}
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
     ./configure --prefix=${PRODUCT_DIR} --enable-threadsafe --enable-hdf5v1_2 \
        --enable-stream-vfd --disable-hsizet --with-pthread=/usr/include,/usr/lib 
-# find . -name .depend ! -size 0 -print
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE0.LOG <<EOF
 used gcc=$GCC
@@ -134,6 +127,7 @@ check_job ${PRODUCT_DIR}/MAKE6.LOG make
 #check_job ${PRODUCT_DIR}/MAKECHECK.LOG make check
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }

diff --git a/config_files/omniORB-3.0.5.sh b/config_files/omniORB-3.0.5.sh
index 8cbc8ade31ec9a4667cbeda4928230b78710f2b7..cc5583622407c41ff158bd7b4e2b49aeae7e9823 100755 (executable)
--- a/config_files/omniORB-3.0.5.sh
+++ b/config_files/omniORB-3.0.5.sh
@@ -2,7 +2,7 @@
 
 check_version()
 {
-if [ -z "$OMNIORBDIR" ]; then
+if [ -z "${OMNIORBDIR}" ]; then
    #echo "OMNIORBDIR doesn't set"
    return 1
 fi
@@ -142,6 +142,12 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/omniORB-3.0.5.tar.gz -C ${INSTALL_ROOT}
 
 ln -s ${PRODUCT_DIR} ${INSTALL_ROOT}/omni
+
+cd ${PRODUCT_DIR}/bin/i586_linux_2.0_glibc2.1
+sed -e "s%\(#\!/usr/bin/env.*\)python%\1`which python`%" omniidlrun.py > _omniidlrun.py
+mv -f _omniidlrun.py omniidlrun.py
+chmod a+x omniidlrun.py
+
 print_env
 }
 

diff --git a/config_files/omniORB-4.0.5.sh b/config_files/omniORB-4.0.5.sh
index 7fcb7bf31bfa9dab52e109c5764af2b1b4cb8510..3c13fe305f3e3140c614001c490903048d3e9735 100755 (executable)
--- a/config_files/omniORB-4.0.5.sh
+++ b/config_files/omniORB-4.0.5.sh
@@ -133,6 +133,8 @@ check_job ${PRODUCT_DIR}/INSTALL_OMNINOTIFY.LOG make install
 
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
+rm -fr ${PRODUCT_WORK}/omniORBpy-2.5
+rm -fr ${PRODUCT_WORK}/omniNotify
 print_env
 }
 

diff --git a/config_files/qt-3.3.3.sh b/config_files/qt-3.3.3.sh
index 46316d239e82dc45d006ac1b06f74f13f142373c..9ec2d4c8bcc6be589acc226e2fe3d9653ca644f1 100755 (executable)
--- a/config_files/qt-3.3.3.sh
+++ b/config_files/qt-3.3.3.sh
@@ -60,8 +60,52 @@ return $?
 
 install_source()
 {
-echo "The installation of Qt 3.3.3 from sources is not provided! Use native Qt."
-return 1
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+makedir ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/qt-3.3.3.tar.gz -C ${INSTALL_WORK}
+cd ${PRODUCT_WORK}
+
+mv -f configure configure-orig
+sed -e "s%read acceptance%acceptance=yes%" configure-orig > configure
+chmod +x configure
+
+export QTDIR=${PRODUCT_WORK}
+export LD_LIBRARY_PATH=${QTDIR}/lib:$LD_LIBRARY_PATH
+
+# basic flags
+QT_FLAGS="-release -thread -shared -qt-gif -platform linux-g++"
+# use system graphics libraries
+QT_FLAGS=$QT_FLAGS" -system-libpng -system-libjpeg -system-libmng -lpng -lmng -ljpeg"
+# prefix
+
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure $QT_FLAGS -prefix ${PRODUCT_DIR}
+
+sed -e "s%^all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples%all: symlinks src-qmake src-moc sub-src sub-tools%g" Makefile > _Makefile
+mv -f _Makefile Makefile
+
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE.LOG make 
+check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
+
+for b in `ls ${PRODUCT_WORK}/bin`; do
+    if [ ! -e ${PRODUCT_DIR}/bin/$b ] || [ -h ${PRODUCT_DIR}/bin/$b ]; then
+       if [ -h ${PRODUCT_DIR}/bin/$b ]; then
+           rm -f ${PRODUCT_DIR}/bin/$b
+       fi
+       cp -f ${PRODUCT_WORK}/bin/$b ${PRODUCT_DIR}/bin/$b
+    fi
+done
+#rm -rf ${PRODUCT_DIR}/doc
+
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+rm -fr ${PRODUCT_WORK}
+print_env
 }
 
 install_binary()
@@ -74,10 +118,9 @@ check_jb tar xfz ${SOURCE_DIR}/qt-3.3.3.tar.gz -C ${INSTALL_ROOT}
 cd ${PRODUCT_DIR}/lib
 sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libqt-mt.la > libqt-mt.la.new
 mv -f libqt-mt.la.new libqt-mt.la
-cd ${PRODUCT_DIR}/bin
-sed -e "s%export QTDIR=\(.*\)%export QTDIR=${PRODUCT_DIR}%g" designer > designer.new
-mv -f designer.new designer
-chmod 755 designer
+cd ${PRODUCT_DIR}/lib/pkgconfig
+sed -e "s%^prefix='\(.*\)'%prefix='${PRODUCT_DIR}/lib'%g" qt-mt.pc > qt-mt.pc.new
+mv -f qt-mt.pc.new qt-mt.pc
 
 print_env
 }

diff --git a/config_files/qwt-0.4.1.sh b/config_files/qwt-0.4.1.sh
index 7f6db0df63d91546912bf58fa45c35dc8b6d165d..4b7d21e925657e30e4a1e4fd863c6c19e47da987 100755 (executable)
--- a/config_files/qwt-0.4.1.sh
+++ b/config_files/qwt-0.4.1.sh
@@ -69,6 +69,7 @@ EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make 
 cp -rf include lib ${PRODUCT_DIR}
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -rf ${PRODUCT_WORK}
 
 print_env

diff --git a/config_files/sip-3.3.2.sh b/config_files/sip-3.3.2.sh
index 181d82022d138f62a4e00fae43c8e8766b9c4793..f14a21206a03eab7d460cebf4654a6f80fd5e664 100755 (executable)
--- a/config_files/sip-3.3.2.sh
+++ b/config_files/sip-3.3.2.sh
@@ -84,6 +84,7 @@ EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make
 check_job ${PRODUCT_DIR}/INSTALL.LOG make install
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }