Maarten Bosmans <[email protected]> writes: > 2011/4/2 Soeren Sandmann <[email protected]>: >> Maarten Bosmans <[email protected]> writes: >> >>> At the releases page http://cairographics.org/releases/ both the >>> latest stable (0.20.2) and unstable (0.21.6) versions are listed. This >>> is confusing for people that don't know our versioning scheme >>> (although it is no unusual scheme). I already know of one person who >>> downloaded 0.21.x thinking it was the latest stable, as also the >>> LATEST-pixman link links to the unstable series. >>> >> I have been meaning to do this, actually, but have been procrastinating, >> mainly because doing it would also involve changing the pixman Makefile >> to do the right thing on "make release" ... > > The relevant snippet from cairo/build/Makefile.am/releasing is: > > RELEASE_OR_SNAPSHOT = $$(if test "x$(CAIRO_VERSION_MINOR)" = "x$$(echo > "$(CAIRO_VERSION_MINOR)/2*2" | bc)" ; then echo release; else echo > snapshot; fi) > RELEASE_UPLOAD_HOST = cairographics.org > RELEASE_UPLOAD_BASE = /srv/cairo.freedesktop.org/www > RELEASE_UPLOAD_DIR = $(RELEASE_UPLOAD_BASE)/$(RELEASE_OR_SNAPSHOT)s > RELEASE_URL_BASE = http://cairographics.org/$(RELEASE_OR_SNAPSHOT)s > > Perhaps it's even better to copy that file entirely into the pixman > tree and tweak it for pixman, as some of the functionality is > currently already in pixman's root Makefile.am. > > Maarten
I have moved the files on www.cairographics.org. Below is a patch that changes the Makefile.am to upload to the correct directory. I'd appreciate if someone could take a look to make sure that I didn't overlook something in the patch. Soren >From 2e1134c7f53f6e7bcfcb95001d86916533861513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <[email protected]> Date: Sat, 2 Apr 2011 14:12:12 -0400 Subject: [PATCH] Makefile.am: Put development releases in "snapshots" directory Up until now, all pixman release, both snapshots and releases were uploaded to the "releases" directory on www.cairographics.org, but it's better to development snapshots in the "snapshots" directory. This patch changes Makefile.am to do that. --- Makefile.am | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index f479a66..658a375 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,10 +12,10 @@ snapshot: GPGKEY=6FF7C1A8 USERNAME=$$USER -RELEASE_OR_SNAPSHOT = $$(if test "x$(CAIRO_VERSION_MINOR)" = "x$$(echo "$(CAIRO_VERSION_MINOR)/2*2" | bc)" ; then echo release; else echo snapshot; fi) +RELEASE_OR_SNAPSHOT = $$(if test "x$(PIXMAN_VERSION_MINOR)" = "x$$(echo "$(PIXMAN_VERSION_MINOR)/2*2" | bc)" ; then echo release; else echo snapshot; fi) RELEASE_CAIRO_HOST = $(USERNAME)@cairographics.org -RELEASE_CAIRO_DIR = /srv/cairo.freedesktop.org/www/releases -RELEASE_CAIRO_URL = http://cairographics.org/releases +RELEASE_CAIRO_DIR = /srv/cairo.freedesktop.org/www/$(RELEASE_OR_SNAPSHOT)s +RELEASE_CAIRO_URL = http://cairographics.org/$(RELEASE_OR_SNAPSHOT)s RELEASE_XORG_URL = http://xorg.freedesktop.org/archive/individual/lib RELEASE_XORG_HOST = $(USERNAME)@xorg.freedesktop.org RELEASE_XORG_DIR = /srv/xorg.freedesktop.org/archive/individual/lib @@ -83,7 +83,6 @@ release-tag: git tag -u $(GPGKEY) -m "$(PACKAGE) $(VERSION) release" $(PACKAGE)-$(VERSION) release-upload: release-check $(tar_gz) $(tar_bz2) $(sha1_tgz) $(sha1_tbz2) $(md5_tgz) $(gpg_file) - mkdir -p releases scp $(tar_gz) $(sha1_tgz) $(gpg_file) $(RELEASE_CAIRO_HOST):$(RELEASE_CAIRO_DIR) scp $(tar_gz) $(tar_bz2) $(RELEASE_XORG_HOST):$(RELEASE_XORG_DIR) ssh $(RELEASE_CAIRO_HOST) "rm -f $(RELEASE_CAIRO_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_gz) $(RELEASE_CAIRO_DIR)/LATEST-$(PACKAGE)-$(VERSION)" -- 1.7.4 _______________________________________________ Pixman mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/pixman
