[svnbook commit] r3470 - Follow-up r3468, make Svnbook Build Daemon happy

codesite-noreply at google.com codesite-noreply at google.com
Fri Apr 3 03:05:55 CDT 2009


Author: dongsheng.song at gmail.com
Date: Fri Apr  3 00:54:49 2009
New Revision: 3470

Modified:
    trunk/src/es/Makefile
    trunk/src/it/Makefile
    trunk/src/nb/Makefile
    trunk/src/ru/Makefile
    trunk/src/tools/Makefile.base-po

Log:
Follow-up r3468, make Svnbook Build Daemon happy

Modified: trunk/src/es/Makefile
==============================================================================
--- trunk/src/es/Makefile	(original)
+++ trunk/src/es/Makefile	Fri Apr  3 00:54:49 2009
@@ -4,6 +4,7 @@
  default: all-html

  include ../tools/Makefile.base
+FO_XSLTPROC_OPTS = --param fop.extensions 1

  BOOK_ASPELL_FILES = appa appb book foreword ch00 ch01 ch02 ch03 ch04 \
  	ch05 ch06 ch07 ch08 ch09

Modified: trunk/src/it/Makefile
==============================================================================
--- trunk/src/it/Makefile	(original)
+++ trunk/src/it/Makefile	Fri Apr  3 00:54:49 2009
@@ -1 +1,2 @@
  include ../tools/Makefile.base
+FO_XSLTPROC_OPTS = --param fop.extensions 1

Modified: trunk/src/nb/Makefile
==============================================================================
--- trunk/src/nb/Makefile	(original)
+++ trunk/src/nb/Makefile	Fri Apr  3 00:54:49 2009
@@ -1,7 +1,8 @@
  include ../tools/Makefile.base

  # Makefile.base overrides
-FO_XSLTPROC_OPTS = --stringparam paper.type A4
+HTML_XSLTPROC_OPTS = --stringparam l10n.gentext.language nb
+FO_XSLTPROC_OPTS = --param fop.extensions 1 --stringparam paper.type A4  
--stringparam l10n.gentext.language nb
  L10N_REVISION = revisjon

  # Stuff below here is added for building the Norwegian version.

Modified: trunk/src/ru/Makefile
==============================================================================
--- trunk/src/ru/Makefile	(original)
+++ trunk/src/ru/Makefile	Fri Apr  3 00:54:49 2009
@@ -3,7 +3,7 @@
  include ../tools/Makefile.base

  # Makefile.base overrides
-FO_XSLTPROC_OPTS = --stringparam paper.type A4
+FO_XSLTPROC_OPTS = --param fop.extensions 1 --stringparam paper.type A4
  L10N_REVISION = редакции

  dist-html-chunk:

Modified: trunk/src/tools/Makefile.base-po
==============================================================================
--- trunk/src/tools/Makefile.base-po	(original)
+++ trunk/src/tools/Makefile.base-po	Fri Apr  3 00:54:49 2009
@@ -4,6 +4,8 @@

  include ../tools/Makefile.base-vars

+INSTALL_SUBDIR = $(DESTDIR)/usr/share/doc/subversion
+
  UPDATEPO = PERLLIB=../../tools/po4a/lib ../../tools/po4a/po4a-updatepo -M  
UTF-8 \
         -f docbook -o doctype='docbook' -o includeexternal \
         -o nodefault='<programlisting> <screen>' \
