Report and use release version.

diff --git a/.travis.yml b/.travis.yml
index 46e1a86a4e7d47bc9d9930c51057be4c437fb432..34e6b089a5208e2d7dbd29b1aaa17689c4e70741 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ script:
 - make
 - make check
 - make dist
+- export VERSION=$(make version)
 
 after_success:
 # Update CDN
@@ -52,15 +53,15 @@ deploy:
   api_key:
     secure: "VJAj9hVynNFo4A5G5E6/PbND0dE/NpV1tzhuEgP86RyK1O6CIdIgUMvhjtH2Nv1fuc1C7PdEwMsggNFIelquVIJfdfTSq1xvwYbuQV9djXGhnoDRZB99a8cTI9q7xJ9E4d5fZyLd+s93Pzh3yTUZY+BCaVohnoZPhkA09YqKu/B/XVCDN/Qb3S5rdI+sacGCJqAoXXVrlNn4WUNUBCshJ/o/9KzvdGs5AcVDB8n219CIK5Lw+bM7rV0ifnwcQyLyc2k5fJdQkDoXQwuoeZ9YpNi2Cqoe5NWPtZxzGB5jod21yyU6/QYzOxA/64aC/ZRhEIUMiAnP0gGqTkK+DHJwC+ficoh8iTzNiVNlBuoYqKxo7ErKJPFgpppfCh07SFy8alJ6h1zFeYYLxohqBI1KdfDpDtO5h3YzTm17pQZ8xtuca1U4FgaMnXVMgsvThEwoPgqnhN1ee57MUuwZPc6tc811fZRZcVzfyTIkmpn084Cxl3jk6ZLTF91da/X7FQB/SsKghY1NCpdIwU0oW0PC72fXdSRK+mOegh1Z5aL1unrYp7jVCHEgjHobbe9P5SpycJ3ndiMbTFcnQil/gc6C+7Z7IedE/mlaEtvlrYHtK4w8GNsNWCXfIY4bxZS3XugS43eZc09MTyTTqRHsIgRfsveERmzQRWLtN02VDMYmul4="
   file:
-  - dist/docbook-xsl-snapshot.tar.bz2
-  - dist/docbook-xsl-snapshot.tar.gz
-  - dist/docbook-xsl-snapshot.zip
-  - dist/docbook-xsl-nons-snapshot.tar.bz2
-  - dist/docbook-xsl-nons-snapshot.tar.gz
-  - dist/docbook-xsl-nons-snapshot.zip
-  - dist/docbook-xsl-doc-snapshot.tar.bz2
-  - dist/docbook-xsl-doc-snapshot.tar.gz
-  - dist/docbook-xsl-doc-snapshot.zip
+  - dist/docbook-xsl-$VERSION.tar.bz2
+  - dist/docbook-xsl-$VERSION.tar.gz
+  - dist/docbook-xsl-$VERSION.zip
+  - dist/docbook-xsl-nons-$VERSION.tar.bz2
+  - dist/docbook-xsl-nons-$VERSION.tar.gz
+  - dist/docbook-xsl-nons-$VERSION.zip
+  - dist/docbook-xsl-doc-$VERSION.tar.bz2
+  - dist/docbook-xsl-doc-$VERSION.tar.gz
+  - dist/docbook-xsl-doc-$VERSION.zip
   on:
     repo: docbook/xslt10-stylesheets
     branch: master

diff --git a/.travis/publish-release.sh b/.travis/publish-release.sh
index 1fc966a5ebc57f405b53c1000473468c7b6179bf..81e5a95d977deb10540fa2e264c1b77bbaee00fe 100755 (executable)
--- a/.travis/publish-release.sh
+++ b/.travis/publish-release.sh
@@ -17,19 +17,21 @@ SHA=$(git rev-parse --verify HEAD)
 CDN_REPO="https://$GH_TOKEN@github.com/docbook/cdn.git"
 git clone $CDN_REPO cdn --depth=1 -q
 # Clean out existing content...
-rm -rf cdn/release/xsl/snapshot
-rm -rf cdn/release/xsl-nons/snapshot
+rm -rf cdn/release/xsl/$VERSION
+rm -rf cdn/release/xsl-nons/$VERSION
 # ...and copy the new one.
 mkdir -p cdn/release/xsl
 mkdir -p cdn/release/xsl-nons
-cp -a dist/docbook-xsl-snapshot cdn/release/xsl/snapshot
-cp -a dist/docbook-xsl-nons-snapshot cdn/release/xsl-nons/snapshot
+rm -f cdn/release/xsl/index.html
+rm -f cdn/release/xsl-nons/index.html
+cp -a dist/docbook-xsl-$VERSION cdn/release/xsl/$VERSION
+cp -a dist/docbook-xsl-nons-$VERSION cdn/release/xsl-nons/$VERSION
 # We could normally make "current" symbolic links to "snapshot"
 # but github's policy doesn't allow to publish symbolic links in pages.
 rm -rf cdn/release/xsl/current
 rm -rf cdn/release/xsl-nons/current
-cp -a cdn/release/xsl/snapshot cdn/release/xsl/current
-cp -a cdn/release/xsl-nons/snapshot cdn/release/xsl-nons/current
+cp -a cdn/release/xsl/$VERSION cdn/release/xsl/current
+cp -a cdn/release/xsl-nons/$VERSION cdn/release/xsl-nons/current
 
 # If there are no changes, bail out.
 # (Note that this doesn't detect additions.)

diff --git a/Makefile b/Makefile
index f203d8da64c2d57dd719f4445201d575e48ee491..da61ec7f1c22736e17af10d2ea57119bcdbfdbc9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,9 @@ export repo_dir ?= $(abspath .)
 all:
        $(MAKE) -C xsl
 
+version:
+       @$(MAKE) -s -C xsl version
+
 doc:
        $(MAKE) -C xsl doc
 

diff --git a/xsl/Makefile b/xsl/Makefile
index 7a55c64d3c1e7be0557b3874db488fe3d115489c..a4d82e42b97cdcdfa4cbaf64debbbbe563f1a289 100644 (file)
--- a/xsl/Makefile
+++ b/xsl/Makefile
@@ -73,6 +73,9 @@ all: base
 base:
        for d in $(DIRS) ; do $(MAKE) -C $$d; done
 
+version:
+       echo $(RELVER)
+
 xhtml:
        $(MAKE) -C xhtml
        $(MAKE) -C xhtml-1_1