Changeset 401


Ignore:
Timestamp:
Feb 17, 2006, 3:37:04 PM (13 years ago)
Author:
bcornec
Message:
  • Integrate some SuSE patches and spec tips
  • all the doc is now under documentation (man pages, pdf, generated doc)
  • delivery process adapted consequently
Location:
branches/stable
Files:
1 deleted
7 edited
4 copied
4 moved

Legend:

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

    r399 r401  
    11#
    2 # Makefile for mondorescue documentation build
     2# Makefile for mondorescue howto
    33#
    44# $Id$
     
    1010IMAGES=$(shell ls ${IMAGESDIR}/*.png | sed 's/\.png/.eps/g')
    1111
    12 #
    13 # Man pages handling
    14 #
    15 MRMPDIR=../mondo/mondo/mondorestore
    16 MRMPNAM=mondorestore.8
    17 MAMPDIR=../mondo/mondo/mondoarchive
    18 MAMPNAM=mondoarchive.8
    19 MIMPDIR=../mindi
    20 MIMPNAM=mindi.8
    21 
    22 all: all-howto all-man
    23 
    24 all-howto: $(TARGET).ps $(TARGET).pdf $(TARGET)/index.html $(TARGET).txt $(TARGET).html $(TARGET).rtf
    25 
    26 all-man: .all-man-html .all-man-pdf .all-man-txt
    27 
    28 .all-man-html: $(MRMPNAM).html $(MAMPNAM).html $(MIMPNAM).html
    29     @echo ""
    30     @echo "Generating Man pages in HTML format"
    31     @echo "-----------------------------------"
    32     @touch .all-man-html
    33 
    34 .all-man-pdf: $(MRMPNAM).pdf $(MAMPNAM).pdf $(MIMPNAM).pdf
    35     @echo ""
    36     @echo "Generating Man pages in PDF and PS format"
    37     @echo "-----------------------------------------"
    38     @touch .all-man-pdf
    39 
    40 .all-man-txt: $(MRMPNAM).txt $(MAMPNAM).txt $(MIMPNAM).txt
    41     @echo ""
    42     @echo "Generating Man pages in TXT format"
    43     @echo "----------------------------------"
    44     @touch .all-man-txt
    45 
    46 $(MRMPNAM).html: $(MRMPDIR)/$(MRMPNAM)
    47     @man2html -r $< > $@
    48 
    49 $(MAMPNAM).html: $(MAMPDIR)/$(MAMPNAM)
    50     @man2html -r $< > $@
    51 
    52 $(MIMPNAM).html: $(MIMPDIR)/$(MIMPNAM)
    53     @man2html -r $< > $@
    54 
    55 $(MRMPNAM).ps: $(MRMPDIR)/$(MRMPNAM)
    56     @man2dvi $< > $(MRMPNAM).dvi
    57     @dvips $(MRMPNAM).dvi -o $@
    58     @rm -f $(MRMPNAM).dvi
    59 
    60 $(MAMPNAM).ps: $(MAMPDIR)/$(MAMPNAM)
    61     @man2dvi $< > $(MAMPNAM).dvi
    62     @dvips $(MAMPNAM).dvi -o $@
    63     @rm -f $(MAMPNAM).dvi
    64 
    65 $(MIMPNAM).ps: $(MIMPDIR)/$(MIMPNAM)
    66     @man2dvi $< > $(MIMPNAM).dvi
    67     @dvips $(MIMPNAM).dvi -o $@
    68     @rm -f $(MIMPNAM).dvi
    69 
    70 $(MRMPNAM).pdf: $(MRMPNAM).ps
    71     @ps2pdf $<
    72 
    73 $(MAMPNAM).pdf: $(MAMPNAM).ps
    74     @ps2pdf $<
    75 
    76 $(MIMPNAM).pdf: $(MIMPNAM).ps
    77     @ps2pdf $<
    78 
    79 $(MRMPNAM).txt: $(MRMPDIR)/$(MRMPNAM)
    80     @nroff -man $< > $@
    81 
    82 $(MAMPNAM).txt: $(MAMPDIR)/$(MAMPNAM)
    83     @nroff -man $< > $@
    84 
    85 $(MIMPNAM).txt: $(MIMPDIR)/$(MIMPNAM)
    86     @nroff -man $< > $@
     12all: $(TARGET).ps $(TARGET).pdf $(TARGET)/index.html $(TARGET).txt $(TARGET).html $(TARGET).rtf
    8713
    8814${IMAGESDIR}/%.eps: ${IMAGESDIR}/%.png
     
    12955clean:
    13056    @echo ""
    131     @echo "Cleaning up the documentation directory"
     57    @echo "Cleaning up the documentation directory for the Howto"
    13258    @echo ""
    13359    @rm -fr $(TARGET).{aux,log,out,tex,dvi,pdf,ps,txt,rtf,html} $(TARGET)
     
    13561install: all
    13662    @echo ""
    137     @echo "Delivering mondorescue documentation"
     63    @echo "Delivering mondorescue howto"
    13864    @echo ""
    13965    @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
  • branches/stable/documentation/Makefile.man

    r399 r401  
    11#
    2 # Makefile for mondorescue documentation build
     2# Makefile for mondorescue man pages
    33#
    44# $Id$
    55#
    6 TARGET=mondorescue-howto
    7 SRC=$(shell ls *.sgml)
    8 DSL=$(TARGET).dsl
    9 IMAGESDIR=images
    10 IMAGES=$(shell ls ${IMAGESDIR}/*.png | sed 's/\.png/.eps/g')
     6MANPAGES=$(shell ls *.8)
     7HTMLSET=$(shell echo ${MANPAGES} | sed 's~.8~.8.html~g')
     8PDFSET=$(shell echo ${MANPAGES} | sed 's~.8~.8.pdf~g')
     9PSSET=$(shell echo ${MANPAGES} | sed 's~.8~.8.ps~g')
     10TXTSET=$(shell echo ${MANPAGES} | sed 's~.8~.8.txt~g')
    1111
    12 #
    13 # Man pages handling
    14 #
    15 MRMPDIR=../mondo/mondo/mondorestore
    16 MRMPNAM=mondorestore.8
    17 MAMPDIR=../mondo/mondo/mondoarchive
    18 MAMPNAM=mondoarchive.8
    19 MIMPDIR=../mindi
    20 MIMPNAM=mindi.8
    21 
    22 all: all-howto all-man
    23 
    24 all-howto: $(TARGET).ps $(TARGET).pdf $(TARGET)/index.html $(TARGET).txt $(TARGET).html $(TARGET).rtf
    25 
    26 all-man: .all-man-html .all-man-pdf .all-man-txt
    27 
    28 .all-man-html: $(MRMPNAM).html $(MAMPNAM).html $(MIMPNAM).html
     12.all-html: $(HTMLSET)
    2913    @echo ""
    3014    @echo "Generating Man pages in HTML format"
    3115    @echo "-----------------------------------"
    32     @touch .all-man-html
     16    @touch .all-html
    3317
    34 .all-man-pdf: $(MRMPNAM).pdf $(MAMPNAM).pdf $(MIMPNAM).pdf
     18.all-pdf: $(PDFSET)
    3519    @echo ""
    36     @echo "Generating Man pages in PDF and PS format"
     20    @echo "Generating Man pages in PDF format"
    3721    @echo "-----------------------------------------"
    38     @touch .all-man-pdf
     22    @touch .all-pdf
    3923
    40 .all-man-txt: $(MRMPNAM).txt $(MAMPNAM).txt $(MIMPNAM).txt
     24.all-ps: $(PSSET)
     25    @echo ""
     26    @echo "Generating Man pages in PS format"
     27    @echo "-----------------------------------------"
     28    @touch .all-ps
     29
     30.all-txt: $(TXTSET)
    4131    @echo ""
    4232    @echo "Generating Man pages in TXT format"
    4333    @echo "----------------------------------"
    44     @touch .all-man-txt
     34    @touch .all-txt
    4535
    46 $(MRMPNAM).html: $(MRMPDIR)/$(MRMPNAM)
     36%.8.html: %.8
    4737    @man2html -r $< > $@
    4838
    49 $(MAMPNAM).html: $(MAMPDIR)/$(MAMPNAM)
    50     @man2html -r $< > $@
     39%.8.ps: %.8
     40    @man2dvi ./$< > $<.dvi
     41    @dvips $<.dvi -o $@
     42    @rm -f $<.dvi
    5143
    52 $(MIMPNAM).html: $(MIMPDIR)/$(MIMPNAM)
    53     @man2html -r $< > $@
    54 
    55 $(MRMPNAM).ps: $(MRMPDIR)/$(MRMPNAM)
    56     @man2dvi $< > $(MRMPNAM).dvi
    57     @dvips $(MRMPNAM).dvi -o $@
    58     @rm -f $(MRMPNAM).dvi
    59 
    60 $(MAMPNAM).ps: $(MAMPDIR)/$(MAMPNAM)
    61     @man2dvi $< > $(MAMPNAM).dvi
    62     @dvips $(MAMPNAM).dvi -o $@
    63     @rm -f $(MAMPNAM).dvi
    64 
    65 $(MIMPNAM).ps: $(MIMPDIR)/$(MIMPNAM)
    66     @man2dvi $< > $(MIMPNAM).dvi
    67     @dvips $(MIMPNAM).dvi -o $@
    68     @rm -f $(MIMPNAM).dvi
    69 
    70 $(MRMPNAM).pdf: $(MRMPNAM).ps
     44%.8.pdf: %.8.ps
    7145    @ps2pdf $<
    7246
    73 $(MAMPNAM).pdf: $(MAMPNAM).ps
    74     @ps2pdf $<
    75 
    76 $(MIMPNAM).pdf: $(MIMPNAM).ps
    77     @ps2pdf $<
    78 
    79 $(MRMPNAM).txt: $(MRMPDIR)/$(MRMPNAM)
     47%.8.txt: %.8
    8048    @nroff -man $< > $@
    8149
    82 $(MAMPNAM).txt: $(MAMPDIR)/$(MAMPNAM)
    83     @nroff -man $< > $@
    84 
    85 $(MIMPNAM).txt: $(MIMPDIR)/$(MIMPNAM)
    86     @nroff -man $< > $@
    87 
    88 ${IMAGESDIR}/%.eps: ${IMAGESDIR}/%.png
    89     @echo "Converting $< to $@"
    90     @convert $< $@
    91        
    92 $(TARGET).txt: $(SRC)
    93     @echo ""
    94     @echo "Generating doc in TXT format"
    95     @echo "----------------------------"
    96     @docbook2txt $(TARGET).sgml
    97 
    98 $(TARGET).ps: $(SRC) $(DSL) $(IMAGES)
    99     @echo ""
    100     @echo "Generating doc in PostScript format"
    101     @echo "-----------------------------------"
    102     @docbook2ps -d $(TARGET).dsl'#print' $(TARGET).sgml
    103 
    104 $(TARGET)/index.html: $(SRC) $(DSL) $(IMAGES)
    105     @echo ""
    106     @echo "Generating all HTML pages"
    107     @echo "-------------------------"
    108     @rm -fr $(TARGET)
    109     @docbook2html -d $(TARGET).dsl'#html' -o $(TARGET) $(TARGET).sgml
    110 
    111 $(TARGET).html: $(SRC) $(DSL) $(IMAGES)
    112     @echo ""
    113     @echo "Generating doc in HTML format"
    114     @echo "-----------------------------"
    115     @docbook2html -u -d $(TARGET).dsl'#txt' $(TARGET).sgml
    116    
    117 $(TARGET).pdf: $(SRC) $(DSL) $(IMAGES)
    118     @echo ""
    119     @echo "Generating doc in PDF format"
    120     @echo "----------------------------"
    121     @docbook2pdf -d $(TARGET).dsl'#pdf' $(TARGET).sgml
    122 
    123 $(TARGET).rtf: $(SRC) $(DSL) $(IMAGES)
    124     @echo ""
    125     @echo "Generating doc in RTF format"
    126     @echo "----------------------------"
    127     @docbook2rtf -d $(TARGET).dsl'#print' $(TARGET).sgml
     50all: .all-html .all-pdf .all-ps .all-txt
    12851
    12952clean:
    13053    @echo ""
    131     @echo "Cleaning up the documentation directory"
     54    @echo "Cleaning up the documentation directory for man pages"
    13255    @echo ""
    133     @rm -fr $(TARGET).{aux,log,out,tex,dvi,pdf,ps,txt,rtf,html} $(TARGET)
     56    @rm -f *.8.{dvi,pdf,ps,txt,html}
    13457
    135 install: all
     58install-mindi: all
    13659    @echo ""
    137     @echo "Delivering mondorescue documentation"
     60    @echo "Delivering mindi man page"
    13861    @echo ""
    139     @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
     62    @if [ "${INSTALLDIR}" != "" ]; then mkdir -p ${INSTALLDIR} ; cp -a mindi.8.{html,pdf,ps,txt} mindi.8 ${INSTALLDIR} ; else echo "No INSTALLDIR specified aborting install"; fi
     63
     64install-mondo: all
     65    @echo ""
     66    @echo "Delivering mondo man pages"
     67    @echo ""
     68    @if [ "${INSTALLDIR}" != "" ]; then mkdir -p ${INSTALLDIR} ; cp -a mondo*.8.{html,pdf,ps,txt} mondo*.8 ${INSTALLDIR} ; else echo "No INSTALLDIR specified aborting install"; fi
  • branches/stable/mindi/distributions/rpm/mindi.spec

    r388 r401  
    3737verify packages, etc.
    3838
     39%debug_package
    3940%prep
    4041%{__rm}  -rf $RPM_BUILD_ROOT
     
    7980
    8081%changelog
     82* Fri Feb 16 2006 Bruno Cornec <bcornec@users.berlios.de> 1.0.7
     83- Updated to 1.0.7
     84- RPMS spec are now generated instead of using '%' variables
     85
    8186* Fri Nov 05 2005 Bruno Cornec <bcornec@users.berlios.de> 1.05
    8287- ia64 is now working
  • branches/stable/mindi/distributions/suse/spec.m4

    r388 r401  
    44define(`SSS', %{name}-%{version}.tgz)dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    6 define(`DDD', %{addreqb})dnl
     6define(`DDD', %{addreqb}, syslinux)dnl
    77dnl GRP is replaced by the RPM group of apps
    8 define(`GRP', Archiving/Backup)dnl
     8define(`GRP', Productivity/Archiving/Backup)dnl
  • branches/stable/mindi/mindi

    r383 r401  
    1616export ARCH=`/bin/arch`
    1717
    18 ADDITIONAL_BOOT_PARAMS="acpi=off apm=off devfs=nomount exec-shield=0"
     18ADDITIONAL_BOOT_PARAMS="acpi=off apm=off devfs=nomount exec-shield=0 noresume selinux=0 barrier=off"
    1919
    2020RUN_AFTER_INITIAL_BOOT_PHASE="echo \"Who lives in a pineapple under the sea?\" > /tmp/spongebob.squarepants.txt"
  • branches/stable/mondo/distributions/rpm/mondo.spec

    r395 r401  
    3333%endif
    3434
    35 #%package xmondo
    36 #Summary:   A QT based graphical front end for %{name}
    37 #Group:     Applications/Archiving
    38 #Requires:  %{name} = %{version}-${release}, qt, kdelibs
    39 #
    40 #%package %{name}-devel
    41 #Summary:   Header files for building against Mondo
    42 #%if %is_mandrake
    43 #Group:     Development/Libraries
    44 #%endif
    45 #if %is_redhat
    46 #Group:     Development/Other
    47 #%endif
    48 #Provides: libmondo-devel mondo-devel
    49 #Obsoletes: libmondo-devel
    50 #
    51 #%description -n %{name}-devel
    52 #Mondo libraries and includes
    53 
    5435%description
    5536Mondo is a GPL disaster recovery solution to create backup media (CD, DVD, tape, network images) that can be used to redeploy the damaged system, as well as deploy similar or less similar systems.
     
    7556con cintas y NFS, tambien.
    7657
    77 #%description xmondo
    78 #Xmondo is a QT based graphical frontend to mondoarchive.  It can help you
    79 #set up a backup by following onscreen prompts.
    80 
     58%debug_package
    8159%prep
    8260%setup -q -n %name-%{version}
  • branches/stable/mondo/distributions/suse/spec.m4

    r388 r401  
    44define(`SSS', %{name}-%{version}.tgz)dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    6 define(`DDD', %{addreqb})dnl
     6define(`DDD', %{addreqb}, buffer, cdrecord)dnl
    77dnl GRP is replaced by the RPM group of apps
    8 define(`GRP', Archiving/Backup)dnl
     8define(`GRP', Productivity/Archiving/Backup)dnl
  • branches/stable/tools/livwww

    r400 r401  
    99#
    1010LOCALDIR=/var/www/html/mondo
     11LOCALDOC=/var/www/html/mondo-doc
    1112DESTUSER=apache
    1213MONDODIR=/mondo/www/html/mondo
    1314TESTDIR=/mondo/www/html/test
     15
     16force=0
     17
     18if [ "$1" = "-f" ]; then
     19        force=1
     20        shift
     21fi
    1422
    1523/sbin/ifconfig | grep -q 10.3 2>&1 > /dev/null
     
    3038. $TOOLHOME/common-env
    3139
     40cd ${BASE}/svn
     41
    3242rm -rf $LOCALDIR
    33 cp -a ${BASE}/svn/${VER}/website $LOCALDIR
    34 (cd ${BASE}/svn/${VER}/documentation ; make)
    35 mkdir -p $LOCALDIR/docs
    36 cp -a ${BASE}/svn/${VER}/documentation/* $LOCALDIR/docs
     43svn export ${VER}/website $LOCALDIR
     44
     45rm -rf $LOCALDOC
     46svn export ${VER}/documentation $LOCALDOC
     47cd $LOCALDOC
     48make -f Makefile.howto
     49make -f Makefile.man
     50mv $LOCALDOC $LOCALDIR/docs
    3751#
    3852# Man pages corrections
     
    4155perl -pi -e 's~<A HREF[=./A-z0-9"]*/man1/[^<]*>([A-z0-9]*)</A>~$1~g' $LOCALDIR/docs/*.8.html
    4256perl -pi -e 's~/index.html~/index.shtml~' $LOCALDIR/docs/*.8.html
     57#
     58# Version handling
     59#
     60perl -pi -e "s~VVV-rRRR~${VER}-r${REVISION}~g" $LOCALDIR/head.shtml
     61
    4362find $LOCALDIR -type d | xargs chmod 755
    4463find $LOCALDIR -type f | xargs chmod 644
  • branches/stable/tools/mkcommon

    r388 r401  
    5252    svn export ${VER}/documentation documentation-${MONDO_VER}
    5353    cd documentation-${MONDO_VER}
    54     make install INSTALLDIR=../mondo-${MONDO_VER}/mondo/docs/en
     54    make -f Makefile.howto install INSTALLDIR=../mondo-${MONDO_VER}/mondo/docs/en
     55    make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_VER}
     56    make -f Makefile.man install-mondo INSTALLDIR=../mondo-${MONDO_VER}/docs/man
    5557    if [ $? != 0 ]; then
    5658        exit -1
Note: See TracChangeset for help on using the changeset viewer.