@@ -28,6 +30,8 @@
  	@rm -fr build po/*.mo book

  all: html html-chunk epub
+all-html: html html-chunk
+install: install-html install-html-chunk install-epub

  stat:
  	@( \
@@ -77,40 +81,66 @@
  	$(TRANSLATE) -m build/source/svnbook-en.xml -p po/svnbook.po -l  
build/source/svnbook.xml
  	$(MAKE) validate

+valid: validate
  validate: build/source/svnbook.xml
  	xmllint --nonet --noout --postvalid --xinclude $<

-epub: build/svnbook.epub
-build/svnbook.epub: build/source/svnbook.xml
+epub: build/svn-book.epub
+build/svn-book.epub: build/source/svnbook.xml
  	$(ENSURE_XSL)
-	(cd build/source; ../../../tools/xsl/epub/bin/dbtoepub -c styles.css -v  
svnbook.xml; mv svnbook.epub ..)
-
-html-chunk: build/svnbook-html-chunk/index.html
-build/svnbook-html-chunk/index.html: build/source/svnbook.xml  
stylesheets/chunk.xsl ../tools/base-html-stylesheet.xsl ../tools/chunk-stylesheet.xsl
+	(cd build/source; \
+	../../../tools/xsl/epub/bin/dbtoepub -c styles.css -v svnbook.xml; \
+	mv svnbook.epub ../svn-book.epub)
+
+html-chunk-arch: html-chunk
+html-chunk: build/svn-book-html-chunk/index.html
+build/svn-book-html-chunk/index.html: build/source/svnbook.xml  
stylesheets/chunk.xsl ../tools/base-html-stylesheet.xsl ../tools/chunk-stylesheet.xsl
  	$(ENSURE_XSL)
-	mkdir -p build/svnbook-html-chunk/images
-	cp build/source/styles.css build/svnbook-html-chunk
-	cp build/source/images/*.png build/svnbook-html-chunk/images
-	xsltproc --output build/svnbook-html-chunk/ \
+	mkdir -p build/svn-book-html-chunk/images
+	cp build/source/styles.css build/svn-book-html-chunk
+	cp build/source/images/*.png build/svn-book-html-chunk/images
+	xsltproc --output build/svn-book-html-chunk/ \
  	    stylesheets/chunk.xsl build/source/svnbook.xml
-	(cd build; tar czf svnbook-html-chunk.tgz svnbook-html-chunk)
+	(cd build; tar cjf svn-book-html-chunk.tar.bz2 svn-book-html-chunk)

-html: build/svnbook-html/svnbook.html
-build/svnbook-html/svnbook.html: build/source/svnbook.xml  
stylesheets/html.xsl ../tools/base-html-stylesheet.xsl ../tools/html-stylesheet.xsl
+html-arch: html
+html: build/svn-book-html/svn-book.html
+build/svn-book-html/svn-book.html: build/source/svnbook.xml  
stylesheets/html.xsl ../tools/base-html-stylesheet.xsl ../tools/html-stylesheet.xsl
  	$(ENSURE_XSL)
-	mkdir -p build/svnbook-html/images
-	cp ../en/book/styles.css build/svnbook-html
-	cp ../en/book/images/*.png build/svnbook-html/images
-	xsltproc --output build/svnbook-html/svnbook.html \
+	mkdir -p build/svn-book-html/images
+	cp ../en/book/styles.css build/svn-book-html
+	cp ../en/book/images/*.png build/svn-book-html/images
+	xsltproc --output build/svn-book-html/svn-book.html \
  	    stylesheets/html.xsl build/source/svnbook.xml
-	(cd build; tar czf svnbook-html.tgz svnbook-html)
+	(cd build; tar cjf svn-book-html.tar.bz2 svn-book-html)

  #
  # Requires at least fop 0.96 and configure Chinese fonts
  #
-pdf: build/svnbook.pdf
-build/svnbook.pdf: build/source/svnbook.xml  
stylesheets/fo.xsl ../tools/fo-stylesheet.xsl
+pdf: build/svn-book.pdf
+build/svn-book.pdf: build/source/svnbook.xml  
stylesheets/fo.xsl ../tools/fo-stylesheet.xsl
  	$(ENSURE_XSL)
-	xsltproc --output build/source/svnbook.fo --param fop1.extensions 1 \
+	xsltproc --output build/source/svn-book.fo --param fop1.extensions 1 \
  	    stylesheets/fo.xsl build/source/svnbook.xml
-	(cd build/source && ../../../tools/fop1.sh  
-c ../../../tools/fop1-userconfig.xml svnbook.fo ../svnbook.pdf)
+	(cd build/source && ../../../tools/fop1.sh  
-c ../../../tools/fop1-userconfig.xml -fo svn-book.fo -pdf ../svn-book.pdf)
+
+$(INSTALL_SUBDIR):
+	$(MKDIR) $(INSTALL_SUBDIR)
+
+install-epub: build/svn-book.epub $(INSTALL_SUBDIR)
+	$(INSTALL_DATA) build/svn-book.epub $(INSTALL_SUBDIR)
+
+install-pdf: build/svn-book.pdf $(INSTALL_SUBDIR)
+	$(INSTALL_DATA) build/svn-book.pdf $(INSTALL_SUBDIR)
+
+install-html: build/svn-book-html/svn-book.html $(INSTALL_SUBDIR)
+	$(INSTALL_DATA) build/svn-book-html/* $(INSTALL_SUBDIR)
+
+install-html-arch: build/svn-book-html/svn-book.html $(INSTALL_SUBDIR)
+	$(INSTALL_DATA) build/svn-book-html.tar.bz2 $(INSTALL_SUBDIR)
+
+install-html-chunk: build/svn-book-html-chunk/index.html $(INSTALL_SUBDIR)
+	$(INSTALL_DATA) build/svn-book-html-chunk/* $(INSTALL_SUBDIR)
+
+install-html-chunk-arch: build/svn-book-html-chunk/index.html  
$(INSTALL_SUBDIR)
+	$(INSTALL_DATA) build/svn-book-html-chunk.tar.bz2 $(INSTALL_SUBDIR)


More information about the svnbook-dev mailing list