Mercurial > hg > nginx

diff docs/GNUmakefile @ 4047:3e706fcccbf3 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r3996, r3998, r4015, r4023, r4025, r4026, r4027: Changes log build procedure fixes: *) using sed instead of perl *) support <br/> in the middle of input *) fixed "<br>" lookup (eliminates the need in " <br/>" hacks) *) fixed maximum length for unbreakable input *) fixed space lookup (allows a space at column 77 to break a line) *) traling spaces removal in text CHANGES files.
author Igor Sysoev <igor@sysoev.ru>
date Mon, 29 Aug 2011 13:57:43 +0000
parents 520cb18b64fb
children dc7549aa8556
line wrap: on
line diff
--- a/docs/GNUmakefile
+++ b/docs/GNUmakefile
@@ -6,20 +6,21 @@ TEMP=	tmp
 CP=	$(HOME)/java
 
 define  XSLScript
-	javavm -cp $(CP)/xsls/saxon.jar:$(CP)/xsls/xsls.jar		\
+	java -cp $(CP)/xsls/saxon.jar:$(CP)/xsls/xsls.jar		\
 		com.pault.StyleSheet					\
 		-x com.pault.XX -y com.pault.XX				\
-	$(1) docs/xsls/dump.xsls					\
-	| awk 'BEGIN{e=0}/^\n*$$/{e=1;next}{if(e){print"";e=0};print}' > $(2)
+		$(1) docs/xsls/dump.xsls				\
+	| sed 's/ *$$//;/^ *$$/N;/\n *$$/D' > $(2)
 
 	if [ ! -s $(2) ]; then rm $(2); fi; test -s $(2)
 endef
 
 define  XSLT
-	xsltproc $(shell echo $4					\
+	xmllint --noout --valid $2;					\
+	xsltproc -o $3							\
+		$(shell echo $4						\\
 		| sed -e "s/\([^= ]*\)=\([^= ]*\)/--param \1 \"'\2'\"/g") \
-		$3 $1							\
-	> $(HTML)/$(strip $(2))
+		$1 $2
 endef