Changeset 402


Ignore:
Timestamp:
Feb 17, 2006, 7:05:06 PM (14 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:
1 deleted
14 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/documentation/Makefile.howto

    r401 r402  
    6363    @echo "Delivering mondorescue howto"
    6464    @echo ""
    65     @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
     65    @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

    r401 r402  
    3939%.8.ps: %.8
    4040    @man2dvi ./$< > $<.dvi
    41     @dvips $<.dvi -o $@
     41    @dvips -q $<.dvi -o $@
    4242    @rm -f $<.dvi
    4343
  • branches/stable/documentation/mindi.8

    r401 r402  
    2121.\" USA.
    2222.\"
    23 .TH MINDI 8 "February 2006" "MondoRescue"
     23.TH MINDI 8 "DDD" "Mondo Rescue VVV-rRRR"
    2424.SH NAME
    2525mindi \- a tool for creating boot/root disks
  • branches/stable/documentation/mondoarchive.8

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

    r388 r402  
    11<!DOCTYPE BOOK PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
    22<!ENTITY curdate "DDD">
    3 <!ENTITY curver "VVV">
     3<!ENTITY curver "VVV-rRRR">
    44
    55<!ENTITY WWWB "http://www.mondorescue.org/">
  • branches/stable/documentation/mondorestore.8

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

    r30 r402  
    11AUTOMAKE_OPTIONS = 1.7
    22SUBDIRS   = mondo
    3 man8_MANS = mondo/mondoarchive/mondoarchive.8 mondo/mondorestore/mondorestore.8
     3man8_MANS = docs/man/mondoarchive.8 docs/man/mondorestore.8
  • branches/stable/mondo/distributions/rpm/mondo.spec

    r401 r402  
    6161
    6262%build
    63 %configure %{!?_without_xmondo:--with-x11}
     63%configure
    6464%{__make} VERSION=%{version} CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
    6565
     
    8282%doc ChangeLog svn.log
    8383%doc INSTALL COPYING README TODO AUTHORS NEWS
     84%doc docs/en/mondorescue-howto.html docs/en/mondorescue-howto.pdf
    8485
    8586%attr(755,root,root) %{_sbindir}/*
     
    8889%{_mandir}
    8990
    90 #%{!?_without_xmondo:%files xmondo}
    91 #%{!?_without_xmondo:%{_sbindir}/xmondo}
    92 #%{!?_without_xmondo:%{_libdir}/libXmondo-%{libversion}.so}
    93 #%{!?_without_xmondo:%{_libdir}/libXmondo.so}
    94 #%{!?_without_xmondo:%{_datadir}/mondo/mondo.png}
    95 
    9691%changelog
     92* Fri Feb 17 2006 Bruno Cornec <bcornec@users.berlios.de> 2.0.7
     93- Updated to 2.0.7
     94- RPM sepc files are now generated
     95
    9796* Fri Nov 05 2005 Bruno Cornec <bcornec@users.berlios.de> 1.05
    9897- ia64 is now working
  • branches/stable/mondo/mondo/common/my-stuff.h

    r296 r402  
    443443 * Malloc @p x to be MAX_STR_LEN bytes and call fatal_error() if we're out of memory.
    444444 */
    445 #define malloc_string(x) { x = malloc(MAX_STR_LEN); if (!x) { fatal_error("Unable to malloc"); } x[0] = x[1] = '\0'; }
     445#define malloc_string(x) { x = (char *)malloc(MAX_STR_LEN); if (!x) { fatal_error("Unable to malloc"); } x[0] = x[1] = '\0'; }
    446446
    447447/**
  • branches/stable/tools/livwww

    r401 r402  
    88# Please replace with your destination
    99#
     10
     11
    1012LOCALDIR=/var/www/html/mondo
    1113LOCALDOC=/var/www/html/mondo-doc
     
    1820if [ "$1" = "-f" ]; then
    1921        force=1
     22        optsvn=""
    2023        shift
     24else
     25        optsvn="--force"
    2126fi
    2227
     
    4045cd ${BASE}/svn
    4146
    42 rm -rf $LOCALDIR
    43 svn export ${VER}/website $LOCALDIR
     47if [ $force -eq 1 ]; then
     48    echo "Purging $LOCALDIR"
     49    rm -rf $LOCALDIR
     50fi
    4451
    45 rm -rf $LOCALDOC
    46 svn export ${VER}/documentation $LOCALDOC
     52svn export $optsvn ${VER}/website $LOCALDIR
     53
     54if [ $force -eq 1 ]; then
     55    echo "Purging $LOCALDOC"
     56    rm -rf $LOCALDOC
     57fi
     58
     59svn export $optsvn ${VER}/documentation $LOCALDOC
     60
     61#
     62# Version handling
     63#
     64$TOOLHOME/expandver $LOCALDIR/top.shtml $LOCALDOC/mondorescue-howto.sgml $LOCALDOC/*.8; do
     65
    4766cd $LOCALDOC
    4867make -f Makefile.howto
     
    5574perl -pi -e 's~<A HREF[=./A-z0-9"]*/man1/[^<]*>([A-z0-9]*)</A>~$1~g' $LOCALDIR/docs/*.8.html
    5675perl -pi -e 's~/index.html~/index.shtml~' $LOCALDIR/docs/*.8.html
    57 #
    58 # Version handling
    59 #
    60 perl -pi -e "s~VVV-rRRR~${VER}-r${REVISION}~g" $LOCALDIR/head.shtml
    61 
    6276find $LOCALDIR -type d | xargs chmod 755
    6377find $LOCALDIR -type f | xargs chmod 644
     78
    6479cd $LOCALDIR
     80#
     81# Some links for the Web site
     82#
     83ln -sf /var/www/html/mediawiki .
     84ln -sf /var/www/html/admin .
     85
    6586if [ _"$1" == _"" ]; then
    6687        exit 0
  • branches/stable/tools/mkcommon

    r401 r402  
    3434    svn export ${VER}/mindi mindi-${MINDI_VER}
    3535    cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
     36    cp -a ${VER}/documentation/mindi.8 mindi-${MINDI_VER}
     37    rm -rf documentation-${MONDO_VER}
     38    svn export ${VER}/documentation documentation-${MONDO_VER}
     39    cd documentation-${MONDO_VER}
     40    $TOOLHOME/expandver mindi*8
     41    make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_VER}
     42    cd ..
    3643    echo "$REVISION" > mindi-${MINDI_VER}/REVISION
    3744    rm -f mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64
     
    4855    svn export ${VER}/mondo mondo-${MONDO_VER}
    4956    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
     57    mkdir -p mondo-${MONDO_VER}/docs/man
     58    cp -a ${VER}/documentation/mondo*.8 mondo-${MONDO_VER}/docs/man
    5059    echo "$REVISION" > mondo-${MONDO_VER}/REVISION
    5160    rm -rf documentation-${MONDO_VER}
    5261    svn export ${VER}/documentation documentation-${MONDO_VER}
    5362    cd documentation-${MONDO_VER}
    54     make -f Makefile.howto install INSTALLDIR=../mondo-${MONDO_VER}/mondo/docs/en
    55     make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_VER}
     63    $TOOLHOME/expandver mondorescue-howto.sgml mondo*8
     64    make -f Makefile.howto install INSTALLDIR=../mondo-${MONDO_VER}/docs/en
     65    if [ $? != 0 ]; then
     66        exit -1
     67    fi
    5668    make -f Makefile.man install-mondo INSTALLDIR=../mondo-${MONDO_VER}/docs/man
    5769    if [ $? != 0 ]; then
  • branches/stable/tools/mkdeliv

    r399 r402  
    77
    88# BerliOS FTP/SSH setup
    9 BERLIOSAC=bruno@ftp.mondorescue.org
     9ACCOUNT=bruno@ftp.mondorescue.org
    1010DSTDIR=/
    1111FTPSERV="ftp.berlios.de"
     
    4646    srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}${suf}.src.rpm"
    4747fi
    48 echo "Sources delivery to ${BERLIOSAC}:${DSTDIR}/src"
    49 scp ${tgz} ${BERLIOSAC}:${DSTDIR}/src
    50 ssh ${BERLIOSAC} "mkdir -p ${DSTDIR}/${ddir}/${dver}"
    51 echo "Packages delivery to ${BERLIOSAC}:${DSTDIR}/${ddir}/${dver}"
    52 scp ${rpms} ${BERLIOSAC}:${DSTDIR}/${ddir}/${dver}
    53 scp ${srpms} ${BERLIOSAC}:${DSTDIR}/${ddir}/${dver}
     48echo "Sources delivery to ${ACCOUNT}:${DSTDIR}/src"
     49scp ${tgz} ${ACCOUNT}:${DSTDIR}/src
     50
     51echo "Packages delivery to ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}"
     52ssh ${ACCOUNT} "mkdir -p ${DSTDIR}/${ddir}/${dver}"
     53scp ${rpms} ${srpms} ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}
     54
    5455echo "Sources delivery to ${FTPSERV} ${FTPDIR}"
    5556if [ "`which ncftpput`" != "" ]; then
  • branches/stable/website/docs.shtml

    r399 r402  
    3333                <li>A <a href="/docs/mondoarchive.8.pdf" target="_blank">PDF</a></li>
    3434                <li>A <a href="/docs/mondoarchive.8.ps" target="_blank">PostScript</a></li>
    35                 <li>A <a href="/docs/mondoarchive.8.txt" target="_blank">Test</a></li>
     35                <li>A <a href="/docs/mondoarchive.8.txt" target="_blank">Text</a></li>
    3636            </ul>
    3737          <li>mondorestore</li>
     
    4040                <li>A <a href="/docs/mondorestore.8.pdf" target="_blank">PDF</a></li>
    4141                <li>A <a href="/docs/mondorestore.8.ps" target="_blank">PostScript</a></li>
    42                 <li>A <a href="/docs/mondorestore.8.txt" target="_blank">Test</a></li>
     42                <li>A <a href="/docs/mondorestore.8.txt" target="_blank">Text</a></li>
    4343            </ul>
    4444          <li>mindi</li>
     
    4747                <li>A <a href="/docs/mindi.8.pdf" target="_blank">PDF</a></li>
    4848                <li>A <a href="/docs/mindi.8.ps" target="_blank">PostScript</a></li>
    49                 <li>A <a href="/docs/mindi.8.txt" target="_blank">Test</a></li>
     49                <li>A <a href="/docs/mindi.8.txt" target="_blank">Text</a></li>
    5050            </ul>
    5151  </ul>
     
    5757  <ul>
    5858          <li>A Mondo Rescue <a href="/docs/mondo-intro.pdf" target="_blank">introduction</a> (in French) made by Gallig Renaud.
    59           <li>A Mondo Rescue <a href="/docs/mondo-presentation-v1.pdf target="_blank"">presentation</a> made by Bruno Cornec.
    60           <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.
     59          <li>A Mondo Rescue <a href="/docs/mondo-presentation-v1.pdf" target="_blank">presentation</a> made by Bruno Cornec.
     60          <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.
    6161
    6262<!--#include virtual="/bottom.shtml" -->
  • branches/stable/website/top.shtml

    r396 r402  
    1515      </div>
    1616      <div id="topinfo">
    17         VVV-rRRR      </div>
     17        VVV-rRRR   - DDD   </div>
    1818    </div>
    1919    <div id="body">
Note: See TracChangeset for help on using the changeset viewer.