Mercurial > hg > nginx
changeset 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 | f0300f64e8fb |
children | a0f1d53546d4 |
files | docs/GNUmakefile docs/dtd/changes.dtd docs/xml/nginx/changes.xml docs/xsls/dump.xsls misc/GNUmakefile |
diffstat | 5 files changed, 59 insertions(+), 73 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/GNUmakefile Mon Sep 24 18:24:07 2012 +0000 +++ b/docs/GNUmakefile Mon Sep 24 18:30:26 2012 +0000 @@ -5,24 +5,6 @@ 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 @@ $(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 $@
--- a/docs/dtd/changes.dtd Mon Sep 24 18:24:07 2012 +0000 +++ b/docs/dtd/changes.dtd Mon Sep 24 18:30:26 2012 +0000 @@ -12,10 +12,10 @@ > <!ELEMENT change (para)* > -<!ATTLIST change type (bugfix | feature | change | workaround) #IMPLIED > +<!ATTLIST change type (bugfix | feature | change | security | workaround) #IMPLIED > <!ELEMENT para (#PCDATA | at | br | nobr)* > -<!ATTLIST para lang (ru | en) #IMPLIED > +<!ATTLIST para lang (ru | en) #REQUIRED > <!ELEMENT at EMPTY > <!ELEMENT br EMPTY >
--- a/docs/xml/nginx/changes.xml Mon Sep 24 18:24:07 2012 +0000 +++ b/docs/xml/nginx/changes.xml Mon Sep 24 18:30:26 2012 +0000 @@ -2,11 +2,7 @@ <!DOCTYPE change_log SYSTEM "../../dtd/changes.dtd" > -<change_log link="/nginx/changes.html" path="/nginx/" root=".." - title="nginx"> - -<title lang="ru">Изменения в nginx</title> -<title lang="en">nginx changelog</title> +<change_log title="nginx"> <changes ver="1.2.3" date="07.08.2012">
--- a/docs/xsls/dump.xsls Mon Sep 24 18:24:07 2012 +0000 +++ b/docs/xsls/dump.xsls Mon Sep 24 18:30:26 2012 +0000 @@ -1,29 +1,29 @@ -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(.)='']" {} ---> - -} +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(.)='']" {} +--> + +}
--- a/misc/GNUmakefile Mon Sep 24 18:24:07 2012 +0000 +++ b/misc/GNUmakefile Mon Sep 24 18:30:26 2012 +0000 @@ -93,7 +93,7 @@ mkdir -p $(TEMP)/$(NGINX)/temp svn export -rHEAD conf $(TEMP)/$(NGINX)/conf/ - perl -pi -e 's/$$/\r/' $(TEMP)/$(NGINX)/conf/* + sed -i '' -e "s/$$/`printf '\r'`/" $(TEMP)/$(NGINX)/conf/* svn export -rHEAD contrib $(TEMP)/$(NGINX)/contrib/ svn export -rHEAD docs/html $(TEMP)/$(NGINX)/html/ @@ -112,7 +112,7 @@ cp -p $(OBJS)/lib/$(PCRE)/LICENCE \ $(TEMP)/$(NGINX)/docs/PCRE.LICENCE - perl -ne 'print if /^ \(C\) 1995-20/ .. /^ jloup\@gzip.org/' \ + sed -ne '/^ (C) 1995-20/,/^ jloup@gzip\.org/p' \ $(OBJS)/lib/$(ZLIB)/README \ > $(TEMP)/$(NGINX)/docs/zlib.LICENSE