Docs: switched from java XSLScript to xslscript.pl.

Latter is available from http://hg.nginx.org/xslscript.

diff --git a/docs/GNUmakefile b/docs/GNUmakefile
index cfa02899809ebe7b96fbcc8b310de66ebf679393..9a920fe3f5c45464cd6f620989506c7d6fbb9309 100644 (file)
--- 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 (file)
index 05bc791..0000000
--- 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;
-}
-
-<!--
-X:template ="text()[normalize-space(.)='']" {}
--->
-
-}