Fix release-publish to also update the current manual.

That is, the vesion that appears as:

	http://cairographics.org/manual
and:
	http://cairographics.org/cairo-manual.tar.gz

It was silly that we previously required a manual step to
upload the documentation (which we regularly forgot to do)
and that it uploaded with a date in the name rather than a
version. So we just drop the old doc-publish Makefile target
now as it's just not useful anymore.
This commit is contained in:
Carl Worth 2008-10-30 08:29:51 -07:00
parent 91183a503e
commit b598dcd1b1
2 changed files with 6 additions and 15 deletions

View file

@ -92,8 +92,9 @@ Here are the steps to follow to create a new cairo release:
* Generate an sha1sum file
* Sign the sha1sum using your GPG setup (asks for your GPG password)
* scp the three files to appear on http://cairographics.org/releases
* Generate a versioned manual and upload it to appear as:
* Generate a versioned manual and upload it to appear as both:
http://cairographics.org/manual-X.Y.Z
http://cairographics.org/manual
* Place local copies of the three files in the releases directory
* Create a LATEST-package-version file (after deleting any old one)
* Tag the entire source tree with a tag of the form X.Y.Z, and sign

View file

@ -34,10 +34,8 @@ 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@cairographics.org (and CC gnome-announce-list@gnome.org)
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_TAR_FILE = $(MANUAL_VERSIONED).tar.gz
MANUAL_UPLOAD_DIR = $(RELEASE_UPLOAD_BASE)
tar_file = $(PACKAGE)-$(VERSION).tar.gz
@ -136,19 +134,12 @@ release-publish-message: releases/$(sha1_file)
@echo ""
@echo "============================== CUT HERE =============================="
doc-publish: doc
rm -rf ./$(MANUAL_DATED)
cp -a doc/public/html $(MANUAL_DATED)
tar czf $(MANUAL_TAR_FILE) $(MANUAL_DATED)
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)"
tar czf $(MANUAL_TAR_FILE) $(MANUAL_VERSIONED)
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_VERSIONED) manual && ln -sf $(MANUAL_TAR_FILE) cairo-manual.tar.gz"
# Strict ordering enforced for parallel make to work
release-publish: release-check
@ -179,7 +170,6 @@ endif
.PHONY: \
dist-clear-sticky-bits \
doc-publish \
doc-publish-versioned \
release-check \
release-publish \