* Change DEBIAN_TAG syntax to DEBIAN_TAG=tag=version so it's now possible

  to specify the proper version (almost always impossible to guess from
  a free form tag) for the tarball.
  - update Makefile and README

2 files changed, 13 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 7b8fdca..8c59d71 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,10 @@ CVS_LOC    = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 STAMP ?= stamped
 
 ifdef DEBIAN_TAG
-DEBIAN_CO_TAG     = -r $(DEBIAN_TAG)
-DEBIAN_MOZ_CO_TAG = MOZ_CO_TAG=$(DEBIAN_TAG)
+DEBIAN_LTAG       = $(shell echo $(DEBIAN_TAG) | sed -e 's/=.*//')
+DEBIAN_DTAG       = $(shell echo $(DEBIAN_TAG) | sed -e 's/.*=//')
+DEBIAN_CO_TAG     = -r $(DEBIAN_LTAG)
+DEBIAN_MOZ_CO_TAG = MOZ_CO_TAG=$(DEBIAN_LTAG)
 else
 ifdef DEBIAN_DATE
 DEBIAN_CO_DATE    = $(shell echo "-D \"$(DEBIAN_DATE)\"" | sed -e 's/[rt]/ /')
@@ -82,7 +84,7 @@ help:
 	@echo "  Alternatively, you can fetch a specific CO tag using DEBIAN_TAG."
 	@echo "  See 'make status' for a list of available tags."
 	@echo
-	@echo "   Ex: make DEBIAN_TAG=MOZILLA_1_9a8_RELEASE firefox-orig"
+	@echo "   Ex: make DEBIAN_TAG=MOZILLA_1_9a8_RELEASE=3.0~alpha8 firefox-orig"
 
 deps:
 	@if [ ! -f /usr/bin/cvs ]   ; then echo "**ERROR** Depends on missing cvs. Abort"; exit 1; fi
@@ -129,7 +131,7 @@ all: $(DEBIAN_FF3_TARGET) $(DEBIAN_XUL_TARGET) $(DEBIAN_NSS_TARGET)
 $(DEBIAN_FF3_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_FF3_FILE)
 	URL=$(DEBIAN_FF3_URL) ; \
 	if [ "$(DEBIAN_TAG)" != "" ] ; then \
-	DEBIAN_FF3_VERSION="`cat $(DEBIAN_FF3_FILE) | sed -e 's/a\([0-9]*\)/~alpha\1/; s/b\([0-9]*\)/~b\1/'`" ; \
+	DEBIAN_FF3_VERSION=$(DEBIAN_DTAG) ; \
 	DEBIAN_FF3_DATE=$$DEBIAN_FF3_VERSION ; \
 	make -f $(MOZ_CLIENT) checkout MOZ_CO_PROJECT=xulbrowser $(DEBIAN_MOZ_CO_TAG) ; \
 	else \
@@ -153,7 +155,7 @@ $(DEBIAN_FF3_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_FF3_FILE)
 $(DEBIAN_XUL_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_XUL_FILE)
 	URL=$(DEBIAN_XUL_URL) ; \
 	if [ "$(DEBIAN_TAG)" != "" ] ; then \
-	DEBIAN_XUL_VERSION="`tail -1 $(DEBIAN_XUL_FILE) | sed -e 's/\([ab]\)\([0-9]*\)/~\1\2/'`" ; \
+	DEBIAN_XUL_VERSION=$(DEBIAN_DTAG) ; \
 	make -f $(MOZ_CLIENT) checkout MOZ_CO_PROJECT=xulrunner $(DEBIAN_MOZ_CO_TAG) ; \
 	else \
 	if [ "$(DEBIAN_DATE)" != "" ] ; then DEBIAN_XUL_DATE=$(DEBIAN_DATE) ; else DEBIAN_XUL_DATE=`$(GET)` ; fi ; \
@@ -174,7 +176,7 @@ $(DEBIAN_XUL_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_XUL_FILE)
 $(DEBIAN_TB_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_TB_FILE)
 	URL=$(DEBIAN_TB_URL) ; \
 	if [ "$(DEBIAN_TAG)" != "" ] ; then \
