# HG changeset patch # User Ruslan Ermilov # Date 1350152155 0 # Node ID b2b10d5648938a3f645d26e57b50d839cf51602f # Parent 7b28d6ae45398d72655b53d66eb9ba78e2125380 Simplified nginx versions maintenance by providing only a single list in versions.xml. diff -r 7b28d6ae4539 -r b2b10d564893 GNUmakefile --- a/GNUmakefile Fri Oct 12 13:22:32 2012 +0000 +++ b/GNUmakefile Sat Oct 13 18:15:55 2012 +0000 @@ -206,7 +206,7 @@ xslt/version.xslt xml/versions.xml) legacy: xslt/version.xslt sign -legacy: NGINX:=$(shell xsltproc --stringparam VERSION legacy_stable \ +legacy: NGINX:=$(shell xsltproc --stringparam VERSION legacy \ xslt/version.xslt xml/versions.xml) any: sign diff -r 7b28d6ae4539 -r b2b10d564893 dtd/content.dtd --- a/dtd/content.dtd Fri Oct 12 13:22:32 2012 +0000 +++ b/dtd/content.dtd Sat Oct 13 18:15:55 2012 +0000 @@ -88,21 +88,15 @@ translator CDATA #IMPLIED > - + - - - + - + - - - + + + + + diff -r 7b28d6ae4539 -r b2b10d564893 xml/en/download.xml --- a/xml/en/download.xml Fri Oct 12 13:22:32 2012 +0000 +++ b/xml/en/download.xml Sat Oct 13 18:15:55 2012 +0000 @@ -13,168 +13,21 @@

- - - - - - - - - - - - +

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - +

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +

diff -r 7b28d6ae4539 -r b2b10d564893 xml/ru/download.xml --- a/xml/ru/download.xml Fri Oct 12 13:22:32 2012 +0000 +++ b/xml/ru/download.xml Sat Oct 13 18:15:55 2012 +0000 @@ -13,168 +13,21 @@

- - - - - - - - - - - - +

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - +

diff -r 7b28d6ae4539 -r b2b10d564893 xml/versions.xml --- a/xml/versions.xml Fri Oct 12 13:22:32 2012 +0000 +++ b/xml/versions.xml Sat Oct 13 18:15:55 2012 +0000 @@ -6,7 +6,164 @@ - 1.3.7 - 1.2.4 - 1.0.15 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 7b28d6ae4539 -r b2b10d564893 xsls/download.xsls --- a/xsls/download.xsls Fri Oct 12 13:22:32 2012 +0000 +++ b/xsls/download.xsls Sat Oct 13 18:15:55 2012 +0000 @@ -5,16 +5,32 @@ X:stylesheet { -X:template = "download" { !! "item";

} +X:template = "download" { + X:var last="@last" + X:for-each "document(concat($XML, '/versions.xml')) + /versions/download[@tag = current()/@tag]" { + + + !! "item[position() <= $last]"; + +

+ } +} -X:template = "download/item[position() <= ../@last]" { +X:template = "download/item" { X:if "position() = 1" { - X:attribute "href" { X:text{/} !{/article/@lang} X:text{/} !{../@changes} } - !{../@changes} + X:attribute "href" { + X:text{/} !{$LANG} X:text{/CHANGES} + X:if "$LANG != 'en'" { X:text{.} !{$LANG} } + X:if "../@changes != ''" { X:text{-} !{../@changes} } + } + X:text{CHANGES} + X:if "$LANG != 'en'" { X:text{.} !{$LANG} } + X:if "../@changes != ''" { X:text{-} !{../@changes} } } @@ -62,7 +78,4 @@ } - -X:template = "download/item[position() > ../@last]" { } - } diff -r 7b28d6ae4539 -r b2b10d564893 xsls/version.xsls --- a/xsls/version.xsls Fri Oct 12 13:22:32 2012 +0000 +++ b/xsls/version.xsls Sat Oct 13 18:15:55 2012 +0000 @@ -9,6 +9,6 @@ X:output method="text"; -X:template = "/versions" { !{ normalize-space(*[local-name() = $VERSION]) } }; +X:template = "/versions" { !! "download[@tag=$VERSION][1]/item[1]/@ver"; }; } diff -r 7b28d6ae4539 -r b2b10d564893 xsls/versions.xsls --- a/xsls/versions.xsls Fri Oct 12 13:22:32 2012 +0000 +++ b/xsls/versions.xsls Sat Oct 13 18:15:55 2012 +0000 @@ -6,13 +6,13 @@ X:stylesheet { X:template = "development_version" { - !{ normalize-space(document(concat($XML, '/versions.xml')) - /versions/development) } + !! "document(concat($XML, '/versions.xml')) + /versions/download[@tag='development'][1]/item[1]/@ver"; } X:template = "stable_version" { - !{ normalize-space(document(concat($XML, '/versions.xml')) - /versions/stable) } + !! "document(concat($XML, '/versions.xml')) + /versions/download[@tag='stable'][1]/item[1]/@ver"; } }