Changeset 340 in MondoRescue for trunk/tools/mkcommon

Timestamp:

Jan 20, 2006, 1:11:02 AM (18 years ago)

Author:

bcornec

Message:

merge -r335:339 $SVN_M/branches/stable

File:

• trunk/tools/mkcommon (modified) (3 diffs)

trunk/tools/mkcommon

@@ -21 +21 @@
     echo "Management of mindi-kernel ${MINDI_VER}-$REVISION"
     rm -fr mindi-kernel-${MINDI_VER}
-    cp -a ${VER}/mindi-kernel mindi-kernel-${MINDI_VER}
-    find mindi-kernel-${MINDI_VER} -type d -name .svn | xargs rm -rf
-    find mindi-kernel-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
-    find mindi-kernel-${MINDI_VER} -type f -name '*~' | xargs rm -rf
+    svn export ${VER}/mindi-kernel mindi-kernel-${MINDI_VER}
+    #cp -a ${VER}/mindi-kernel mindi-kernel-${MINDI_VER}
+    #find mindi-kernel-${MINDI_VER} -type d -name .svn | xargs rm -rf
+    #find mindi-kernel-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
+    #find mindi-kernel-${MINDI_VER} -type f -name '*~' | xargs rm -rf
     mkdir -p ${TOPDIR}/SOURCES 
 
@@ -35 +36 @@
     echo "Management of mindi ${MINDI_VER}-$REVISION"
     rm -fr mindi-${MINDI_VER}
-    cp -a ${VER}/mindi mindi-${MINDI_VER}
+    svn export ${VER}/mindi mindi-${MINDI_VER}
+    #cp -a ${VER}/mindi mindi-${MINDI_VER}
     cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
-    find mindi-${MINDI_VER} -type d -name .svn | xargs rm -rf
-    find mindi-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
-    find mindi-${MINDI_VER} -type f -name '*~' | xargs rm -rf
-    rm -f mindi-${MINDI_VER}/parted2fdisk mindi-${MINDI_VER}/parted2fdisk.c mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64 
+    echo "$REVISION" > mindi-${MINDI_VER}/REVISION
+    #find mindi-${MINDI_VER} -type d -name .svn | xargs rm -rf
+    #find mindi-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
+    #find mindi-${MINDI_VER} -type f -name '*~' | xargs rm -rf
+    rm -f mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64 
+    #rm -f mindi-${MINDI_VER}/parted2fdisk mindi-${MINDI_VER}/parted2fdisk.c mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64 
 
     echo "Creating mindi tar files"
@@ -51 +55 @@
     echo "Management of mondo ${MONDO_VER}-$REVISION"
     rm -rf mondo-${MONDO_VER}
-    cp -a ${VER}/mondo mondo-${MONDO_VER}
+    svn export ${VER}/mondo mondo-${MONDO_VER}
+    #cp -a ${VER}/mondo mondo-${MONDO_VER}
     cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
-    cd mondo-${MONDO_VER}
+    echo "$REVISION" > mondo-${MONDO_VER}/REVISION
+    rm -rf documentation-${MONDO_VER}
+    svn export ${VER}/documentation documentation-${MONDO_VER}
+    cd documentation-${MONDO_VER}
+    make install INSTALLDIR=../mondo-${MONDO_VER}/mondo/docs/en
+    cd ../mondo-${MONDO_VER}
     echo "Bootstraping mondo ... "
     ./bootstrap
-    find . -type d -name .svn | xargs rm -rf
-    find . -type f -name '.*.swp' | xargs rm -rf
-    find . -type f -name '*~' | xargs rm -rf
+    #find . -type d -name .svn | xargs rm -rf
+    #find . -type f -name '.*.swp' | xargs rm -rf
+    #find . -type f -name '*~' | xargs rm -rf
     cd ..