comparison docs/GNUmakefile @ 4847:0275f587e00b stable-1.2

Merge of r4777, r4780, r4831, r4832: release process changes. *) Simplified makefile that builds CHANGES. *) Removed the need in Perl to generate ZIP archive of nginx/Windows. *) Converted DOS-style newlines in dump.xslt. *) Pass changes.xml thru xmllint when generating CHANGES and CHANGES.ru.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 24 Sep 2012 18:30:26 +0000
parents b9dade63fcc2
children
comparison
equal deleted inserted replaced
4846:f0300f64e8fb 4847:0275f587e00b
2 VER= $(shell grep 'define NGINX_VERSION' src/core/nginx.h \ 2 VER= $(shell grep 'define NGINX_VERSION' src/core/nginx.h \
3 | sed -e 's/^.*\"\(.*\)\"/\1/') 3 | sed -e 's/^.*\"\(.*\)\"/\1/')
4 NGINX= nginx-$(VER) 4 NGINX= nginx-$(VER)
5 TEMP= tmp 5 TEMP= tmp
6 CP= $(HOME)/java 6 CP= $(HOME)/java
7
8 define XSLScript
9 java -cp $(CP)/xsls/saxon.jar:$(CP)/xsls/xsls.jar \
10 com.pault.StyleSheet \
11 -x com.pault.XX -y com.pault.XX \
12 $(1) docs/xsls/dump.xsls \
13 | sed 's/ *$$//;/^ *$$/N;/\n *$$/D' > $(2)
14
15 if [ ! -s $(2) ]; then rm $(2); fi; test -s $(2)
16 endef
17
18 define XSLT
19 xmllint --noout --valid $2
20 xsltproc -o $3 \
21 $(shell echo $4 \\
22 | sed -e "s/\([^= ]*\)=\([^= ]*\)/--param \1 \"'\2'\"/g") \
23 $1 $2
24 endef
25 7
26 8
27 all: changes 9 all: changes
28 10
29 changes: $(TEMP)/$(NGINX)/CHANGES.ru \ 11 changes: $(TEMP)/$(NGINX)/CHANGES.ru \
30 $(TEMP)/$(NGINX)/CHANGES 12 $(TEMP)/$(NGINX)/CHANGES
31 13
32 14
33 $(TEMP)/$(NGINX)/CHANGES.ru: docs/xml/nginx/changes.xml \ 15 $(TEMP)/$(NGINX)/CHANGES.ru: docs/dtd/changes.dtd \
16 docs/xml/nginx/changes.xml \
34 docs/xml/change_log_conf.xml \ 17 docs/xml/change_log_conf.xml \
35 docs/xslt/changes.xslt 18 docs/xslt/changes.xslt
36 19
37 test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX) 20 mkdir -p $(TEMP)/$(NGINX)
38 21
22 xmllint --noout --valid docs/xml/nginx/changes.xml
39 xsltproc --stringparam lang ru \ 23 xsltproc --stringparam lang ru \
40 -o $(TEMP)/$(NGINX)/CHANGES.ru \ 24 -o $@ docs/xslt/changes.xslt docs/xml/nginx/changes.xml
41 docs/xslt/changes.xslt docs/xml/nginx/changes.xml
42 25
43 26
44 $(TEMP)/$(NGINX)/CHANGES: docs/xml/nginx/changes.xml \ 27 $(TEMP)/$(NGINX)/CHANGES: docs/dtd/changes.dtd \
28 docs/xml/nginx/changes.xml \
45 docs/xml/change_log_conf.xml \ 29 docs/xml/change_log_conf.xml \
46 docs/xslt/changes.xslt 30 docs/xslt/changes.xslt
47 31
48 test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX) 32 mkdir -p $(TEMP)/$(NGINX)
49 33
34 xmllint --noout --valid docs/xml/nginx/changes.xml
50 xsltproc --stringparam lang en \ 35 xsltproc --stringparam lang en \
51 -o $(TEMP)/$(NGINX)/CHANGES \ 36 -o $@ docs/xslt/changes.xslt docs/xml/nginx/changes.xml
52 docs/xslt/changes.xslt docs/xml/nginx/changes.xml
53 37
54 38
55 docs/xslt/changes.xslt: docs/xsls/changes.xsls 39 docs/xslt/changes.xslt: docs/xsls/changes.xsls docs/xsls/dump.xsls
56 40
57 $(call XSLScript, docs/xsls/changes.xsls, $@) 41 java -cp $(CP)/xsls/saxon.jar:$(CP)/xsls/xsls.jar \
42 com.pault.StyleSheet \
43 -x com.pault.XX -y com.pault.XX \
44 $< docs/xsls/dump.xsls \
45 | sed 's/ *$$//;/^ *$$/N;/\n *$$/D' > $@
46
47 if [ ! -s $@ ]; then rm $@; fi; test -s $@