-	DEBIAN_TB_VERSION="`cat $(DEBIAN_TB_FILE) | sed -e 's/\([ab]\)\([0-9]*\)/~\1\2/'`" ; \
+	DEBIAN_TB_VERSION=$(DEBIAN_DTAG) ; \
 	make -f $(MOZ_CLIENT) checkout MOZ_CO_PROJECT=mail $(DEBIAN_MOZ_CO_TAG) ; \
 	else \
 	if [ "$(DEBIAN_DATE)" != "" ] ; then DEBIAN_TB_DATE=$(DEBIAN_DATE) ; else DEBIAN_TB_DATE=`$(GET)` ; fi ; \
@@ -195,7 +197,7 @@ $(DEBIAN_TB_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_TB_FILE)
 $(DEBIAN_SM2_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_SM2_FILE)
 	URL=$(DEBIAN_SM2_URL) ; \
 	if [ "$(DEBIAN_TAG)" != "" ] ; then \
-	DEBIAN_SM2_VERSION="`cat $(DEBIAN_SM2_FILE) | sed -e 's/\([ab]\)\([0-9]*\)/~\1\2/'`" ; \
+	DEBIAN_SM2_VERSION=$(DEBIAN_DTAG) ; \
 	make -f $(MOZ_CLIENT) checkout MOZ_CO_PROJECT=suite $(DEBIAN_MOZ_CO_TAG) ; \
 	else \
 	if [ "$(DEBIAN_DATE)" != "" ] ; then DEBIAN_SM2_DATE=$(DEBIAN_DATE) ; else DEBIAN_SM2_DATE=`$(GET)` ; fi ; \
@@ -215,7 +217,7 @@ $(DEBIAN_SM2_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_SM2_FILE)
 $(DEBIAN_NSS_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_NSS_FILE)
 	URL=$(DEBIAN_NSS_URL) ; \
 	if [ "$(DEBIAN_TAG)" != "" ] ; then \
-	DEBIAN_NSS_VERSION="`grep -E '^\#define NSS_V(MAJOR|MINOR|PATCH)' $(DEBIAN_NSS_FILE) | awk '{print $$3}' | tr '\n' '.' | sed -e 's,\.$$,,'`~tag$(DEBIAN_TAG)" ; \
+	DEBIAN_NSS_VERSION=$(DEBIAN_DTAG) ; \
 	make -f $(MOZ_CLIENT) checkout MOZ_CO_PROJECT=nss $(DEBIAN_MOZ_CO_TAG) ; \
 	else \
 	if [ "$(DEBIAN_DATE)" != "" ] ; then DEBIAN_NSS_DATE=$(DEBIAN_DATE) ; else DEBIAN_NSS_DATE=`$(GET)` ; fi ; \
@@ -236,7 +238,7 @@ $(DEBIAN_NSS_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_NSS_FILE)
 $(DEBIAN_NSPR_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_NSPR_FILE)
 	URL=$(DEBIAN_NSPR_URL) ; \
 	if [ "$(DEBIAN_TAG)" != "" ] ; then \
-	DEBIAN_NSPR_VERSION="`grep -E '^MOD_(MAJOR|MINOR|PATCH)_VERSION' $(DEBIAN_NSPR_FILE) | cut -d= -f2 | tr '\n' '.' | sed -e 's,\.$$,,'`~tag$(DEBIAN_TAG)" ; \
+	DEBIAN_NSPR_VERSION=$(DEBIAN_DTAG) ; \
 	make -f $(MOZ_CLIENT) checkout MOZ_CO_PROJECT=nspr $(DEBIAN_MOZ_CO_TAG) ; \
 	else \
 	if [ "$(DEBIAN_DATE)" != "" ] ; then DEBIAN_NSPR_DATE=$(DEBIAN_DATE) ; else DEBIAN_NSPR_DATE=`$(GET)` ; fi ; \
diff --git a/README b/README
index 121cbf8..5b2c8af 100644
--- a/README
+++ b/README
@@ -37,7 +37,8 @@ To use:
   Alternatively, you can fetch a specific CO tag using DEBIAN_TAG.
   See 'make status' for a list of available tags.
 
-   Ex: make DEBIAN_TAG=MOZILLA_1_9a8_RELEASE firefox-orig
+   Ex: make DEBIAN_TAG=MOZILLA_1_9a8_RELEASE=3.0~alpha8 firefox-orig
+   will create a tarball named firefox-3.0-3.0~alpha8+nobinonly.orig.tar.gz
 
   It is also possible to just call the new client.mk targets without
   building tarballs: