svn commit: samba-docs r428 - in trunk: . scripts xslt
jelmer at samba.org
jelmer at samba.org
Thu Mar 17 00:13:12 GMT 2005
Author: jelmer
Date: 2005-03-17 00:13:11 +0000 (Thu, 17 Mar 2005)
New Revision: 428
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=428
Log:
Autogenerate parts of the makefile rather then calling seperate shell scripts.
Avoids a lot of copying images that are already present.
Removed:
trunk/scripts/copy-images.sh
trunk/xslt/find-image-dependencies.xsl
Modified:
trunk/Makefile
trunk/configure.in
Changeset:
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-03-16 20:24:47 UTC (rev 427)
+++ trunk/Makefile 2005-03-17 00:13:11 UTC (rev 428)
@@ -4,7 +4,7 @@
# James Moore <jmoore at php.net>
# Gerald Carter <jerry at samba.org>
# Jelmer Vernooij <jelmer at samba.org>
--include Makefile.settings
+include Makefile.settings
# Docs to build
MAIN_DOCS = $(patsubst %/index.xml,%,$(wildcard */index.xml))
@@ -17,7 +17,7 @@
DATETIME := $(shell date +%Y%m%d%H%M%S)
ifndef OUTPUTDIR
-Makefile.settings: Makefile.settings.in configure
+Makefile.settings: configure
@echo Makefile.settings not present, trying to run configure...
@./configure
@@ -91,20 +91,18 @@
mkdir -p $(@D)
cp $< $@
-$(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css xslt/html-chunk.xsl
+$(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css xslt/html-chunk.xsl %-images-html-chunks
mkdir -p $(@D)
$(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/$*/" xslt/html-chunk.xsl $<
- mkdir -p $(@D)/images
- $(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $(@D)
# Single large HTML files
$(OUTPUTDIR)/%/samba.css: xslt/html/samba.css
mkdir -p $(@D)
cp $< $@
+$(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS)): $(HTMLDIR)/%.html: %-images-html-single
+
$(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl
- mkdir -p $(@D)/images
- $(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $(@D)
$(XSLTPROC) --output $@ xslt/html.xsl $<
# Attributions
@@ -116,15 +114,13 @@
mkdir -p $(@D)
$(HTML2TEXT) -nobs -style pretty -o $@ $<
-$(TXTDIR)/%/: $(HTMLDIR)/%/index.html
- $(MAKE) `echo $(HTMLDIR)/$*/*.html | $(PERL) -p -e 's|$(HTMLDIR)|$(TXTDIR)|g;s/\.html/\.txt/g;'`
-
# Tex files
%.tex: $(DOCBOOKDIR)/%.xml xslt/latex.xsl
mkdir -p $(@D)
$(XSLTPROC) --output $@ xslt/latex.xsl $<
latexfigures: $(LATEX_FIGURES)
+ touch $@
$(PDFDIR)/%.pdf: %.pdf
mkdir -p $(@D)
@@ -136,11 +132,46 @@
%.ind: %.idx
$(MAKEINDEX) $<
+# Dependency files
+%.d: $(DOCBOOKDIR)/%.xml xslt/generate-dependencies.xsl
+ $(XSLTPROC) \
+ --novalid \
+ --stringparam txtbasedir "$(TXTDIR)/$*/" \
+ --stringparam target "$*" \
+ -o $@ xslt/generate-dependencies.xsl $<
+ @echo "$*-images-latex-png: \$$(addsuffix .png, \$$($*-images-latex))" >> $@
+ @echo " touch \$$@" >> $@
+ @echo >> $@
+ @echo "$*-images-latex-eps: \$$(addsuffix .eps, \$$($*-images-latex))" >> $@
+ @echo " touch \$$@" >> $@
+ @echo >> $@
+ @echo "\$$(HTMLDIR)/%: $*/%" >> $@
+ @echo " mkdir -p \$$(@D)" >> $@
+ @echo " cp \$$< \$$@" >> $@
+ @echo >> $@
+ @echo "\$$(HTMLDIR)/$*/%: $*/%" >> $@
+ @echo " mkdir -p \$$(@D)" >> $@
+ @echo " cp \$$< \$$@" >> $@
+ @echo >> $@
+ @echo "\$$(HTMLHELPDIR)/$*/%: $*/%" >> $@
+ @echo " mkdir -p \$$(@D)" >> $@
+ @echo " cp \$$< \$$@" >> $@
+ @echo >> $@
+ @echo "$*-images-html-single: \$$(addprefix \$$(HTMLDIR)/, \$$($*-images-html))" >> $@
+ @echo " touch \$$@" >> $@
+ @echo "$*-images-html-chunks: \$$(addprefix \$$(HTMLDIR)/$*/, \$$($*-images-html))" >> $@
+ @echo " touch \$$@" >> $@
+ @echo "$*-images-htmlhelp: \$$(addprefix \$$(HTMLHELPDIR)/$*/, \$$($*-images-html))" >> $@
+ @echo " touch \$$@" >> $@
+
+ifdef OUTPUTDIR
+include $(addsuffix .d,$(MAIN_DOCS))
+endif
+
# Adobe PDF files
-%.pdf: %.tex %.ind latexfigures
- $(MAKE) $(shell $(XSLTPROC) --stringparam prepend "" --stringparam append ".png" --stringparam role latex xslt/find-image-dependencies.xsl $(DOCBOOKDIR)/$*.xml)
+%.pdf: %.tex %.ind latexfigures %-images-latex-png
-$(PDFLATEX) $<
- $(THUMBPDF) $*.pdf
+ $(THUMBPDF) --quiet $*.pdf
-$(PDFLATEX) $<
# DVI files
@@ -148,8 +179,7 @@
mkdir -p $(@D)
cp $< $@
-%.dvi: %.tex %.idx
- $(MAKE) $(shell $(XSLTPROC) --stringparam prepend "" --stringparam append ".eps" --stringparam role latex xslt/find-image-dependencies.xsl $(DOCBOOKDIR)/$*.xml)
+%.dvi: %.tex %.idx %-images-latex-eps
-$(LATEX) $<
%.png: %.dia
@@ -176,10 +206,11 @@
mkdir -p $(@D)
JAVA_OPTS=-Xmx250m $(FOP) -q -d $< -pdf $@
-$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml
- mkdir -p $@/images
- $(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $@
- $(XSLTPROC) --stringparam htmlhelp.chm $*.chm --stringparam manifest.in.base.dir "$@/" --stringparam base.dir "$@/" http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $<
+$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml %-images-htmlhelp
+ $(XSLTPROC) --stringparam htmlhelp.chm $*.chm \
+ --stringparam manifest.in.base.dir "$@/" \
+ --stringparam base.dir "$@/" \
+ http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $<
# Plucker docs
$(PLUCKERDIR)/%.pdb: $(HTMLDIR)/%.html
@@ -228,7 +259,7 @@
# Validation verification
%-validate: %/index.xml
- -cd $(<D) && $(XMLLINT) --xinclude --noent --postvalid --noout $(<F)
+ cd $(<D) && $(XMLLINT) --xinclude --noent --postvalid --noout $(<F)
# Find undocumented parameters
undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc.pl scripts/find_missing_manpages.pl
@@ -264,11 +295,11 @@
clean:
rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
- rm -f *.xml
+ rm -f *.xml *.d
rm -f xslt/figures/*pdf
rm -f $(SMBDOTCONFDOC)/parameters.*.xml
rm -f $(addsuffix .*,$(MAIN_DOCS))
# Always keep intermediate files if we can
.SECONDARY:
-.PHONY: clean clobber latexfigures archive release everything all
+.PHONY: clean clobber archive release everything all
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2005-03-16 20:24:47 UTC (rev 427)
+++ trunk/configure.in 2005-03-17 00:13:11 UTC (rev 428)
@@ -66,7 +66,7 @@
DOCS_TARGET_REQUIRE_PROGRAM(PLUCKERBUILD, plucker-build, PLUCKER)
DOCS_TARGET_REQUIRE_PROGRAM(HTML2TEXT, html2text, TXT)
DOCS_TARGET_REQUIRE_PROGRAM(PERL, perl, UNDOCUMENTED)
-DOCS_TARGET_REQUIRE_PROGRAM(XMLLINT, xmllint, VERIFY)
+DOCS_TARGET_REQUIRE_PROGRAM(XMLLINT, xmllint, VALIDATE)
DOCS_TARGET_REQUIRE_PROGRAM(FOP, fop, FOPDF)
DOCS_TARGET_REQUIRE_PROGRAM(DB2TEXI, docbook2x-texi, TEXI)
DOCS_TARGET_REQUIRE_PROGRAM(MAKEINFO, makeinfo, TEXIINFO)
@@ -86,7 +86,7 @@
DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages], [manpages])
DOCS_DEFINE_TARGET(PEARSON, ALL, [pearson-compatible XML], [pearson])
DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker])
-DOCS_DEFINE_TARGET(VERIFY, ALL, [verifying docbook output], [verify])
+DOCS_DEFINE_TARGET(VALIDATE, ALL, [validating docbook output], [])
DOCS_DEFINE_TARGET(FOPDF, ALL, [PDF versions thru FO], [fo-pdf])
DOCS_DEFINE_TARGET(TEXI, ALL, [TexInfo versions], [texi])
DOCS_DEFINE_TARGET(TEXIINFO, ALL, [TexInfo Info versions], [texiinfo])
Deleted: trunk/scripts/copy-images.sh
===================================================================
--- trunk/scripts/copy-images.sh 2005-03-16 20:24:47 UTC (rev 427)
+++ trunk/scripts/copy-images.sh 2005-03-17 00:13:11 UTC (rev 428)
@@ -1,12 +0,0 @@
-#!/bin/sh
-ROLE="$1"
-XMLFILE="$2"
-FROM="$3"
-TO="$4"
-
-for x in `xsltproc --stringparam prepend "" --stringparam append "" --stringparam role "$ROLE" xslt/find-image-dependencies.xsl "$XMLFILE"`
-do
- test -f $FROM/$x || make $FROM/$x || exit 1
- cp -u $FROM/$x $TO/$x || exit 1
-done
-exit
Deleted: trunk/xslt/find-image-dependencies.xsl
===================================================================
--- trunk/xslt/find-image-dependencies.xsl 2005-03-16 20:24:47 UTC (rev 427)
+++ trunk/xslt/find-image-dependencies.xsl 2005-03-17 00:13:11 UTC (rev 428)
@@ -1,20 +0,0 @@
-<?xml version='1.0'?>
-<!--
- Find the image dependencies of a certain XML file
- (C) Jelmer Vernooij 2004
--->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.1">
- <xsl:output method="text"/>
-
- <xsl:template match="mediaobject/imageobject[@role=$role]">
- <xsl:value-of select="$prepend"/>
- <xsl:value-of select="imagedata/@fileref"/>
- <xsl:value-of select="$append"/>
- <xsl:text> </xsl:text>
- </xsl:template>
-
- <xsl:template match="text()"/>
- <xsl:template match="*">
- <xsl:apply-templates/>
- </xsl:template>
-</xsl:stylesheet>
More information about the samba-cvs
mailing list