provide binaries installation mode for qt-3.3.3 and doxygen 1.3.7 under Mandrake...

diff --git a/config_Mandrake10_1.xml b/config_Mandrake10_1.xml
index 819257af20974a7f0096edd86a06f876323143d8..db536d1ac07d0855fa94382ac950156d50404d41 100755 (executable)
--- a/config_Mandrake10_1.xml
+++ b/config_Mandrake10_1.xml
@@ -40,10 +40,10 @@
            version="3.3.3" 
            description="Multiplatform C++ GUI application framework"
            install="use native"
-          supported="use native"
+          supported="use native,install binaries"
           disable="false"
           dependancies="gcc"
-          installdiskspace="0"
+          installdiskspace="46681"
           temporarydiskspace="0"
           script="qt-3.3.3.sh"/>
   <product name="Sip"
@@ -180,7 +180,7 @@
            version="1.3.7" 
            description="Documentation system for C++, C, Java, IDL, etc."
            install="use native"
-          supported="use native"
+          supported="use native,install binaries"
           disable="false"
           dependancies="gcc,Qt"
           installdiskspace="0"

diff --git a/config_files/doxygen-1.3.7.sh b/config_files/doxygen-1.3.7.sh
index a040b35065c09407e3175b5b0a59d948302af891..96175b95b7fdbfcdc450efb7601196fb055ee3da 100755 (executable)
--- a/config_files/doxygen-1.3.7.sh
+++ b/config_files/doxygen-1.3.7.sh
@@ -63,8 +63,12 @@ return 1
 
 install_binary()
 {
-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_ROOT}
+
+print_env
 }
 
 export PROCEDURE=$1;

diff --git a/config_files/qt-3.3.3.sh b/config_files/qt-3.3.3.sh
index 7f66f0ea612e30987d44e6c7fcad9f8fd7fd7a40..46316d239e82dc45d006ac1b06f74f13f142373c 100755 (executable)
--- a/config_files/qt-3.3.3.sh
+++ b/config_files/qt-3.3.3.sh
@@ -66,8 +66,20 @@ return 1
 
 install_binary()
 {
-echo "The installation of Qt 3.3.3 from binaries is not provided! Use native Qt."
-return 1
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+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
+
+print_env
 }
 
 export PROCEDURE=$1;