Changeset 340 in MondoRescue

Timestamp:

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

Author:

bcornec

Message:

merge -r335:339 $SVN_M/branches/stable

Location:

trunk

Files:

• documentation/Makefile (modified) (2 diffs)
• mindi/VERSION (modified) (1 diff)
• mondo/VERSION (modified) (1 diff)
• mondo/configure.in (modified) (1 diff)
• mondo/distributions/common/mondo.spec (modified) (1 diff)
• mondo/mondo/docs/en/1.6x-howto (deleted)
• mondo/mondo/docs/en/Makefile.am (modified) (1 diff)
• tools/mkcommon (modified) (3 diffs)

trunk/documentation/Makefile

@@ +1 @@
+#
+# Makefile for mondorescue documentation build
+#
+# $Id$
+#
 TARGET=mondorescue-howto
 SRC=$(shell ls *.sgml)
 DSL=$(TARGET).dsl
-IMAGES=$(shell ls images/*.png | sed 's/\.png/.eps/g')
+IMAGESDIR=images
+IMAGES=$(shell ls ${IMAGESDIR}/*.png | sed 's/\.png/.eps/g')
 
 all: $(TARGET).ps $(TARGET).pdf $(TARGET)/index.html $(TARGET).txt $(TARGET).html $(TARGET).rtf
 
-images/%.eps: images/%.png
+${IMAGESDIR}/%.eps: ${IMAGESDIR}/%.png
     @echo "Converting $< to $@"
     @convert $< $@
@@ -52 +58 @@
     @echo ""
     @rm -fr $(TARGET).{aux,log,out,tex,dvi,pdf,ps,txt,rtf,html} $(TARGET)
+
+install: all
+    @echo ""
+    @echo "Delivering mondorescue documentation"
+    @echo ""
+    @if [ "${INSTALLDIR}" != "" ]; then cp -a $(TARGET).{html,pdf,ps,txt,rtf} $(TARGET) ${INSTALLDIR} ; cp -a ${IMAGESDIR} ${INSTALLDIR}/$(TARGET) ; else echo "No INSTALLDIR specified aborting install"; fi

trunk/mindi/VERSION

@@ -1 @@
-1.06
+trunk

trunk/mondo/VERSION

@@ -1 @@
-2.06
+trunk

trunk/mondo/configure.in

@@ -126 +126 @@
 AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr getline asprintf trunc vasprintf])
 
-AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/docs/Makefile mondo/docs/en/Makefile mondo/docs/en/1.6x-howto/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile mondo/xmondo/Makefile mondo/post-nuke.sample/Makefile mondo/post-nuke.sample/usr/Makefile mondo/post-nuke.sample/usr/bin/Makefile])
+AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/docs/Makefile mondo/docs/en/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile mondo/xmondo/Makefile mondo/post-nuke.sample/Makefile mondo/post-nuke.sample/usr/Makefile mondo/post-nuke.sample/usr/bin/Makefile])

trunk/mondo/distributions/common/mondo.spec

@@ -131 +131 @@
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog svn.log mondo/docs/en/1.6x-howto/*
+%doc ChangeLog svn.log mondo/docs/en/*
 %doc INSTALL COPYING README TODO AUTHORS NEWS
 

trunk/mondo/mondo/docs/en/Makefile.am

@@ -1 @@
-SUBDIRS   = 1.6x-howto
+SUBDIRS   = mondorescue-howto

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 ..