[svnbook commit] r1224 - in trunk/src/nb: . book
maxb
svnbook-dev at red-bean.com
Thu Apr 21 13:44:40 CDT 2005
Author: maxb
Date: Thu Apr 21 13:44:39 2005
New Revision: 1224
Modified:
trunk/src/nb/Makefile
trunk/src/nb/book/ch05.xml
Log:
Norwegian Book: Fix invalid XML and migrate to new Makefile system.
* nb/book/ch05.xml: Fix invalid XML (misplaced </para>).
* nb/Makefile: Migrate to new system.
Modified: trunk/src/nb/Makefile
==============================================================================
--- trunk/src/nb/Makefile (original)
+++ trunk/src/nb/Makefile Thu Apr 21 13:44:39 2005
@@ -1,147 +1,8 @@
-XSLTPROC = xsltproc
-INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion
-INSTALL = install
-
-## You shouldn't normally need to edit anything below here.
-SHELL = /bin/sh
-SVNVERSION = svnversion
-
-BOOK_TOP = .
-TOOLS_DIR = ../tools
-BOOK_HTML_CHUNK_DIR = $(BOOK_DIR)/html-chunk
-BOOK_DIR = ${BOOK_TOP}/book
-BOOK_HTML_TARGET = $(BOOK_DIR)/svn-book.html
-BOOK_HTML_CHUNK_TARGET = $(BOOK_HTML_CHUNK_DIR)/index.html # index.html is created last
-BOOK_PDF_TARGET = $(BOOK_DIR)/svn-book.pdf
-BOOK_PS_TARGET = $(BOOK_DIR)/svn-book.ps
-BOOK_FO_TARGET = $(BOOK_DIR)/svn-book.fo
-BOOK_XML_SOURCE = $(BOOK_DIR)/book.xml
-BOOK_VERSION_SOURCE = $(BOOK_DIR)/version.xml
-BOOK_ALL_SOURCE = $(BOOK_DIR)/*.xml
-BOOK_IMAGES = $(BOOK_DIR)/images/*.png
-BOOK_INSTALL_DIR = $(INSTALL_DIR)/book
-
-XSL_FO = $(TOOLS_DIR)/fo-stylesheet.xsl
-XSL_HTML = $(TOOLS_DIR)/html-stylesheet.xsl
-XSL_HTML_CHUNK = $(TOOLS_DIR)/chunk-stylesheet.xsl
-
-ENSURE_XSL = if ! test -e "$(TOOLS_DIR)/xsl"; \
- then $(TOOLS_DIR)/bin/find-xsl.py; fi
-RUN_FOP = $(TOOLS_DIR)/bin/run-fop.sh
-
-# Book xsltproc options for HTML output
-# Note: --stringparam arguments no longer go here;
-# see ../tools/html-stylesheet.xsl and ../tools/chunk-stylesheet.xsl
-BOOK_HTML_XSLTPROC_OPTS =
-
-# Book xsltproc options for PDF and PostScript output
-# BOOK_PDF_XSLTPROC_OPTS = --stringparam page.height 9in --stringparam page.width 6.4in
-# BOOK_PS_XSLTPROC_OPTS = --stringparam page.height 9in --stringparam page.width 6.4in
-
-# Uncomment the following lines if you'd like to print on A4 paper
-BOOK_PDF_XSLTPROC_OPTS = --stringparam paper.type A4
-BOOK_PS_XSLTPROC_OPTS = --stringparam paper.type A4
-
-all: all-html all-pdf all-ps
-
-install: install-book
-
-all-html: book-html book-html-chunk
-
-all-pdf: book-pdf
-
-all-ps: book-ps
-
-all-book: book-html book-html-chunk book-pdf book-ps
-
-install-book: install-book-html install-book-html-chunk install-book-pdf install-book-ps
-
-clean: book-clean
-
-$(BOOK_VERSION_SOURCE): book-version
-
-book-version:
- @if $(SVNVERSION) . > /dev/null; then \
- echo '<!ENTITY svn.version "revisjon '`$(SVNVERSION) .`'">' > $(BOOK_VERSION_SOURCE).tmp; \
- else \
- echo '<!ENTITY svn.version "">' > $(BOOK_VERSION_SOURCE).tmp; \
- fi
- @if cmp -s $(BOOK_VERSION_SOURCE) $(BOOK_VERSION_SOURCE).tmp; then \
- rm $(BOOK_VERSION_SOURCE).tmp; \
- else \
- mv $(BOOK_VERSION_SOURCE).tmp $(BOOK_VERSION_SOURCE); \
- fi
-
-book-html: $(BOOK_HTML_TARGET)
-
-$(BOOK_HTML_TARGET): $(BOOK_ALL_SOURCE) $(BOOK_VERSION_SOURCE)
- $(ENSURE_XSL)
- $(XSLTPROC) $(BOOK_HTML_XSLTPROC_OPTS) \
- --output $(BOOK_HTML_TARGET) $(XSL_HTML) $(BOOK_XML_SOURCE)
-
-book-html-chunk: $(BOOK_HTML_CHUNK_TARGET)
-
-## This trailing slash is essential that xsltproc will output pages to the dir
-$(BOOK_HTML_CHUNK_TARGET): $(BOOK_ALL_SOURCE) $(BOOK_VERSION_SOURCE) \
- $(BOOK_DIR)/styles.css $(BOOK_IMAGES)
- mkdir -p $(BOOK_HTML_CHUNK_DIR)
- mkdir -p $(BOOK_HTML_CHUNK_DIR)/images
- $(ENSURE_XSL)
- $(XSLTPROC) $(BOOK_HTML_XSLTPROC_OPTS) \
- --output $(BOOK_HTML_CHUNK_DIR)/ \
- $(XSL_HTML_CHUNK) $(BOOK_XML_SOURCE)
- cp $(BOOK_DIR)/styles.css $(BOOK_HTML_CHUNK_DIR)
- cp $(BOOK_IMAGES) $(BOOK_HTML_CHUNK_DIR)/images
-
-book-pdf: $(BOOK_PDF_TARGET)
-
-book-ps: $(BOOK_PS_TARGET)
-
-$(BOOK_PDF_TARGET): $(BOOK_ALL_SOURCE) $(BOOK_VERSION_SOURCE) $(BOOK_IMAGES)
- $(ENSURE_XSL)
- $(XSLTPROC) $(BOOK_PDF_XSLTPROC_OPTS) \
- --output $(BOOK_FO_TARGET) $(XSL_FO) $(BOOK_XML_SOURCE)
- $(RUN_FOP) $(BOOK_TOP) -fo $(BOOK_FO_TARGET) -pdf $(BOOK_PDF_TARGET)
-
-$(BOOK_PS_TARGET): $(BOOK_ALL_SOURCE) $(BOOK_VERSION_SOURCE) $(BOOK_IMAGES)
- $(ENSURE_XSL)
- $(XSLTPROC) $(BOOK_PS_XSLTPROC_OPTS) \
- --output $(BOOK_FO_TARGET) $(XSL_FO) $(BOOK_XML_SOURCE)
- $(RUN_FOP) $(BOOK_TOP) -fo $(BOOK_FO_TARGET) -ps $(BOOK_PS_TARGET)
-
-$(BOOK_INSTALL_DIR):
- $(INSTALL) -d $(BOOK_INSTALL_DIR)
-
-install-book-html: $(BOOK_HTML_TARGET)
- $(INSTALL) -d $(BOOK_INSTALL_DIR)/images
- $(INSTALL) $(BOOK_HTML_TARGET) $(BOOK_INSTALL_DIR)
- $(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR)
- $(INSTALL) $(BOOK_IMAGES) $(BOOK_INSTALL_DIR)/images
-
-install-book-html-chunk: $(BOOK_HTML_CHUNK_TARGET)
- $(INSTALL) -d $(BOOK_INSTALL_DIR)/images
- $(INSTALL) $(BOOK_HTML_CHUNK_DIR)/*.html $(BOOK_INSTALL_DIR)
- $(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR)
- $(INSTALL) $(BOOK_IMAGES) $(BOOK_INSTALL_DIR)/images
-
-install-book-pdf: $(BOOK_PDF_TARGET) $(BOOK_INSTALL_DIR)
- $(INSTALL) $(BOOK_PDF_TARGET) $(BOOK_INSTALL_DIR)
-
-install-book-ps: $(BOOK_PS_TARGET) $(BOOK_INSTALL_DIR)
- $(INSTALL) $(BOOK_PS_TARGET) $(BOOK_INSTALL_DIR)
-
-book-clean:
- rm -f $(BOOK_VERSION_SOURCE)
- rm -f $(BOOK_HTML_TARGET) $(BOOK_FO_TARGET)
- rm -rf $(BOOK_HTML_CHUNK_DIR)
- rm -f $(BOOK_PDF_TARGET) $(BOOK_PS_TARGET)
-
-# The path to xml.soc is going to vary wildly from system to system.
-# I suppose we need another find-foo script - unless anyone has a better idea?
-valid:
- SP_CHARSET_FIXED=YES SP_ENCODING=XML \
- SGML_CATALOG_FILES="/usr/share/OpenSP/xml.soc" \
- onsgmls -wxml -ges book/book.xml
+include ../tools/Makefile.base
+
+# Makefile.base overrides
+BOOK_FO_XSLTPROC_OPTS = --stringparam paper.type A4
+L10N_REVISION = revisjon
# Stuff below here is added for building the Norwegian version.
Modified: trunk/src/nb/book/ch05.xml
==============================================================================
--- trunk/src/nb/book/ch05.xml (original)
+++ trunk/src/nb/book/ch05.xml Thu Apr 21 13:44:39 2005
@@ -2631,12 +2631,12 @@
Du bruker kommandoen <command>svnadmin dump</command> for å
generere dumpdataene, og <command>svnadmin load</command> for
å legge disse dataene inn i et nytt depot (se <xref
- linkend="svn-ch-5-sect-3.5"/></para>).
+ linkend="svn-ch-5-sect-3.5"/>).
Den fine tingen med det menneskelesbare dumpformatet er at du
kan inspisere og modifisere det hvis du er forsiktig.
Selvfølgelig, bakdelen er at hvis du har to år med
depotaktivitet pakket inn i en stor dumpfil, vil det ta deg
- lang, lang tid å manuelt inspisere og modifisere den.
+ lang, lang tid å manuelt inspisere og modifisere den.</para>
<!-- @ENGLISH {{{
<para>While it won't be the most commonly used tool at the
More information about the svnbook-dev
mailing list