Author: mdounin
Date: 2012-09-24 18:30:26 +0000 (Mon, 24 Sep 2012)
New Revision: 4848
URL: http://trac.nginx.org/nginx/changeset/4848/nginx

Log:
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.


Modified:
branches/stable-1.2/
branches/stable-1.2/docs/GNUmakefile
branches/stable-1.2/docs/dtd/changes.dtd
branches/stable-1.2/docs/xml/nginx/changes.xml
branches/stable-1.2/docs/xsls/dump.xsls
branches/stable-1.2/misc/GNUmakefile

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2 2012-09-24 18:24:07 UTC (rev 4847)
+++ branches/stable-1.2 2012-09-24 18:30:26 UTC (rev 4848)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777,4780,4831-4832
\ No newline at end of property
Modified: branches/stable-1.2/docs/GNUmakefile
===================================================================
--- branches/stable-1.2/docs/GNUmakefile 2012-09-24 18:24:07 UTC (rev 4847)
+++ branches/stable-1.2/docs/GNUmakefile 2012-09-24 18:30:26 UTC (rev 4848)
@@ -5,53 +5,43 @@
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

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

- test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX)
+ mkdir -p $(TEMP)/$(NGINX)

+ xmllint --noout --valid docs/xml/nginx/changes.xml
xsltproc --stringparam lang ru \
- -o $(TEMP)/$(NGINX)/CHANGES.ru \
- docs/xslt/changes.xslt docs/xml/nginx/changes.xml
+ -o $@ docs/xslt/changes.xslt docs/xml/nginx/changes.xml


-$(TEMP)/$(NGINX)/CHANGES: 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)

+ xmllint --noout --valid docs/xml/nginx/changes.xml
xsltproc --stringparam lang en \
- -o $(TEMP)/$(NGINX)/CHANGES \
- docs/xslt/changes.xslt docs/xml/nginx/changes.xml
+ -o $@ docs/xslt/changes.xslt docs/xml/nginx/changes.xml


-docs/xslt/changes.xslt: docs/xsls/changes.xsls
+docs/xslt/changes.xslt: docs/xsls/changes.xsls docs/xsls/dump.xsls

- $(call XSLScript, docs/xsls/changes.xsls, $@)
+ 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' > $@
+
+ if [ ! -s $@ ]; then rm $@; fi; test -s $@

Modified: branches/stable-1.2/docs/dtd/changes.dtd
===================================================================
--- branches/stable-1.2/docs/dtd/changes.dtd 2012-09-24 18:24:07 UTC (rev 4847)
+++ branches/stable-1.2/docs/dtd/changes.dtd 2012-09-24 18:30:26 UTC (rev 4848)
@@ -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 >

Modified: branches/stable-1.2/docs/xml/nginx/changes.xml
===================================================================
--- branches/stable-1.2/docs/xml/nginx/changes.xml 2012-09-24 18:24:07 UTC (rev 4847)
+++ branches/stable-1.2/docs/xml/nginx/changes.xml 2012-09-24 18:30:26 UTC (rev 4848)
@@ -2,13 +2,9 @@
<!DOCTYPE change_log SYSTEM "../../dtd/changes.dtd" >


-<change_log link="/nginx/changes.html" path="/nginx/" root=".."
- title="nginx">
+<change_log title="nginx">

-<title lang="ru">Изменения в nginx</title>
-<title lang="en">nginx changelog</title>

-
<changes ver="1.2.3" date="07.08.2012">

<change type="feature">

Modified: branches/stable-1.2/docs/xsls/dump.xsls
===================================================================
--- branches/stable-1.2/docs/xsls/dump.xsls 2012-09-24 18:24:07 UTC (rev 4847)
+++ branches/stable-1.2/docs/xsls/dump.xsls 2012-09-24 18:30:26 UTC (rev 4848)
@@ -1,29 +1,29 @@
-X:stylesheet {
-
-X:output method="xml"
-X:param indent-increment="' '";
-
-X:template noname(indent="'&#xA;'") = "*" {
- !{$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="'&#xA;'") = "*" {
+ !{$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(.)='']" {}
+-->
+
+}

Modified: branches/stable-1.2/misc/GNUmakefile
===================================================================
--- branches/stable-1.2/misc/GNUmakefile 2012-09-24 18:24:07 UTC (rev 4847)
+++ branches/stable-1.2/misc/GNUmakefile 2012-09-24 18:30:26 UTC (rev 4848)
@@ -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


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel