From: Michael Smith Date: Thu, 7 Sep 2006 23:35:11 +0000 (+0000) Subject: Moved XSL stylesheets out of docsrc dir and into tools/xsl/build X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=402ef9a12a60cf60a81cead9a715025c63d3c577;p=docbook-dsssl Moved XSL stylesheets out of docsrc dir and into tools/xsl/build --- diff --git a/xsl/doc/.cvsignore b/xsl/doc/.cvsignore index 780629c3b..adbe11dd7 100644 --- a/xsl/doc/.cvsignore +++ b/xsl/doc/.cvsignore @@ -1,5 +1,6 @@ *.html reference.pdf.gz reference.txt.gz +reference.fo reference.pdf reference.txt diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile index f8762b572..909ec69cf 100644 --- a/xsl/doc/Makefile +++ b/xsl/doc/Makefile @@ -4,9 +4,7 @@ PROCOPT= XEP=xep XEPFLAGS= -REFERENCEFOXSL=../docsrc/reference-fo.xsl -REFERENCETXTXSL=../docsrc/reference-txt.xsl TXT_MAKER = LANG=C w3mmee TXT_MAKER_FLAGS = -dump -config $(W3MMEECONFIG) W3MMEECONFIG = ../../releasetools/w3mmee_config @@ -16,7 +14,6 @@ GZIPFLAGS= .PHONY : clean -RSTYLE=../docsrc/reference.xsl VPATH=../docsrc DIRS=common refentry lib html fo manpages wordml slides website template diff --git a/xsl/doc/Makefile.incl b/xsl/doc/Makefile.incl index bf14b6085..be23532ac 100644 --- a/xsl/doc/Makefile.incl +++ b/xsl/doc/Makefile.incl @@ -6,7 +6,7 @@ all: $(HTMLFILES) $(XSLT) $< $(JREFHTML) $@ $(XSLTOPT) param.html: docparam.xml - $(XSLT) $< ../../docsrc/clrefentry.xsl $(XSLTOPT) + $(XSLT) $< $(CLREFENTRY) $(XSLTOPT) touch param.html clean: diff --git a/xsl/doc/pi/Makefile b/xsl/doc/pi/Makefile index 67f17b787..f8f9f4ffc 100644 --- a/xsl/doc/pi/Makefile +++ b/xsl/doc/pi/Makefile @@ -4,5 +4,5 @@ HTMLFILES = pi.html include ../Makefile.incl pi.html: pi.xml - $(XSLT) $< ../../docsrc/pirefentry.xsl $(XSLTOPT) - touch pi.html + $(XSLT) $< $(PIREFENTRY) $(XSLTOPT) + touch $@ diff --git a/xsl/docsrc/.cvsignore b/xsl/docsrc/.cvsignore index 5befc41e4..e69de29bb 100644 --- a/xsl/docsrc/.cvsignore +++ b/xsl/docsrc/.cvsignore @@ -1,2 +0,0 @@ -xsl-params.xsl -docbook-elements.xsl diff --git a/xsl/docsrc/Makefile b/xsl/docsrc/Makefile index 035e5bd52..6ab4c8112 100644 --- a/xsl/docsrc/Makefile +++ b/xsl/docsrc/Makefile @@ -1,14 +1,11 @@ -include ../../cvstools/Makefile.incl +include ../../releasetools/Variables.mk DIRS=common refentry html fo manpages wordml slides website template DOCBOOK5_RNG=../../docbook/relaxng/docbook/docbook.rng PARAM_XSL_FILES=$(shell for file in $$(find . -name "param.xsl"); do \ readlink -f $$file; done | grep -v xhtml) -MAKE_ELEMENTS_XSL=make-elements.xsl -MAKE_PARAMS_XSL=make-xsl-params.xsl - -all: base docbook-elements.xsl xsl-params.xsl +all: base $(DOCBOOK_ELEMENTS) $(XSL_PARAMS) base: for i in $(DIRS) __bogus__; do \ @@ -27,12 +24,12 @@ clean: $(DOCBOOK5_RNG): $(MAKE) -C $(dir $@) $(notdir $@) -docbook-elements.xsl: $(MAKE_ELEMENTS_XSL) $(DOCBOOK5_RNG) +$(DOCBOOK_ELEMENTS): $(MAKE_ELEMENTS_XSL) $(DOCBOOK5_RNG) $(XSLT) $(DOCBOOK5_RNG) $< $@ -xsl-params.xsl: $(MAKE_PARAMS_XSL) $(PARAM_XSL_FILES) +$(XSL_PARAMS): $(MAKE_PARAMS_XSL) $(PARAM_XSL_FILES) $(XSLT) $< $< $@ realclean: clean - $(RM) docbook-elements.xsl - $(RM) xsl-params.xsl + $(RM) $(DOCBOOK_ELEMENTS) + $(RM) $(XSL_PARAMS) diff --git a/xsl/docsrc/release-notes-fo.xsl b/xsl/docsrc/release-notes-fo.xsl deleted file mode 100644 index bf67ddd2c..000000000 --- a/xsl/docsrc/release-notes-fo.xsl +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/xsl/docsrc/release-notes.xsl b/xsl/docsrc/release-notes.xsl deleted file mode 100644 index 17f96164c..000000000 --- a/xsl/docsrc/release-notes.xsl +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/xsl/fo/Makefile b/xsl/fo/Makefile index 9e6476258..beff554eb 100644 --- a/xsl/fo/Makefile +++ b/xsl/fo/Makefile @@ -1,15 +1,15 @@ -XSLT=../../cvstools/saxon -XJPARSE=../../cvstools/xjparse +include ../../cvstools/Makefile.incl PARAMPROF=.param.profiled PARAMSTRIP=.param.stripped +LREFENTRY=../tools/xsl/build/lrefentry.xsl include Makefile.param all: titlepage.templates.xsl param.xsl profile-docbook.xsl param.html: param.xml - $(XSLT) $< ../docsrc/lrefentry.xsl $@ + $(XSLT) $< $(LREFENTRY) $@ param.xml: param.xweb $(PARAMS) ../../cvstools/paramchk -m Makefile.param $< diff --git a/xsl/html/Makefile b/xsl/html/Makefile index 78727805d..fff19a8fd 100644 --- a/xsl/html/Makefile +++ b/xsl/html/Makefile @@ -1,8 +1,8 @@ -XSLT=../../cvstools/saxon -XJPARSE=../../cvstools/xjparse +include ../../cvstools/Makefile.incl PARAMPROF=.param.profiled PARAMSTRIP=.param.stripped +LREFENTRY=../tools/xsl/build/lrefentry.xsl include Makefile.param @@ -14,7 +14,7 @@ xml: param.xml html: param.html param.html: param.xml titlepage.templates.xsl - $(XSLT) $< ../docsrc/lrefentry.xsl $@ + $(XSLT) $< $(LREFENTRY) $@ param.xml: param.xweb $(PARAMS) ../../cvstools/paramchk -m Makefile.param $< diff --git a/xsl/lib/Makefile b/xsl/lib/Makefile index 8ab61708a..9817f06a4 100644 --- a/xsl/lib/Makefile +++ b/xsl/lib/Makefile @@ -1,13 +1,13 @@ -XSLT=../../cvstools/saxon -XJPARSE=../../cvstools/xjparse +include ../../cvstools/Makefile.incl PARAMPROF=.lib.profiled PARAMSTRIP=.lib.stripped +LREFENTRY=../tools/xsl/build/lrefentry.xsl all: lib.xsl lib.xml lib.html: lib.xml lib.xsl - $(XSLT) $< ../docsrc/lrefentry.xsl $@ + $(XSLT) $< $(LREFENTRY) $@ lib.xml: lib.xweb $(XSLT) $< ../profiling/profile.xsl $(PARAMPROF) profile.condition=html diff --git a/xsl/manpages/Makefile b/xsl/manpages/Makefile index 10ebfb009..e4609d4e4 100644 --- a/xsl/manpages/Makefile +++ b/xsl/manpages/Makefile @@ -3,6 +3,7 @@ include ../../cvstools/Makefile.incl PARAMPROF=.param.profiled PARAMSTRIP=.param.stripped MAKE_SYNOP=html2roff.xsl +LREFENTRY=../tools/xsl/build/lrefentry.xsl include Makefile.param @@ -13,7 +14,7 @@ xml: param.xml html: param.html param.html: param.xml - $(XSLT) $< ../docsrc/lrefentry.xsl $@ + $(XSLT) $< $(LREFENTRY) $@ param.xml: param.xweb $(PARAMS) ../../cvstools/paramchk -m Makefile.param $< diff --git a/xsl/tools/xsl/build/.cvsignore b/xsl/tools/xsl/build/.cvsignore new file mode 100644 index 000000000..820a42ae3 --- /dev/null +++ b/xsl/tools/xsl/build/.cvsignore @@ -0,0 +1,2 @@ +docbook-elements.xsl +xsl-params.xsl diff --git a/xsl/docsrc/clrefentry.xsl b/xsl/tools/xsl/build/clrefentry.xsl similarity index 98% rename from xsl/docsrc/clrefentry.xsl rename to xsl/tools/xsl/build/clrefentry.xsl index 424961de9..a21e6cdfe 100644 --- a/xsl/docsrc/clrefentry.xsl +++ b/xsl/tools/xsl/build/clrefentry.xsl @@ -5,7 +5,7 @@ exclude-result-prefixes="src verb" version="1.0"> - + diff --git a/xsl/docsrc/dblatex-release-notes.xsl b/xsl/tools/xsl/build/dblatex-release-notes.xsl similarity index 100% rename from xsl/docsrc/dblatex-release-notes.xsl rename to xsl/tools/xsl/build/dblatex-release-notes.xsl diff --git a/xsl/docsrc/doc-link-docbook.xsl b/xsl/tools/xsl/build/doc-link-docbook.xsl similarity index 81% rename from xsl/docsrc/doc-link-docbook.xsl rename to xsl/tools/xsl/build/doc-link-docbook.xsl index ec26c5953..f16b7b4d8 100644 --- a/xsl/docsrc/doc-link-docbook.xsl +++ b/xsl/tools/xsl/build/doc-link-docbook.xsl @@ -2,7 +2,7 @@ - + diff --git a/xsl/docsrc/jref2refsect1.xsl b/xsl/tools/xsl/build/jref2refsect1.xsl similarity index 100% rename from xsl/docsrc/jref2refsect1.xsl rename to xsl/tools/xsl/build/jref2refsect1.xsl diff --git a/xsl/docsrc/jrefhtml.xsl b/xsl/tools/xsl/build/jrefhtml.xsl similarity index 99% rename from xsl/docsrc/jrefhtml.xsl rename to xsl/tools/xsl/build/jrefhtml.xsl index 3d9763338..c79f6e993 100644 --- a/xsl/docsrc/jrefhtml.xsl +++ b/xsl/tools/xsl/build/jrefhtml.xsl @@ -2,7 +2,7 @@ - + - + § diff --git a/xsl/docsrc/make-elements.xsl b/xsl/tools/xsl/build/make-elements.xsl similarity index 100% rename from xsl/docsrc/make-elements.xsl rename to xsl/tools/xsl/build/make-elements.xsl diff --git a/xsl/docsrc/make-xsl-params.xsl b/xsl/tools/xsl/build/make-xsl-params.xsl similarity index 100% rename from xsl/docsrc/make-xsl-params.xsl rename to xsl/tools/xsl/build/make-xsl-params.xsl diff --git a/xsl/docsrc/pirefentry.xsl b/xsl/tools/xsl/build/pirefentry.xsl similarity index 100% rename from xsl/docsrc/pirefentry.xsl rename to xsl/tools/xsl/build/pirefentry.xsl diff --git a/xsl/docsrc/reference-fo.xsl b/xsl/tools/xsl/build/reference-fo.xsl similarity index 98% rename from xsl/docsrc/reference-fo.xsl rename to xsl/tools/xsl/build/reference-fo.xsl index 019e3aa7d..7b090c839 100644 --- a/xsl/docsrc/reference-fo.xsl +++ b/xsl/tools/xsl/build/reference-fo.xsl @@ -2,7 +2,7 @@ - + 1 A4 diff --git a/xsl/docsrc/reference-txt.xsl b/xsl/tools/xsl/build/reference-txt.xsl similarity index 92% rename from xsl/docsrc/reference-txt.xsl rename to xsl/tools/xsl/build/reference-txt.xsl index 1f2eaa0b5..ceb31540a 100644 --- a/xsl/docsrc/reference-txt.xsl +++ b/xsl/tools/xsl/build/reference-txt.xsl @@ -1,7 +1,7 @@ - + diff --git a/xsl/docsrc/reference.xsl b/xsl/tools/xsl/build/reference.xsl similarity index 97% rename from xsl/docsrc/reference.xsl rename to xsl/tools/xsl/build/reference.xsl index f53bd7ac2..30ad08d35 100644 --- a/xsl/docsrc/reference.xsl +++ b/xsl/tools/xsl/build/reference.xsl @@ -2,7 +2,7 @@ - + diff --git a/xsl/docsrc/tdg-link.xsl b/xsl/tools/xsl/build/tdg-link.xsl similarity index 100% rename from xsl/docsrc/tdg-link.xsl rename to xsl/tools/xsl/build/tdg-link.xsl diff --git a/xsl/docsrc/xsl-param-link.xsl b/xsl/tools/xsl/build/xsl-param-link.xsl similarity index 100% rename from xsl/docsrc/xsl-param-link.xsl rename to xsl/tools/xsl/build/xsl-param-link.xsl diff --git a/xsl/docsrc/xsl2jref.xsl b/xsl/tools/xsl/build/xsl2jref.xsl similarity index 99% rename from xsl/docsrc/xsl2jref.xsl rename to xsl/tools/xsl/build/xsl2jref.xsl index 3a155a1cb..24b35fbcc 100644 --- a/xsl/docsrc/xsl2jref.xsl +++ b/xsl/tools/xsl/build/xsl2jref.xsl @@ -5,8 +5,8 @@ xmlns:lxslt="http://xml.apache.org/xslt" exclude-result-prefixes="doc xsl lxslt"> - - + +