Changeset 541 in MondoRescue for branches/stable/tools/mkcommon

Timestamp:

May 13, 2006, 8:47:23 PM (18 years ago)

Author:

bcornec

Message:

Stable is reverted to r436 (2.0.7) to put it in line with 2.0.8 and start from there over

File:

• branches/stable/tools/mkcommon (modified) (6 diffs)

branches/stable/tools/mkcommon

@@ -2 +2 @@
 #
 # Prepare build env common for all packages build process from SVN repository
-# Also prepare the documentation which is common
 #
 # $Id$
@@ -9 +8 @@
 umask 022
 
+echo "Generating SVN log file ..."
 cd $TOOLHOME/..
-echo "Generating SVN log file ..."
 svn log -v > /tmp/mondorescue-svn.log
 
 if [ "$1" = "" ]; then
-        c="mondo-doc mindi mondo"
+    c="mindi mondo"
 else
-    if [ "$1" = "all" ]; then
-            c="mindi-kernel mondo-doc mindi mondo"
-    else
-        c=$1
-    fi
+    c=$1
 fi
 if [ "`echo $c | grep mindi-kernel`" != "" ]; then
@@ -33 +28 @@
     tar cvfhj ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tar.bz2 mindi-kernel-${MINDI_VER}
 fi
-
-#
-# Should be done before mindi
-#
-if [ "`echo $c | grep mondo-doc`" != "" ]; then
-    cd ${BASE}/svn
-    echo "Management of mondo-doc ${MONDO_VER}-$REVISION"
-    rm -rf mondo-doc-${MONDO_VER}
-    svn export ${VER}/documentation mondo-doc-${MONDO_VER}
-    svn log -v ${VER}/documentation > mondo-doc-${MONDO_VER}/svn.log
-    echo "$REVISION" > mondo-doc-${MONDO_VER}/REVISION
-    cd mondo-doc-${MONDO_VER}
-    $TOOLHOME/expandver mondorescue-howto.sgml *8
-    make -f Makefile.howto install INSTALLDIR=../mondo-docgen-${MONDO_VER}/docs/en
-    if [ $? != 0 ]; then
-        exit -1
-    fi
-    make -f Makefile.man install-mondo INSTALLDIR=../mondo-docgen-${MONDO_VER}/docs/man
-    if [ $? != 0 ]; then
-        exit -1
-    fi
-    cd ..
-
-    echo "Creating mondo-doc tar files"
-    tar cfhz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tgz mondo-doc-${MONDO_VER}
-    tar cfhj ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tar.bz2 mondo-doc-${MONDO_VER}
-fi
 if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
     cd ${BASE}/svn
@@ -66 +34 @@
     svn export ${VER}/mindi mindi-${MINDI_VER}
     cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
-    (cd mondo-doc-${MONDO_VER} ; make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_VER})
+    cp -a ${VER}/documentation/mindi.8 mindi-${MINDI_VER}
+    rm -rf documentation-${MONDO_VER}
+    svn export ${VER}/documentation documentation-${MONDO_VER}
+    cd documentation-${MONDO_VER}
+    $TOOLHOME/expandver mindi*8
+    make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_VER}
+    cd ..
     echo "$REVISION" > mindi-${MINDI_VER}/REVISION
     rm -f mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64 
@@ -75 +49 @@
     rm -f ${TMP}/mindi-*-root
 fi
-if [ "`echo $c | grep -v doc | grep  mondo`" != "" ]; then
+if [ "`echo $c | grep  mondo`" != "" ]; then
     cd ${BASE}/svn
     echo "Management of mondo ${MONDO_VER}-$REVISION"
@@ -82 +56 @@
     cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
     echo "$REVISION" > mondo-${MONDO_VER}/REVISION
-    (cd mondo-doc-${MONDO_VER} ; make -f Makefile.howto install INSTALLDIR=../mondo-${MONDO_VER}/docs/en ; make -f Makefile.man install-mondo INSTALLDIR=../mondo-${MONDO_VER}/docs/man)
-    (cd mondo-${MONDO_VER} ; echo "Bootstraping mondo ... " ; ./bootstrap)
+    rm -rf documentation-${MONDO_VER}
+    svn export ${VER}/documentation documentation-${MONDO_VER}
+    cd documentation-${MONDO_VER}
+    $TOOLHOME/expandver mondorescue-howto.sgml mondo*8
+    make -f Makefile.howto install INSTALLDIR=../mondo-${MONDO_VER}/docs/en
+    if [ $? != 0 ]; then
+        exit -1
+    fi
+    make -f Makefile.man install-mondo INSTALLDIR=../mondo-${MONDO_VER}/docs/man
+    if [ $? != 0 ]; then
+        exit -1
+    fi
+    cd ../mondo-${MONDO_VER}
+    echo "Bootstraping mondo ... "
+    ./bootstrap
+    cd ..
 
     echo "Creating mondo tar files"