Mercurial > hg > nginx
diff 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 |
line wrap: on
line diff
--- a/docs/GNUmakefile +++ b/docs/GNUmakefile @@ -5,24 +5,6 @@ NGINX= nginx-$(VER) TEMP= tmp CP= $(HOME)/java -define XSLScript - 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 \ - | sed 's/ *$$//;/^ *$$/N;/\n *$$/D' > $(2) - - if [ ! -s $(2) ]; then rm $(2); fi; test -s $(2) -endef - -define XSLT - xmllint --noout --valid $2 - xsltproc -o $3 \ - $(shell echo $4 \\ - | sed -e "s/\([^= ]*\)=\([^= ]*\)/--param \1 \"'\2'\"/g") \ - $1 $2 -endef - all: changes @@ -30,28 +12,36 @@ changes: $(TEMP)/$(NGINX)/CHANGES.ru $(TEMP)/$(NGINX)/CHANGES -$(TEMP)/$(NGINX)/CHANGES.ru: docs/xml/nginx/changes.xml \ +$(TEMP)/$(NGINX)/CHANGES.ru: docs/dtd/changes.dtd \ + docs/xml/nginx/changes.xml \ + docs/xml/change_log_conf.xml \ + docs/xslt/changes.xslt + + mkdir -p $(TEMP)/$(NGINX) + + xmllint --noout --valid docs/xml/nginx/changes.xml + xsltproc --stringparam lang ru \ + -o $@ docs/xslt/changes.xslt docs/xml/nginx/changes.xml + + +$(TEMP)/$(NGINX)/CHANGES: docs/dtd/changes.dtd \ + docs/xml/nginx/changes.xml \ docs/xml/change_log_conf.xml \ docs/xslt/changes.xslt - test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX) + mkdir -p $(TEMP)/$(NGINX) - xsltproc --stringparam lang ru \ - -o $(TEMP)/$(NGINX)/CHANGES.ru \ - docs/xslt/changes.xslt docs/xml/nginx/changes.xml + xmllint --noout --valid docs/xml/nginx/changes.xml + xsltproc --stringparam lang en \ + -o $@ docs/xslt/changes.xslt docs/xml/nginx/changes.xml -$(TEMP)/$(NGINX)/CHANGES: docs/xml/nginx/changes.xml \ - docs/xml/change_log_conf.xml \ - docs/xslt/changes.xslt - - test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX) +docs/xslt/changes.xslt: docs/xsls/changes.xsls docs/xsls/dump.xsls - xsltproc --stringparam lang en \ - -o $(TEMP)/$(NGINX)/CHANGES \ - docs/xslt/changes.xslt docs/xml/nginx/changes.xml + 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' > $@ - -docs/xslt/changes.xslt: docs/xsls/changes.xsls - - $(call XSLScript, docs/xsls/changes.xsls, $@) + if [ ! -s $@ ]; then rm $@; fi; test -s $@