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

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
comparison
equal deleted inserted replaced
4046:fd6f821d3fa2 4047:3e706fcccbf3
4 NGINX= nginx-$(VER) 4 NGINX= nginx-$(VER)
5 TEMP= tmp 5 TEMP= tmp
6 CP= $(HOME)/java 6 CP= $(HOME)/java
7 7
8 define XSLScript 8 define XSLScript
9 javavm -cp $(CP)/xsls/saxon.jar:$(CP)/xsls/xsls.jar \ 9 java -cp $(CP)/xsls/saxon.jar:$(CP)/xsls/xsls.jar \
10 com.pault.StyleSheet \ 10 com.pault.StyleSheet \
11 -x com.pault.XX -y com.pault.XX \ 11 -x com.pault.XX -y com.pault.XX \
12 $(1) docs/xsls/dump.xsls \ 12 $(1) docs/xsls/dump.xsls \
13 | awk 'BEGIN{e=0}/^\n*$$/{e=1;next}{if(e){print"";e=0};print}' > $(2) 13 | sed 's/ *$$//;/^ *$$/N;/\n *$$/D' > $(2)
14 14
15 if [ ! -s $(2) ]; then rm $(2); fi; test -s $(2) 15 if [ ! -s $(2) ]; then rm $(2); fi; test -s $(2)
16 endef 16 endef
17 17
18 define XSLT 18 define XSLT
19 xsltproc $(shell echo $4 \ 19 xmllint --noout --valid $2; \
20 xsltproc -o $3 \
21 $(shell echo $4 \\
20 | sed -e "s/\([^= ]*\)=\([^= ]*\)/--param \1 \"'\2'\"/g") \ 22 | sed -e "s/\([^= ]*\)=\([^= ]*\)/--param \1 \"'\2'\"/g") \
21 $3 $1 \ 23 $1 $2
22 > $(HTML)/$(strip $(2))
23 endef 24 endef
24 25
25 26
26 changes: $(TEMP)/$(NGINX)/CHANGES.ru \ 27 changes: $(TEMP)/$(NGINX)/CHANGES.ru \
27 $(TEMP)/$(NGINX)/CHANGES 28 $(TEMP)/$(NGINX)/CHANGES