Changeset 402 in MondoRescue

Timestamp:

Feb 17, 2006, 7:05:06 PM (19 years ago)

Author:

bcornec

Message:

• RPM build for mondo doc recoded
• Tag for documentation, man pages
• Include a patch from SuSE RPMs for mondo

Location:

branches/stable

Files:

• documentation/Makefile.howto (modified) (1 diff)
• documentation/Makefile.man (modified) (1 diff)
• documentation/mindi.8 (modified) (1 diff)
• documentation/mondoarchive.8 (modified) (1 diff)
• documentation/mondorescue-howto.sgml (modified) (1 diff)
• documentation/mondorestore.8 (modified) (1 diff)
• mondo/Makefile.am (modified) (1 diff)
• mondo/distributions/rpm/mondo.spec (modified) (3 diffs)
• mondo/mondo/common/my-stuff.h (modified) (1 diff)
• mondo/mondo/docs (deleted)
• tools/livwww (modified) (4 diffs)
• tools/mkcommon (modified) (2 diffs)
• tools/mkdeliv (modified) (2 diffs)
• website/docs.shtml (modified) (4 diffs)
• website/top.shtml (modified) (1 diff)

branches/stable/documentation/Makefile.howto

@@ -63 +63 @@
     @echo "Delivering mondorescue howto"
     @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
+    @if [ "${INSTALLDIR}" != "" ]; then mkdir -p ${INSTALLDIR} ; cp -a $(TARGET).{html,pdf,ps,txt,rtf} $(TARGET) ${INSTALLDIR} ; cp -a ${IMAGESDIR} ${INSTALLDIR}/$(TARGET) ; else echo "No INSTALLDIR specified aborting install"; fi

branches/stable/documentation/Makefile.man

@@ -39 +39 @@
 %.8.ps: %.8
     @man2dvi ./$< > $<.dvi
-    @dvips $<.dvi -o $@
+    @dvips -q $<.dvi -o $@
     @rm -f $<.dvi
 

branches/stable/documentation/mindi.8

@@ -21 +21 @@
 .\" USA.
 .\"
-.TH MINDI 8 "February 2006" "MondoRescue"
+.TH MINDI 8 "DDD" "Mondo Rescue VVV-rRRR"
 .SH NAME
 mindi \- a tool for creating boot/root disks

branches/stable/documentation/mondoarchive.8

@@ -1 @@
-.TH mondoarchive 8 "February 2006" Linux MondoRescue
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
+.\" USA.
+.\"
+.TH mondoarchive 8 "DDD" "Mondo Rescue VVV-rRRR"
 
 .SH NAME

branches/stable/documentation/mondorescue-howto.sgml

@@ -1 +1 @@
 <!DOCTYPE BOOK PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
 <!ENTITY curdate "DDD">
-<!ENTITY curver "VVV">
+<!ENTITY curver "VVV-rRRR">
 
 <!ENTITY WWWB "http://www.mondorescue.org/">

branches/stable/documentation/mondorestore.8

@@ -1 @@
-.TH mondorestore 8 "February 2006" Linux MondoRescue
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
+.\" USA.
+.\"
+.TH mondorestore 8 "DDD" "Mondo Rescue VVV-rRRR"
 
 .SH NAME

branches/stable/mondo/Makefile.am

@@ -1 +1 @@
 AUTOMAKE_OPTIONS = 1.7
 SUBDIRS   = mondo
-man8_MANS = mondo/mondoarchive/mondoarchive.8 mondo/mondorestore/mondorestore.8
+man8_MANS = docs/man/mondoarchive.8 docs/man/mondorestore.8

branches/stable/mondo/distributions/rpm/mondo.spec

@@ -61 +61 @@
 
 %build
-%configure %{!?_without_xmondo:--with-x11}
+%configure
 %{__make} VERSION=%{version} CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
 
@@ -82 +82 @@
 %doc ChangeLog svn.log
 %doc INSTALL COPYING README TODO AUTHORS NEWS
