Mercurial > hg > nginx-site

changeset 596:19c9bd574db0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replaced development.xslt, stable.xslt and legacy_stable.xslt with one parameterized version.xslt.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 19 Jul 2012 15:04:14 +0000
parents 17cabf13efc8
children 8659ea8ffbe1
files GNUmakefile xsls/development.xsls xsls/legacy_stable.xsls xsls/stable.xsls xsls/version.xsls
diffstat 5 files changed, 22 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/GNUmakefile	Thu Jul 19 05:19:11 2012 +0000
+++ b/GNUmakefile	Thu Jul 19 15:04:14 2012 +0000
@@ -238,14 +238,16 @@
 	$(RSYNC) --delete $(foreach lang, $(LANGS), $(ZIP)/$(lang))	\
 		$(NGINX_ORG)/
 
-dev:	xslt/development.xslt sign
-dev:	NGINX=$(shell xsltproc xslt/development.xslt xml/versions.xml)
+dev:	xslt/version.xslt sign
+dev:	NGINX:=$(shell xsltproc xslt/version.xslt xml/versions.xml)
 
-stable:	xslt/stable.xslt sign
-stable:	NGINX=$(shell xsltproc xslt/stable.xslt xml/versions.xml)
+stable:	xslt/version.xslt sign
+stable:	NGINX:=$(shell xsltproc --stringparam VERSION stable		\
+	xslt/version.xslt xml/versions.xml)
 
-legacy:	xslt/legacy_stable.xslt sign
-legacy:	NGINX=$(shell xsltproc xslt/legacy_stable.xslt xml/versions.xml)
+legacy:	xslt/version.xslt sign
+legacy:	NGINX:=$(shell xsltproc --stringparam VERSION legacy_stable	\
+	xslt/version.xslt xml/versions.xml)
 
 any:	sign
 any:	NGINX=0.7.69
--- a/xsls/development.xsls	Thu Jul 19 05:19:11 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<!--
-  Copyright (C) Igor Sysoev
-  Copyright (C) Nginx, Inc.
-  -->
-
-X:stylesheet {
-
-X:output method="text";
-
-X:template = "/versions" { !{ normalize-space(development) } }
-
-}
--- a/xsls/legacy_stable.xsls	Thu Jul 19 05:19:11 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<!--
-  Copyright (C) Igor Sysoev
-  Copyright (C) Nginx, Inc.
-  -->
-
-X:stylesheet {
-
-X:output method="text";
-
-X:template = "/versions" { !{ normalize-space(legacy_stable) } }
-
-}
--- a/xsls/stable.xsls	Thu Jul 19 05:19:11 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<!--
-  Copyright (C) Igor Sysoev
-  Copyright (C) Nginx, Inc.
-  -->
-
-X:stylesheet {
-
-X:output method="text";
-
-X:template = "/versions" { !{ normalize-space(stable) } }
-
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xsls/version.xsls	Thu Jul 19 15:04:14 2012 +0000
@@ -0,0 +1,14 @@
+<!--
+  Copyright (C) Igor Sysoev
+  Copyright (C) Nginx, Inc.
+  -->
+
+X:stylesheet {
+
+X:param VERSION = "'development'";
+
+X:output method="text";
+
+X:template = "/versions" { !{ normalize-space(*[local-name() = $VERSION]) } };
+
+}