* [minefield-packager] add a 'list' command and add support for by-date snapshots

  - update src/minefield-packager.mk.in
  - update README

2 files changed, 32 insertions, 5 deletions

diff --git a/README b/README
index aa68f6b..0fee409 100644
--- a/README
+++ b/README
@@ -122,8 +122,25 @@ report bugs in Launchpad about those.
 Example:
 
 (from a writable directory)
-make -f /usr/share/mozilla-devscripts/minefield-packager.mk
-sudo dpkg -i firefox-minefield_3.0~b5~build2008032304-1_i386.deb
+$ make -f /usr/share/mozilla-devscripts/minefield-packager.mk
+$ sudo dpkg -i firefox-minefield_3.0~b5~build2008032304-1_i386.deb
+
+You can also ask for a particular snapshot by adding DEBIAN_DATE=id,
+where id is one of the date returned by the 'list' command:
+
+$ make -f /usr/share/mozilla-devscripts/minefield-packager.mk list
+Available snapshots are:
+2008-02-27-04   04-Mar-2008 19:31
+2008-02-27-14   28-Feb-2008 07:30
+2008-02-27-18   28-Feb-2008 04:53
+2008-02-28-04   06-Mar-2008 04:56
+...
+2008-03-28-04   29-Mar-2008 05:03
+2008-03-28-05   29-Mar-2008 06:57
+2008-03-29-04   29-Mar-2008 06:50
+latest  29-Mar-2008 06:50
+$ make -f /usr/share/mozilla-devscripts/minefield-packager.mk DEBIAN_DATE=2008-03-28-04
+$ sudo dpkg -i firefox-minefield_3.0~build2008032804-1_i386.deb
 
 === xpi.mk ===
 
diff --git a/src/minefield-packager.mk.in b/src/minefield-packager.mk.in
index 9b46d01..a0b0f7b 100644
--- a/src/minefield-packager.mk.in
+++ b/src/minefield-packager.mk.in
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-URLBASE    := http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/
+URLBASE    := http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/
 MACHINE    := $(shell uname -m)
 WORKDIR    := temp-$(shell echo $$$$)
 BUILDSTAMP := $(WORKDIR)/build-stamp
@@ -13,7 +13,13 @@ ifeq (,$(filter i686 x86_64,$(MACHINE)))
 $(error $(MACHINE) is not a supported platform)
 endif
 
-LINE := $(shell wget -qO - $(URLBASE) | grep linux-$(MACHINE).tar.bz2)
+ifeq (,$(DEBIAN_DATE))
+SNAPSHOT=latest
+else
+SNAPSHOT=$(DEBIAN_DATE)
+endif
+
+LINE := $(shell wget -qO - $(URLBASE)$(SNAPSHOT)-trunk/ | grep linux-$(MACHINE).tar.bz2)
 
 ifeq (,$(LINE))
 $(error Could not find a valid archive for $(MACHINE))
@@ -28,10 +34,14 @@ GARBAGE += $(WORKDIR)
 .PHONY: build
 build: $(BUILDSTAMP) make_deb clean
 
+list:
+	@echo Available snapshots are:
+	@wget -qO - $(URLBASE) | grep -- -trunk/ | cut -d'"' -f8,11 | sed -e 's,\(.*\)-trunk/">\(.*\)  .*,\1	\2,'
+
 $(BUILDSTAMP):
 	rm -rf $(WORKDIR)
 	mkdir -p $(WORKDIR)/debian/tmp/DEBIAN $(WORKDIR)/debian/tmp/usr/lib
-	wget -P $(WORKDIR) $(URLBASE)$(FILE)
+	wget -P $(WORKDIR) $(URLBASE)$(SNAPSHOT)-trunk/$(FILE)
 	tar -C $(WORKDIR)/debian/tmp -jxf $(WORKDIR)/$(FILE)
 	mv $(WORKDIR)/debian/tmp/firefox $(WORKDIR)/debian/tmp/usr/lib/$(PKGNAME)
 	touch $(BUILDSTAMP)