From 2ffeef9563b926cca9e02efe771cccab2877c299 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Fri, 28 Feb 2014 20:17:00 +0400 Subject: [PATCH] Docs: switched from java XSLScript to xslscript.pl. Latter is available from http://hg.nginx.org/xslscript. --- docs/GNUmakefile | 12 +++--------- docs/xsls/dump.xsls | 29 ----------------------------- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 docs/xsls/dump.xsls diff --git a/docs/GNUmakefile b/docs/GNUmakefile index cfa028998..9a920fe3f 100644 --- a/docs/GNUmakefile +++ b/docs/GNUmakefile @@ -3,7 +3,7 @@ VER= $(shell grep 'define NGINX_VERSION' src/core/nginx.h \ | sed -e 's/^.*"\(.*\)".*/\1/') NGINX= nginx-$(VER) TEMP= tmp -CP= $(HOME)/java +XSLS?= xslscript.pl all: changes @@ -36,12 +36,6 @@ $(TEMP)/$(NGINX)/CHANGES: docs/dtd/changes.dtd \ -o $@ docs/xslt/changes.xslt docs/xml/nginx/changes.xml -docs/xslt/changes.xslt: docs/xsls/changes.xsls docs/xsls/dump.xsls +docs/xslt/changes.xslt: docs/xsls/changes.xsls - java -cp $(CP)/xsls/saxon.jar:$(CP)/xsls/xsls.jar \ - com.pault.StyleSheet \ - -x com.pault.XX -y com.pault.XX \ - $< docs/xsls/dump.xsls \ - | sed 's/ *$$//;/^ *$$/N;/\n *$$/D' > $@ - - if [ ! -s $@ ]; then rm $@; fi; test -s $@ + $(XSLS) -o $@ $< diff --git a/docs/xsls/dump.xsls b/docs/xsls/dump.xsls deleted file mode 100644 index 05bc79125..000000000 --- a/docs/xsls/dump.xsls +++ /dev/null @@ -1,29 +0,0 @@ -X:stylesheet { - -X:output method="xml" -X:param indent-increment="' '"; - -X:template noname(indent="' '") = "*" { - !{$indent} - - X:if "name()='xsl:template'" { - !{$indent} - } - - X:copy { - X:copy-of "@*" - !!( indent = "concat($indent, $indent-increment)" ); - X:if "./* " { !{$indent} } - } -} - - -X:template = "comment()|processing-instruction()" { - X:copy; -} - - - -}