Update date since 0.1.2 release didn't get pushed out until today.

Update release instructions to include new release-publish target.
Add release-check and release-publish targets to simplify the release process.

6 files changed, 88 insertions, 36 deletions

diff --git a/pixman/.cvsignore b/pixman/.cvsignore
index 92be14143..a3d5a36ac 100644
--- a/pixman/.cvsignore
+++ b/pixman/.cvsignore
@@ -13,7 +13,7 @@ configure
 libpixman.pc
 libtool
 ltmain.sh
+releases
 stamp-h
 stamp-h.in
 stamp-h1
-
diff --git a/pixman/ChangeLog b/pixman/ChangeLog
index 259ddd5ba..f4459855b 100644
--- a/pixman/ChangeLog
+++ b/pixman/ChangeLog
@@ -1,3 +1,14 @@
+2004-10-27  Carl Worth  <cworth@cworth.org>
+
+	* NEWS: Update date since 0.1.2 release didn't get pushed out
+	until today.
+
+	* RELEASING: Update release instructions to include new
+	release-publish target.
+
+	* Makefile.am (release-publish): Add release-check and
+	release-publish targets to simplify the release process.
+
 2004-10-13  Carl Worth  <cworth@cworth.org>
 
 	* NEWS: Add notes for snapshot 0.1.2
diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index 3d70323a2..eea99b0a6 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -9,3 +9,45 @@ EXTRA_DIST = \
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpixman.pc
+
+tar_file = $(PACKAGE)-$(VERSION).tar.gz
+md5_file = $(tar_file).md5
+
+# Some custom targets to make it easier to release things.
+# Use either:
+#		make release-check
+# or		make release-publish
+
+RELEASE_UPLOAD_DIR = 	cairographics.org:/home/www/cairo/snapshots
+RELEASE_URL_BASE = 	http://cairographics.org/snapshots
+RELEASE_ANNOUNCE_LIST = cairo-announce@cairographics.org
+
+$(md5_file): $(tar_file)
+	md5sum $^ > $@
+
+release-remove-old:
+	rm -f $(tar_file) $(md5_file)
+
+release-check: release-remove-old distcheck $(md5_file)
+
+release-publish: release-check
+	mkdir -p releases
+	scp $(tar_file) $(md5_file) $(RELEASE_UPLOAD_DIR)
+	mv $(tar_file) $(md5_file) releases
+	@echo ""
+	@echo "Please send an announcement to $(RELEASE_ANNOUNCE_LIST)"
+	@echo "including the following:"
+	@echo ""
+	@echo "Subject: $(PACKAGE) snapshot $(VERSION) now available"
+	@echo ""
+	@echo "A new $(PACKAGE) snapshot $(VERSION) is now available from:"
+	@echo ""
+	@echo "	$(RELEASE_URL_BASE)/$(tar_file)"
+	@echo "	$(RELEASE_URL_BASE)/$(md5_file)"
+	@echo -n "	"
+	@cat releases/$(md5_file)
+	@echo ""
+	@echo "Also, please include the new entries from the NEWS file."
+
+
+
diff --git a/pixman/NEWS b/pixman/NEWS
index 8a392e19e..7d3544ce7 100644
--- a/pixman/NEWS
+++ b/pixman/NEWS
@@ -1,4 +1,4 @@
-Snapshot 0.1.2 (2004-10-13 Carl Worth <cworth@cworth.org>)
+Snapshot 0.1.2 (2004-10-27 Carl Worth <cworth@cworth.org>)
 ==========================================================
 New functionality
 -----------------
diff --git a/pixman/RELEASING b/pixman/RELEASING
index 88077f306..cb9d41605 100644
--- a/pixman/RELEASING
+++ b/pixman/RELEASING
@@ -2,16 +2,13 @@ So far, libpixman hasn't reached an initial release. But we can still form
 good habits now by practicing the release process with the current
 snapshots.
 
-10 easy steps to creating a new libpixman snapshot
-==================================================
+A new snapshot is needed whenever significant new features or bug
+fixes are committed. Here are the steps to follow:
 
-1) Commit code with a significant new feature or backwards
-   incompatibility.
+1) Ensure that there are no local, uncommitted modifications. The best
+   thing to do here may be to begin with a fresh checkout from CVS:
 
-	Either of these events triggers the need for a new snapshot.
-	Users of libpixman snapshots need to be able to specify snapshot
-	version numbers in order to get access to a specific set of
-	features.
+	cvs -d cairographics.org:/cvs/cairo co libpixman
 
 2) Verify that the code passes "make distcheck"
 
@@ -34,10 +31,14 @@ snapshots.
 4) Increment LIBPIXMAN_VERSION in configure.in
 
 	Right now, in its pre-release form, we are incrementing
-	LIBPIXMAN_VERSION for each snapshot but we are not changing the
-	libtool shared library version information. Until now, we've
-	only incremented the sub-minor version. We'll invent rules for
-	incrementing major and minor numbers when the time is right.
+	LIBPIXMAN_VERSION for each snapshot but we are not changing
+	the libtool shared library version information. Increment the
+	subminor version for bug fixes and backwards-compatible
+	additions to the API. Increment the minor number (and reset
+	the subminor) for backward-incompatible changes to the API
+	(including removals). Leave the major number at 0 until we are
+	ready for the first 1.0 release, (at which point these rules
+	will change).
 
 5) Commit the changes to NEWS and configure.in
 
@@ -45,27 +46,15 @@ snapshots.
 	other commit. It's especially important to mention the new
 	version number in the ChangeLog.
 
-6) Run "make distcheck" to generate the final tar file with the
-   correct version number.
+6) Run "make release-publish" which will perform the following steps
+   for you:
 
-7) Copy the resulting tar file to the cairo snapshots distribution
-   directory:
+	* Verify that make distcheck completes successfully
+	* Generate the final tar file with the correct version number
+	* Generate an md5sum file
+	* scp both files to cairographics.org:/home/www/cairo/snapshots
+	* Place local copies of both files in the releases directory
+	* Provide some text for the release announcement
 
-	scp libpixman-X.Y.Z-tar.gz cairographics.org:/home/www/cairo/snapshots
-
-8) Tag the entire source tree with a tag of the form SNAPSHOT_X_Y_Z:
-
-	cvs tag SNAPSHOT_X_Y_Z
-
-9) Send a message to cairo-announce@cairographics.org to announce the
-   new snapshot.
-
-	The message should provide the URL for the snapshot:
-
-		http://cairographics.org/snapshots/cairo-X.Y.Z.tar.gz
-
-	and should also include the relevant section from the NEWS
-	file.
-
-10) Sit back and relax in confidence, or alternately, brace yourself
-    for a flood of new bug reports.
+7) Send a message to cairo-announce@cairographics.org to announce the
+   new snapshot using the text provided by the previous step.
diff --git a/pixman/TODO b/pixman/TODO
new file mode 100644
index 000000000..5560d8de4
--- /dev/null
+++ b/pixman/TODO
@@ -0,0 +1,10 @@
+Need to finish up libpixman to the point where there X server can use
+it in place of its original copy of all this code (eg. in fb).  This
+means merging features that have happened in either tree since the
+birth of libpixman. Off-hand I can think of the following things that
+have happened:
+
+	* libpixman has fix for transform + repeat
+	* X server has some (MMX? SSE?) optimized compositing code
+
+But see the logs for more details.