+%doc docs/en/mondorescue-howto.html docs/en/mondorescue-howto.pdf
 
 %attr(755,root,root) %{_sbindir}/*
@@ -88 +89 @@
 %{_mandir}
 
-#%{!?_without_xmondo:%files xmondo}
-#%{!?_without_xmondo:%{_sbindir}/xmondo}
-#%{!?_without_xmondo:%{_libdir}/libXmondo-%{libversion}.so}
-#%{!?_without_xmondo:%{_libdir}/libXmondo.so}
-#%{!?_without_xmondo:%{_datadir}/mondo/mondo.png}
-
 %changelog
+* Fri Feb 17 2006 Bruno Cornec <bcornec@users.berlios.de> 2.0.7
+- Updated to 2.0.7
+- RPM sepc files are now generated
+
 * Fri Nov 05 2005 Bruno Cornec <bcornec@users.berlios.de> 1.05
 - ia64 is now working

branches/stable/mondo/mondo/common/my-stuff.h

@@ -443 +443 @@
  * Malloc @p x to be MAX_STR_LEN bytes and call fatal_error() if we're out of memory.
  */
-#define malloc_string(x) { x = malloc(MAX_STR_LEN); if (!x) { fatal_error("Unable to malloc"); } x[0] = x[1] = '\0'; }
+#define malloc_string(x) { x = (char *)malloc(MAX_STR_LEN); if (!x) { fatal_error("Unable to malloc"); } x[0] = x[1] = '\0'; }
 
 /**

branches/stable/tools/livwww

@@ -8 +8 @@
 # Please replace with your destination
 #
+
+
 LOCALDIR=/var/www/html/mondo
 LOCALDOC=/var/www/html/mondo-doc
@@ -18 +20 @@
 if [ "$1" = "-f" ]; then
         force=1
+        optsvn=""
         shift
+else
+        optsvn="--force"
 fi
 
@@ -40 +45 @@
 cd ${BASE}/svn
 
-rm -rf $LOCALDIR
-svn export ${VER}/website $LOCALDIR
+if [ $force -eq 1 ]; then
+    echo "Purging $LOCALDIR"
+    rm -rf $LOCALDIR
+fi
 
-rm -rf $LOCALDOC
-svn export ${VER}/documentation $LOCALDOC
+svn export $optsvn ${VER}/website $LOCALDIR
+
+if [ $force -eq 1 ]; then
+    echo "Purging $LOCALDOC"
+    rm -rf $LOCALDOC
+fi
+
+svn export $optsvn ${VER}/documentation $LOCALDOC
+
+#
+# Version handling
+#
+$TOOLHOME/expandver $LOCALDIR/top.shtml $LOCALDOC/mondorescue-howto.sgml $LOCALDOC/*.8; do
+
 cd $LOCALDOC
 make -f Makefile.howto
@@ -55 +74 @@
 perl -pi -e 's~<A HREF[=./A-z0-9"]*/man1/[^<]*>([A-z0-9]*)</A>~$1~g' $LOCALDIR/docs/*.8.html
 perl -pi -e 's~/index.html~/index.shtml~' $LOCALDIR/docs/*.8.html 
-#
-# Version handling
-#
-perl -pi -e "s~VVV-rRRR~${VER}-r${REVISION}~g" $LOCALDIR/head.shtml
-
 find $LOCALDIR -type d | xargs chmod 755
 find $LOCALDIR -type f | xargs chmod 644
+
 cd $LOCALDIR
+#
+# Some links for the Web site
+#
+ln -sf /var/www/html/mediawiki .
+ln -sf /var/www/html/admin .
+
 if [ _"$1" == _"" ]; then
         exit 0

branches/stable/tools/mkcommon

@@ -34 +34 @@
     svn export ${VER}/mindi mindi-${MINDI_VER}
     cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
+    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 
@@ -48 +55 @@
     svn export ${VER}/mondo mondo-${MONDO_VER}
     cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
+    mkdir -p mondo-${MONDO_VER}/docs/man
+    cp -a ${VER}/documentation/mondo*.8 mondo-${MONDO_VER}/docs/man
     echo "$REVISION" > mondo-${MONDO_VER}/REVISION
     rm -rf documentation-${MONDO_VER}
     svn export ${VER}/documentation documentation-${MONDO_VER}
     cd documentation-${MONDO_VER}
-    make -f Makefile.howto install INSTALLDIR=../mondo-${MONDO_VER}/mondo/docs/en
-    make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_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

branches/stable/tools/mkdeliv

@@ -7 +7 @@
 
 # BerliOS FTP/SSH setup
-BERLIOSAC=bruno@ftp.mondorescue.org
+ACCOUNT=bruno@ftp.mondorescue.org
 DSTDIR=/
 FTPSERV="ftp.berlios.de"
@@ -46 +46 @@
     srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}${suf}.src.rpm"
 fi
-echo "Sources delivery to ${BERLIOSAC}:${DSTDIR}/src"
-scp ${tgz} ${BERLIOSAC}:${DSTDIR}/src
-ssh ${BERLIOSAC} "mkdir -p ${DSTDIR}/${ddir}/${dver}"
-echo "Packages delivery to ${BERLIOSAC}:${DSTDIR}/${ddir}/${dver}"
-scp ${rpms} ${BERLIOSAC}:${DSTDIR}/${ddir}/${dver}
-scp ${srpms} ${BERLIOSAC}:${DSTDIR}/${ddir}/${dver}
+echo "Sources delivery to ${ACCOUNT}:${DSTDIR}/src"
+scp ${tgz} ${ACCOUNT}:${DSTDIR}/src
+
+echo "Packages delivery to ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}"
+ssh ${ACCOUNT} "mkdir -p ${DSTDIR}/${ddir}/${dver}"
+scp ${rpms} ${srpms} ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}
+
 echo "Sources delivery to ${FTPSERV} ${FTPDIR}"
 if [ "`which ncftpput`" != "" ]; then

branches/stable/website/docs.shtml

@@ -33 +33 @@
                 <li>A <a href="/docs/mondoarchive.8.pdf" target="_blank">PDF</a></li>
                 <li>A <a href="/docs/mondoarchive.8.ps" target="_blank">PostScript</a></li>
-                <li>A <a href="/docs/mondoarchive.8.txt" target="_blank">Test</a></li>
+                <li>A <a href="/docs/mondoarchive.8.txt" target="_blank">Text</a></li>
             </ul>
           <li>mondorestore</li>
@@ -40 +40 @@
                 <li>A <a href="/docs/mondorestore.8.pdf" target="_blank">PDF</a></li>
                 <li>A <a href="/docs/mondorestore.8.ps" target="_blank">PostScript</a></li>
-                <li>A <a href="/docs/mondorestore.8.txt" target="_blank">Test</a></li>
+                <li>A <a href="/docs/mondorestore.8.txt" target="_blank">Text</a></li>
             </ul>
           <li>mindi</li>
@@ -47 +47 @@
                 <li>A <a href="/docs/mindi.8.pdf" target="_blank">PDF</a></li>
                 <li>A <a href="/docs/mindi.8.ps" target="_blank">PostScript</a></li>
-                <li>A <a href="/docs/mindi.8.txt" target="_blank">Test</a></li>
+                <li>A <a href="/docs/mindi.8.txt" target="_blank">Text</a></li>
             </ul>
   </ul>
@@ -57 +57 @@
   <ul>
           <li>A Mondo Rescue <a href="/docs/mondo-intro.pdf" target="_blank">introduction</a> (in French) made by Gallig Renaud.
-          <li>A Mondo Rescue <a href="/docs/mondo-presentation-v1.pdf target="_blank"">presentation</a> made by Bruno Cornec.
-          <li>A Mondo Rescue hardware migration <a href="/docs/HOWTO-_Deploy_Linux_from_SCSI_to_SATA.pdf target="_blank"">guide</a> made by François-Xavier Horel.
+          <li>A Mondo Rescue <a href="/docs/mondo-presentation-v1.pdf" target="_blank">presentation</a> made by Bruno Cornec.
+          <li>A Mondo Rescue hardware migration <a href="/docs/HOWTO-_Deploy_Linux_from_SCSI_to_SATA.pdf" target="_blank">guide</a> made by François-Xavier Horel.
 
 <!--#include virtual="/bottom.shtml" -->

branches/stable/website/top.shtml

@@ -15 +15 @@
       </div>
       <div id="topinfo">
-        VVV-rRRR      </div>
+        VVV-rRRR   - DDD   </div>
     </div>
     <div id="body">