[cairo-commit] cairomm ChangeLog, 1.2, 1.3 Makefile.am, 1.1.1.1, 1.2 configure.in, 1.1.1.1, 1.2

[Murray Cumming]

Committed by: murrayc

Update of /cvs/cairo/cairomm
In directory gabe:/tmp/cvs-serv16573

Modified Files:
	ChangeLog Makefile.am configure.in 
Log Message:
Increase version.

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairomm/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog	2 Dec 2005 14:05:17 -0000	1.2
+++ ChangeLog	2 Dec 2005 16:11:18 -0000	1.3
@@ -1,3 +1,5 @@
+0.2.0:
+
 2005-12-02  Murray Cumming <murrayc at murrayc.com>
 
 	* cairomm/cairomm.h: Put sensible stuff in here, 

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairomm/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.am	2 Dec 2005 13:34:41 -0000	1.1.1.1
+++ Makefile.am	2 Dec 2005 16:11:18 -0000	1.2
@@ -11,4 +11,100 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = cairomm-1.0.pc
 
+# Copied from cairo/Makefile.am:
+#
+# Some custom targets to make it easier to release things.
+# Use either:
+#		make release-check
+# or		make release-publish
+
+RELEASE_UPLOAD_HOST =   cairographics.org
+RELEASE_UPLOAD_BASE =	/srv/cairo.freedesktop.org/www
+RELEASE_UPLOAD_DIR =	$(RELEASE_UPLOAD_BASE)/releases
+RELEASE_URL_BASE = 	http://cairographics.org/releases
+RELEASE_ANNOUNCE_LIST = cairo-announce at cairographics.org (and CC gnome-announce-list at gnome.org)
+CVS = cvs
+
+#MANUAL_DATED =		cairo-manual-`date +%Y%m%d`
+#MANUAL_TAR_FILE = 	$(MANUAL_DATED).tar.gz
+#MANUAL_UPLOAD_DIR =	$(RELEASE_UPLOAD_BASE)
+
+tar_file = $(PACKAGE)-$(VERSION).tar.gz
+sha1_file = $(tar_file).sha1
+gpg_file = $(sha1_file).asc
+
+$(sha1_file): $(tar_file)
+	sha1sum $^ > $@
+
+$(gpg_file): $(sha1_file)
+	@echo "Please enter your GPG password to sign the checksum."
+	gpg --armor --sign $^ 
+
+
+
+release-verify-even-micro:
+	@echo -n "Checking that $(VERSION) has an even micro component..."
+	@test "$(GENERIC_MICRO_VERSION)" = "`echo $(GENERIC_MICRO_VERSION)/2*2 | bc`" \
+		|| (echo "Ouch." && echo "The version micro component '$(GENERIC_MICRO_VERSION)' is not an even number." \
+		&& echo "The version in configure.in must be incremented before a new release." \
+		&& false)
+	@echo "Good."
+
+release-verify-newer:
+	@echo -n "Checking that no $(VERSION) release already exists..."
+	@ssh $(RELEASE_UPLOAD_HOST) test ! -e $(RELEASE_UPLOAD_DIR)/$(tar_file) \
+		|| (echo "Ouch." && echo "Found: $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)/$(tar_file)" \
+		&& echo "Are you sure you have an updated CVS checkout?" \
+		&& echo "This should never happen." \
+		&& false)
+	@echo "Good."
+
+release-remove-old:
+	rm -f $(tar_file) $(sha1_file) $(gpg_file)
+
+# Maybe it's just my system, but somehow group sticky bits keep
+# getting set and this causes failures in un-tarring on some systems.
+# Until I figure out where the sticky bit is coming from, just clean
+# these up before building a release.
+release-cleanup-group-sticky:
+	find . -type f | xargs chmod g-s
+
+release-check: release-verify-even-micro release-verify-newer release-remove-old release-cleanup-group-sticky distcheck
+
+release-upload: release-check $(tar_file) $(sha1_file) $(gpg_file)
+	mkdir -p releases
+	scp $(tar_file) $(sha1_file) $(gpg_file) $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)
+	mv $(tar_file) $(sha1_file) $(gpg_file) releases
+	ssh $(RELEASE_UPLOAD_HOST) "rm -f $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_file) $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
+	$(CVS) tag RELEASE_$(GENERIC_MAJOR_VERSION)_$(GENERIC_MINOR_VERSION)_$(GENERIC_MICRO_VERSION)
+
+release-publish: release-upload releases/$(sha1_file)
+	@echo ""
+	@echo "Please send an announcement to $(RELEASE_ANNOUNCE_LIST)"
+	@echo "including the following:"
+	@echo ""
+	@echo "Subject: $(PACKAGE) release $(VERSION) now available"
+	@echo ""
+	@echo "============================== CUT HERE =============================="
+	@echo "A new $(PACKAGE) release $(VERSION) is now available from:"
+	@echo ""
+	@echo "	$(RELEASE_URL_BASE)/$(tar_file)"
+	@echo ""
+	@echo "    which can be verified with:"
+	@echo ""
+	@echo "	$(RELEASE_URL_BASE)/$(sha1_file)"
+	@echo -n "	"
+	@cat releases/$(sha1_file)
+	@echo ""
+	@echo "	$(RELEASE_URL_BASE)/$(gpg_file)"
+	@echo "	(signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"
+	@echo ""
+	@echo "============================== CUT HERE =============================="
+	@echo "Also, please include the new entries from the NEWS file."
+	@echo ""
+	@echo "Last but not least, do not forget to bump up the micro"
+	@echo "version component to the next (odd) number and commit."
+
+
+.PHONY: release-verify-even-micro release-verify-newer release-remove-old release-cleanup-group-sticky release-check release-upload release-publish
 

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairomm/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- configure.in	2 Dec 2005 13:34:41 -0000	1.1.1.1
+++ configure.in	2 Dec 2005 16:11:18 -0000	1.2
@@ -2,7 +2,7 @@
 
 #release versioning
 GENERIC_MAJOR_VERSION=0
-GENERIC_MINOR_VERSION=1
+GENERIC_MINOR_VERSION=2
 GENERIC_MICRO_VERSION=0
 GENERIC_VERSION=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION.$GENERIC_MICRO_VERSION
 AC_SUBST(GENERIC_MAJOR_VERSION)
@@ -11,7 +11,7 @@
 AC_SUBST(GENERIC_VERSION)
 
 #shared library versioning
-GENERIC_LIBRARY_VERSION=0:1:0
+GENERIC_LIBRARY_VERSION=0:2:0
 #                       | | |
 #                +------+ | +---+
 #                |        |     |