[Gnash-commit] /srv/bzr/gnash/trunk r11829: use the full version name for the snapshot build directory.

[Rob Savoye]

------------------------------------------------------------
revno: 11829
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Thu 2010-01-28 18:13:16 -0700
message:
  use the full version name for the snapshot build directory.
modified:
  packaging/deb.am
  packaging/snapshot.am

=== modified file 'packaging/deb.am'
--- a/packaging/deb.am  2010-01-28 17:16:50 +0000
+++ b/packaging/deb.am  2010-01-29 01:13:16 +0000
@@ -24,7 +24,7 @@
 # all the right places. This involves editing the debian/changelog
 # file. Configure.ac is edited by the snapshot target.
 setup-deb: 
-       snapshot_dir=$(SNAPSHOT_DIR); \
+       snapshot_dir="$(SNAPSHOT_DIR)"; \
        mkdir -p $${snapshot_dir}/debian; \
        cp -rfp $(srcdir)/packaging/debian/* $${snapshot_dir}/debian/; \
        if test -e $${snapshot_dir}/debian/changelog; then \
@@ -33,10 +33,10 @@
        fi;
 
 snapshot-deb:
-       snapshot_dir=$(SNAPSHOT_VERSION); \
+       snapshot_dir="$(SNAPSHOT_DIR)"; \
        (cd $${snapshot_dir}; dpkg-buildpackage -rfakeroot -j4)
 
 # these files are created when building packages
 CLEANFILES += *trunk*.deb *trunk*.gz *trunk*.bz2 *trunk*.changes
 
-.PHONY : deb debian snapshot-deb
+.PHONY : deb debian snapshot-deb setup-deb

=== modified file 'packaging/snapshot.am'
--- a/packaging/snapshot.am     2010-01-28 17:12:54 +0000
+++ b/packaging/snapshot.am     2010-01-29 01:13:16 +0000
@@ -22,21 +22,21 @@
 
 #bzr version-info --custom --template='#define BRANCH_REVNO {revno}\n#define 
BRANCH_NICK {branch_nick}\n'
 
+# this is used for Debian style naming conventions
+PREVIOUS_RELEASE = 0.8.6
+SNAPSHOT_VERSION = $(PREVIOUS_RELEASE)~bzr.$(BRANCH_NICK)$(BRANCH_REVNO)
+
 # these is the directories where the snapshot gets built. Sources are
 # in the top level, the build goes in a _build subdirectory
-SNAPSHOT_DIR = gnash-$(BRANCH_NICK)${BRANCH_REVNO}
+SNAPSHOT_DIR = gnash-$(SNAPSHOT_VERSION}
 SNAPSHOT_BUILD = $(SNAPSHOT_DIR)/_build
 SNAPSHOT_NAME = $(SNAPSHOT_DIR)
 
 # this is the name of the actual tarball
-SNAPSHOT_TAR = gnash-$(BRANCH_NICK)$(BRANCH_REVNO).tar.gz
+SNAPSHOT_TAR = gnash-$(SNAPSHOT_VERSION).tar.gz
 # this is the temporary directory used for DESTDIR
 SNAPSHOT_TMP = /tmp/$(SNAPSHOT_DIR)
 
-# this is used for Debian style naming conventions
-PREVIOUS_RELEASE = 0.8.6
-SNAPSHOT_VERSION = $(PREVIOUS_RELEASE)~bzr.$(BRANCH_NICK)$(BRANCH_REVNO)
-
 # extract info from bazar
 
 #
@@ -53,7 +53,7 @@
 # version from 'trunk' to a date stamped version of trunk.
 snapshot-src: distdir  force
        snapshot_tar="$(SNAPSHOT_TAR)"; \
-       snapshot_dir=$(SNAPSHOT_DIR); \
+       snapshot_dir="$(SNAPSHOT_DIR)"; \
        if test -d $${snapshot_dir}; then \
          rm -fr $${snapshot_dir}; \
        fi; \