[cairo-commit] build/Makefile.am.releasing

[Carl Worth]

 build/Makefile.am.releasing |   27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

New commits:
commit 3386794d96d2b1616af9db5b7df1fc5c7a5796a7
Author: Carl Worth <cworth at cworth.org>
Date:   Mon Oct 27 14:09:19 2008 -0700

    Add creation of a versioned manual to the release-publish target.
    
    This arranges so that a versioned manual will be available of the form:
    
    	http://cairographics.org/manual-X.Y.Z
    
    for all future releases and snapshots. We're going through the process
    of manually doing all former releases, such as:
    
    	http://cairographics.org/manual-1.2.0/
    
    which the LSB folks wanted to reference.

diff --git a/build/Makefile.am.releasing b/build/Makefile.am.releasing
index cb9a90c..af3925e 100644
--- a/build/Makefile.am.releasing
+++ b/build/Makefile.am.releasing
@@ -34,9 +34,11 @@ RELEASE_UPLOAD_DIR =	$(RELEASE_UPLOAD_BASE)/$(RELEASE_OR_SNAPSHOT)s
 RELEASE_URL_BASE = 	http://cairographics.org/$(RELEASE_OR_SNAPSHOT)s
 RELEASE_ANNOUNCE_LIST = cairo-announce at cairographics.org (and CC gnome-announce-list at gnome.org)
 
-MANUAL_DATED =		cairo-manual-`date +%Y%m%d`
-MANUAL_TAR_FILE = 	$(MANUAL_DATED).tar.gz
-MANUAL_UPLOAD_DIR =	$(RELEASE_UPLOAD_BASE)
+MANUAL_DATED =			cairo-manual-`date +%Y%m%d`
+MANUAL_TAR_FILE = 		$(MANUAL_DATED).tar.gz
+MANUAL_VERSIONED =		manual-$(VERSION)
+MANUAL_VERSIONED_TAR_FILE =	$(MANUAL_VERSIONED).tar.gz
+MANUAL_UPLOAD_DIR =		$(RELEASE_UPLOAD_BASE)
 
 tar_file = $(PACKAGE)-$(VERSION).tar.gz
 sha1_file = $(tar_file).sha1
@@ -134,11 +136,6 @@ release-publish-message: releases/$(sha1_file)
 	@echo ""
 	@echo "============================== CUT HERE =============================="
 
-# Strict ordering enforced for parallel make to work
-release-publish: release-check
-	$(MAKE) $(AM_MAKEFLAGS) release-upload
-	$(MAKE) $(AM_MAKEFLAGS) release-publish-message
-
 doc-publish: doc
 	rm -rf ./$(MANUAL_DATED)
 	cp -a doc/public/html $(MANUAL_DATED)
@@ -146,7 +143,18 @@ doc-publish: doc
 	scp $(MANUAL_TAR_FILE) $(RELEASE_UPLOAD_HOST):$(MANUAL_UPLOAD_DIR)
 	ssh $(RELEASE_UPLOAD_HOST) "cd $(MANUAL_UPLOAD_DIR) && tar xzf $(MANUAL_TAR_FILE) && rm -f manual && ln -s $(MANUAL_DATED) manual && ln -sf $(MANUAL_TAR_FILE) cairo-manual.tar.gz"
 
+doc-publish-versioned: doc
+	rm -rf ./$(MANUAL_VERSIONED)
+	cp -a doc/public/html $(MANUAL_VERSIONED)
+	tar czf $(MANUAL_VERSIONED_TAR_FILE) $(MANUAL_VERSIONED)
+	scp $(MANUAL_VERSIONED_TAR_FILE) $(RELEASE_UPLOAD_HOST):$(MANUAL_UPLOAD_DIR)
+	ssh $(RELEASE_UPLOAD_HOST) "cd $(MANUAL_UPLOAD_DIR) && tar xzf $(MANUAL_VERSIONED_TAR_FILE)"
 
+# Strict ordering enforced for parallel make to work
+release-publish: release-check
+	$(MAKE) $(AM_MAKEFLAGS) release-upload
+	$(MAKE) $(AM_MAKEFLAGS) doc-publis-versioned
+	$(MAKE) $(AM_MAKEFLAGS) release-publish-message
 
 if OS_WIN32
 
@@ -171,7 +179,8 @@ endif
 
 .PHONY: \
 	dist-clear-sticky-bits \
-	docs-publish \
+	doc-publish \
+	doc-publish-versioned \
 	release-check \
 	release-publish \
 	release-publish-message \