[cairo-commit] 3 commits - .gitignore Makefile

[Chris Wilson]

 .gitignore |    1 +
 Makefile   |   17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 2cb4fdddf507120346f3c38db8ccaa894e2735a3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Aug 23 16:46:08 2009 +0100

    git: ignore snapshots directory

diff --git a/.gitignore b/.gitignore
index aae1de1..a4889ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.trace
 csi-bind
 csi-trace
+snapshots
commit c82384b1f3dd512d40d1f0ed7181f3a3e5f793e2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Aug 23 16:44:23 2009 +0100

    Makefile: only include the smaller benchmarks in a snapshot
    
    This is to cut down the tarball to a manageable size as the intent is to
    use the snapshot as means of distributing benchmark traces (for use
    with the Phoronix Test Suite).

diff --git a/Makefile b/Makefile
index 58c93a3..05ec216 100644
--- a/Makefile
+++ b/Makefile
@@ -35,11 +35,11 @@ tar_file := $(snapshots)/cairo-traces-$(snapshot_name).tar.gz
 sha1_file := $(tar_file).sha1
 gpg_file := $(sha1_file).asc
 
-DIST := Makefile README $(wildcard *.c) $(ALL_LZMA)
-$(tar_file): $(DIST)
+SNAPSHOT_DIST := Makefile README $(wildcard *.c) $(QUICK_LZMA)
+$(tar_file): $(SNAPSHOT_DIST)
 	@mkdir -p $(snapshots)
 	@echo Generating snapshot tarball: $(tar_file)
-	@tar $(TAR_OPTIONS) --transform 's#^#cairo-traces-$(snapshot_name)/#' -czvf $(tar_file) $(DIST)
+	@tar $(TAR_OPTIONS) --transform 's#^#cairo-traces-$(snapshot_name)/#' -czvf $(tar_file) $(SNAPSHOT_DIST)
 
 $(sha1_file): $(tar_file)
 	sha1sum $^ > $@
@@ -49,7 +49,7 @@ $(gpg_file): $(sha1_file)
 	gpg --armor --sign $^
 
 snapshot-dirty:
-	@if test -n "$(shell git ls-files -m $(DIST))"; then \
+	@if test -n "$(shell git ls-files -m $(SNAPSHOT_DIST))"; then \
 		echo "Local tree has uncommitted modifications. Please commit these changes before making a snapshot." ; \
 		exit 1; \
 	fi
commit 535ade0e56c99ac87782886395378eea92013c6f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Aug 23 14:21:40 2009 +0100

    Makefile: untar snapshot into named directory

diff --git a/Makefile b/Makefile
index 495d5ae..58c93a3 100644
--- a/Makefile
+++ b/Makefile
@@ -29,16 +29,17 @@ 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
 
-snapshots = snapshots
-tar_file = $(snapshots)/cairo-traces-$(shell date '+%Y%m%d')-$(shell git rev-parse HEAD | cut -c 1-6).tar.gz
-sha1_file = $(tar_file).sha1
-gpg_file = $(sha1_file).asc
+snapshots := snapshots
+snapshot_name := $(shell date '+%Y%m%d')-$(shell git rev-parse HEAD | cut -c 1-6)
+tar_file := $(snapshots)/cairo-traces-$(snapshot_name).tar.gz
+sha1_file := $(tar_file).sha1
+gpg_file := $(sha1_file).asc
 
 DIST := Makefile README $(wildcard *.c) $(ALL_LZMA)
 $(tar_file): $(DIST)
 	@mkdir -p $(snapshots)
 	@echo Generating snapshot tarball: $(tar_file)
-	@tar $(TAR_OPTIONS) --transform 's#^#cairo-traces/#' -czvf $(tar_file) $(DIST)
+	@tar $(TAR_OPTIONS) --transform 's#^#cairo-traces-$(snapshot_name)/#' -czvf $(tar_file) $(DIST)
 
 $(sha1_file): $(tar_file)
 	sha1sum $^ > $@