[cairo-commit] 3 commits - doc/public Makefile.am

[Behdad Esfahbod]

 Makefile.am            |   14 +++++++-------
 doc/public/.gitignore  |    1 +
 doc/public/Makefile.am |   44 ++++++++++++++++++++++++++++----------------
 3 files changed, 36 insertions(+), 23 deletions(-)

New commits:
diff-tree 0d073c2e86ced3a94ef76e7e4c2a00f8fb76efb1 (from b37562868d2254d2dbd93a8808d32f0a0d769195)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jun 28 03:25:08 2006 +0200

    Use $RELEASE_OR_SNAPSHOT to determine upload directory.
    Turn distcheck on release-check on again, as CAIRO_TEST_TARGET="" can be used
    to disable all failures now.

diff --git a/Makefile.am b/Makefile.am
index 7915f21..cae2e7a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,12 +61,12 @@ $(srcdir)/ChangeLog:
 #		make release-check
 # or		make release-publish
 
+RELEASE_OR_SNAPSHOT = `if [ "$(CAIRO_VERSION_MINOR)" = $$(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)/snapshots
-RELEASE_URL_BASE = 	http://cairographics.org/snapshots
+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)
-RELEASE_OR_SNAPSHOT = `if [ "$(CAIRO_VERSION_MINOR)" = $$(echo "$(CAIRO_VERSION_MINOR)/2*2" | bc) ]; then echo release; else echo snapshot; fi`
 
 MANUAL_DATED =		cairo-manual-`date +%Y%m%d`
 MANUAL_TAR_FILE = 	$(MANUAL_DATED).tar.gz
@@ -88,12 +88,12 @@ runtime_zip_file = /tmp/$(PACKAGE)-$(VER
 developer_zip_file = /tmp/$(PACKAGE)-dev-$(VERSION).zip
 
 $(runtime_zip_file): install
-	-rm $@
+	-$(RM) $@
 	cd $(prefix); \
 	zip $@ bin/libcairo-$(LT_CURRENT_MINUS_AGE).dll
 
 $(developer_zip_file): install
-	-rm $@
+	-$(RM) $@
 	cd $(prefix); \
 	zip -r $@ include/cairo lib/libcairo.dll.a lib/cairo.lib lib/pkgconfig/cairo.pc lib/pkgconfig/cairo-*.pc share/gtk-doc/html/cairo
 
@@ -125,7 +125,7 @@ release-verify-newer:
 	@echo "Good."
 
 release-remove-old:
-	rm -f $(tar_file) $(sha1_file) $(gpg_file)
+	$(RM) $(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.
@@ -134,7 +134,7 @@ release-remove-old:
 release-cleanup-group-sticky:
 	find . -type f | xargs chmod g-s
 
-release-check: release-verify-soname-major release-verify-even-micro release-verify-newer release-remove-old release-cleanup-group-sticky dist
+release-check: release-verify-soname-major 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
diff-tree b37562868d2254d2dbd93a8808d32f0a0d769195 (from 9fe0ea16d344d5b9bed1cd7f6046e378ce76ae1f)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jun 28 03:16:33 2006 +0200

    Ignore *.bak

diff --git a/doc/public/.gitignore b/doc/public/.gitignore
index bd6996b..fa0e847 100644
--- a/doc/public/.gitignore
+++ b/doc/public/.gitignore
@@ -15,3 +15,4 @@ html
 xml
 version.xml
 *~
+*.bak
diff-tree 9fe0ea16d344d5b9bed1cd7f6046e378ce76ae1f (from ddb81d3cade326fecfe1ed05037542e958e734b5)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jun 28 03:15:41 2006 +0200

    Update list of ignored header files.

diff --git a/doc/public/Makefile.am b/doc/public/Makefile.am
index 98d3706..0899e8d 100644
--- a/doc/public/Makefile.am
+++ b/doc/public/Makefile.am
@@ -19,22 +19,34 @@ HFILE_GLOB=$(top_srcdir)/src/*.h
 CFILE_GLOB=$(top_srcdir)/src/*.c $(top_srcdir)/src/*.h
 
 # Headers to ignore
-IGNORE_HFILES= 				\
-	cairo-clip-private.h		\
-	cairo-features.h		\
-	cairo-font-subset-private.h	\
-	cairo-ft-private.h		\
-	cairo-gstate-private.h		\
-	cairo-hash-private.h		\
-	cairo-meta-surface-private.h	\
-	cairo-path-fixed-private.h 	\
-	cairo-pdf-test.h		\
-	cairo-private.h			\
-	cairo-win32-private.h		\
-	cairo-xlib-private.h		\
-	cairo-xlib-test.h		\
-	cairoint.h			\
-	cairo-wideint.h
+IGNORE_HFILES=					\
+	cairo-analysis-surface-private.h	\
+	cairo-arc-private.h			\
+	cairo-cache-private.h			\
+	cairo-clip-private.h			\
+	cairo-font-subset-private.h		\
+	cairo-ft-private.h			\
+	cairo-gstate-private.h			\
+	cairo-hash-private.h			\
+	cairo-meta-surface-private.h		\
+	cairo-output-stream-private.h		\
+	cairo-paginated-surface-private.h	\
+	cairo-path-data-private.h		\
+	cairo-path-fixed-private.h		\
+	cairo-private.h				\
+	cairo-quartz-private.h			\
+	cairo-scaled-font-subsets-private.h	\
+	cairo-surface-fallback-private.h	\
+	cairo-wideint-private.h			\
+	cairo-win32-private.h			\
+	cairo-xlib-private.h			\
+	cairo-pdf-test.h			\
+	cairo-ps-test.h				\
+	cairo-scaled-font-test.h		\
+	cairo-svg-test.h			\
+	cairo-xlib-test.h			\
+	cairoint.h
+
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.