From 15e2fe2dda5ec1d8c89d075b548768cba854901a Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 14 Dec 2005 14:14:50 +0000 Subject: [PATCH] Update --- docs/developers/version.tex | 2 +- docs/manual-de/Makefile.in | 98 ++++++++++++++++------------------- docs/manual-de/do_echo | 6 +++ docs/manual-de/update_version | 10 ++++ docs/manual/Makefile.in | 4 ++ 5 files changed, 65 insertions(+), 55 deletions(-) create mode 100644 docs/manual-de/do_echo create mode 100755 docs/manual-de/update_version diff --git a/docs/developers/version.tex b/docs/developers/version.tex index df53f38e..3ed874df 100644 --- a/docs/developers/version.tex +++ b/docs/developers/version.tex @@ -1 +1 @@ -1.38.3 (09 December 2005) +1.38.3 (12 December 2005) diff --git a/docs/manual-de/Makefile.in b/docs/manual-de/Makefile.in index 84bea94f..a7755da5 100644 --- a/docs/manual-de/Makefile.in +++ b/docs/manual-de/Makefile.in @@ -4,47 +4,24 @@ # # To build everything do # make tex -# make links -# make all # make web # make html -# make pdf +# make dvipdf # # or simply # # make # - -IMAGES=../images - -# bacula -- special case below -# running -- special case below - -# -# Note, these are all parts of the manual not in any -# particular order (mostly alphabetic). The order they -# appear in the manual is defined in bacula.tex +# for rapid development do: +# make tex +# make show # -MANUAL = \ - autochangers bootstrap bugs catalog \ - catmaintenance configure consoleconf console critical \ - daemonprotocol dirdconf director disk faq filedconf file \ - firewalls gpl install internaldb kaboom lesser \ - license messagesres monitorconf mysql oldfileset pools \ - porting postgresql progs projects quickstart recycling \ - regression rescuefloppy rescue restore rpm-faq \ - security spooling sqlite state storage \ - storedconf strategies stunnel \ - requirements supportedoses supporteddrives tapetesting \ - thanks tips vars verify win32 \ - daemonprotocol gui-interface \ - supportedchangers \ - md5 mediaformat mempool netprotocol porting smartall +IMAGES=../images first_rule: bacula -bacula: tex web html dvipdf +bacula: tex web html dvipdf mini-clean .SUFFIXES: .tex .html .PHONY: @@ -52,6 +29,8 @@ bacula: tex web html dvipdf tex: + @./update_version + @echo "Making version `cat version.tex`" @cp -fp ${IMAGES}/hires/*.eps . @touch baculai-dir.tex baculai-fd.tex baculai-sd.tex \ baculai-console.tex baculai-general.tex @@ -62,50 +41,47 @@ tex: makeindex bacula.sdx -o bacula.snd >/dev/null 2>/dev/null makeindex bacula.cdx -o bacula.cnd >/dev/null 2>/dev/null -latex -interaction=batchmode bacula.tex - @rm -f *.eps *.old pdf: @echo "Making pdfm" @cp -fp ${IMAGES}/hires/*.eps . dvipdfm -p a4 bacula.dvi -# Rename for loading on Web site - mv bacula.pdf dev-bacula.pdf - @rm -f *.eps *.old dvipdf: @echo "Making dvi to pdf" @cp -fp ${IMAGES}/hires/*.eps . dvipdf bacula.dvi bacula.pdf - @rm -f *.eps *.old html: + @echo " " @echo "Making html" -# If you turn on the following, it aborts after a "make clean" -# @./translate_images.pl --from_meaningful_names bacula.html @cp -fp ${IMAGES}/*.eps . + @rm -f next.eps next.png prev.eps prev.png up.eps up.png + @(if [ -f imagename_translations ] ; then \ + ./translate_images.pl --from_meaningful_names bacula.html; \ + fi) latex2html -white -no_subdir -split 0 -toc_stars -white -notransparent \ - -init_file latex2html-init.pl bacula >/dev/null - @echo - @./translate_images.pl --to_meaningful_names bacula.html - @rm -f *.eps *.gif *.jpg + -init_file latex2html-init.pl bacula >tex.out 2>&1 + ./translate_images.pl --to_meaningful_names bacula.html + @echo "Done making html" web: @echo "Making web" @mkdir -p bacula - @cp -f imagename_translations bacula -# If you turn on the following, it aborts after a "make clean" -# @./translate_images.pl --from_meaningful_names bacula/Bacula_Users_Guide.html - @rm -rf bacula/*.html @cp -fp ${IMAGES}/*.eps . @rm -f next.eps next.png prev.eps prev.png up.eps up.png @cp -fp ${IMAGES}/*.eps *.txt bacula + @cp -fp ${IMAGES}/*.eps *.txt ${IMAGES}/*.png bacula + @rm -f bacula/xp-*.png @rm -f bacula/next.eps bacula/next.png bacula/prev.eps bacula/prev.png bacula/up.eps bacula/up.png + @rm -rf bacula/*.html latex2html -split 4 -local_icons -t "Bacula User's Guide" -long_titles 4 \ - -toc_stars -contents_in_nav -init_file latex2html-init.pl -white -notransparent bacula >/dev/null - @echo - @./translate_images.pl --to_meaningful_names bacula/Bacula_Users_Guide.html - @cp -f bacula/Bacula_Freque_Asked_Questi.html bacula/faq.html - @rm -f *.eps *.gif *.jpg bacula/*.eps *.old + -toc_stars -contents_in_nav -init_file latex2html-init.pl -white -notransparent bacula >tex.out 2>&1 + ./translate_images.pl --to_meaningful_names bacula/Bacula_Users_Guide.html + cp -f bacula/Bacula_Freque_Asked_Questi.html bacula/faq.html + @echo "Done making web" +show: + xdvi bacula texcheck: ./check_tex.pl bacula.tex @@ -113,15 +89,29 @@ texcheck: main_configs: pic2graph -density 100 main_configs.png +mini-clean: + @rm -f 1 2 3 *.tex~ + @rm -f *.gif *.jpg *.eps + @rm -f *.aux *.cp *.fn *.ky *.log *.pg + @rm -f *.backup *.ilg *.lof *.lot + @rm -f *.cdx *.cnd *.ddx *.ddn *.fdx *.fnd *.ind *.sdx *.snd + @rm -f *.dnd *.old *.out + @rm -f bacula/*.gif bacula/*.jpg bacula/*.eps + @rm -f bacula/*.aux bacula/*.cp bacula/*.fn bacula/*.ky bacula/*.log bacula/*.pg + @rm -f bacula/*.backup bacula/*.ilg bacula/*.lof bacula/*.lot + @rm -f bacula/*.cdx bacula/*.cnd bacula/*.ddx bacula/*.ddn bacula/*.fdx bacula/*.fnd bacula/*.ind bacula/*.sdx bacula/*.snd + @rm -f bacula/*.dnd bacula/*.old bacula/*.out + @rm -f bacula/WARNINGS + + clean: - @rm -f 1 2 3 + @rm -f 1 2 3 *.tex~ @rm -f *.png *.gif *.jpg *.eps @rm -f *.pdf *.aux *.cp *.fn *.ky *.log *.pg - @rm -f *.html *.backup *.pdf *.ps *.dvi *.ilg *.lof *.lot + @rm -f *.html *.backup *.ps *.dvi *.ilg *.lof *.lot @rm -f *.cdx *.cnd *.ddx *.ddn *.fdx *.fnd *.ind *.sdx *.snd - @rm -f *.dnd + @rm -f *.dnd imagename_translations @rm -f *.old WARNINGS *.out *.toc *.idx - @rm -f images.pl labels.pl internals.pl @rm -f baculai-dir.tex baculai-fd.tex baculai-sd.tex \ baculai-console.tex baculai-general.tex images.tex @@ -130,7 +120,7 @@ distclean: @rm -f 1 2 3 *.tex~ @rm -f *.gif *.jpg *.eps @rm -f *.aux *.cp *.fn *.ky *.log *.pg - @rm -f *.backup *.pdf *.ps *.dvi *.ilg *.lof *.lot + @rm -f *.backup *.ps *.dvi *.ilg *.lof *.lot @rm -f *.cdx *.cnd *.ddx *.ddn *.fdx *.fnd *.ind *.sdx *.snd @rm -f *.dnd imagename_translations @rm -f *.old WARNINGS *.out *.toc *.idx diff --git a/docs/manual-de/do_echo b/docs/manual-de/do_echo new file mode 100644 index 00000000..04b9f79a --- /dev/null +++ b/docs/manual-de/do_echo @@ -0,0 +1,6 @@ +# +# Avoid that @VERSION@ and @DATE@ are changed by configure +# This file is sourced by update_version +# +echo "s%@VERSION@%${VERSION}%g" >${out} +echo "s%@DATE@%${DATE}%g" >>${out} diff --git a/docs/manual-de/update_version b/docs/manual-de/update_version new file mode 100755 index 00000000..78834ef7 --- /dev/null +++ b/docs/manual-de/update_version @@ -0,0 +1,10 @@ +#!/bin/sh +# +# Script file to update the Bacula version +# +out=/tmp/$$ +VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' /home/kern/bacula/branch-1.38/src/version.h` +DATE=`sed -n -e 's/^.*[ \t]*BDATE.*"\(.*\)"$/\1/p' /home/kern/bacula/branch-1.38/src/version.h` +. ./do_echo +sed -f ${out} version.tex.in >version.tex +rm -f ${out} diff --git a/docs/manual/Makefile.in b/docs/manual/Makefile.in index f3a795c3..a7755da5 100644 --- a/docs/manual/Makefile.in +++ b/docs/manual/Makefile.in @@ -12,6 +12,10 @@ # # make # +# for rapid development do: +# make tex +# make show +# IMAGES=../images -- 2.39.5