fix maemo nightly repacks (mobile-browser portion). bug 538699, r=mfinkle,axel
authorAki Sasaki <asasaki@mozilla.com>
Mon, 25 Jan 2010 16:03:55 -0800
changeset 1320 9fd972c718fcb51147f41894b3d944f2c7ba185e
parent 1319 9989b0b68b5ed85e191bbdcf4f6ffee6471055f9
child 1321 f6dbf652e14a11561e40c9a5f460e2e6dc57e707
push id1176
push userasasaki@mozilla.com
push dateTue, 26 Jan 2010 00:04:01 +0000
reviewersmfinkle, axel
bugs538699
fix maemo nightly repacks (mobile-browser portion). bug 538699, r=mfinkle,axel
locales/Makefile.in
--- a/locales/Makefile.in
+++ b/locales/Makefile.in
@@ -59,17 +59,16 @@ SUBMAKEFILES += \
         $(NULL)
 
 MOZ_LANGPACK_EID=langpack-$(AB_CD)@firefox-mobile.mozilla.org
 PREF_JS_EXPORTS = $(firstword $(wildcard $(LOCALE_SRCDIR)/mobile-l10n.js) \
                        @srcdir@/en-US/mobile-l10n.js )
 
 # Shouldn't := DEB_BUILD_ARCH despite the $(shell ) as deb isn't everywhere
 DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_PKG_NAME = fennec_$(MOZ_APP_VERSION)_$(DEB_BUILD_ARCH).deb
 DATASTAGE = $(CURDIR)/data-stage
 
 SEARCH_PLUGINS = $(shell cat \
   $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
        @srcdir@/en-US/searchplugins/list.txt ) )
 
 searchplugins::
 	@echo "$(AB_CD).jar:" > tmp-search.jar.mn
@@ -160,20 +159,35 @@ ident:
 	@printf "gecko_revision "
 	@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(GECKO_PLATFORM_INI_PATH) Build SourceStamp
 	@printf "fennec_revision "
 	@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(FENNEC_APPLICATION_INI_PATH) App SourceStamp
 	@printf "buildid "
 	@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(FENNEC_APPLICATION_INI_PATH) App BuildID
 
 # special targets just to do the debian single locale packages
+wget-DEB_PKG_NAME:
+ifndef WGET
+	$(error Wget not installed)
+endif
+ifndef EN_US_BINARY_URL
+	$(error EN_US_BINARY_URL not defined)
+endif
+	$(WGET) -q -O - $(EN_US_BINARY_URL)/deb_name.txt
+
 wget-deb:
 ifndef WGET
 	$(error Wget not installed)
 endif
+ifndef EN_US_BINARY_URL
+	$(error EN_US_BINARY_URL not defined)
+endif
+ifndef DEB_PKG_NAME
+	$(error DEB_PKG_NAME not defined)
+endif
 	$(WGET) -nv -N  $(EN_US_BINARY_URL)/$(DEB_PKG_NAME)
 
 $(DATASTAGE): $(DEB_PKG_NAME)
 	$(RM) -rf $(DATASTAGE)
 	$(NSINSTALL) -D $(DATASTAGE)
 	ar -p $(DEB_PKG_NAME) data.tar.gz | $(TAR) -zx -C $(DATASTAGE)
 	$(MAKE) clobber-zip AB_CD=en-US STAGEDIST=$(DATASTAGE)/$(installdir)
 # XXX hack around multi-locale deb right now
@@ -188,9 +202,12 @@ repackage-deb: $(DATASTAGE)
 	$(NSINSTALL) $(DEB_PKG_NAME) $(AB_CD)
 	cd $(DATASTAGE) && $(TAR) -zcf $(CURDIR)/$(AB_CD)/data.tar.gz *
 	$(MAKE) clobber-zip STAGEDIST=$(DATASTAGE)/$(installdir)
 	cd $(AB_CD) && ar -rv $(DEB_PKG_NAME) data.tar.gz
 	$(RM) $(AB_CD)/data.tar.gz
 
 deb-%: AB_CD=$*
 deb-%: clobber-% langpack-%
-	@$(MAKE) repackage-deb AB_CD=$(AB_CD)
+ifndef DEB_PKG_NAME
+	$(error DEB_PKG_NAME not defined)
+endif
+	@$(MAKE) repackage-deb AB_CD=$(AB_CD) DEB_PKG_NAME=$(DEB_PKG_NAME)