Bug 524519 - use UPLOAD_EXTRA_FILES to upload the deb files (no need for new update targets); add the ability to call 'make upload' from root of mobile's objdir - r=mark.finkle,l10n
--- a/mobile/build.mk
+++ b/mobile/build.mk
@@ -62,11 +62,14 @@ ifeq ($(OS_TARGET),WINCE)
else
@$(MAKE) -C mobile/installer
endif
install::
@echo "Mobile can't be installed directly."
@exit 1
+upload::
+ @$(MAKE) -C mobile/installer upload
+
ifeq ($(OS_TARGET),Linux)
deb: installer
endif
--- a/mobile/installer/Makefile.in
+++ b/mobile/installer/Makefile.in
@@ -158,8 +158,15 @@ VSINSTALLDIR ?= $(error VSINSTALLDIR not
UNPACKAGE = $(LIBXUL_DIST)/xulrunner*$(PKG_SUFFIX)
installer: stage-package package-xulrunner
$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
cd $(DIST) && $(PYTHON) $(topsrcdir)/build/package/wince/make_wince_cab.py $(CABARGS) "$(VSINSTALLDIR)/SmartDevices/SDK/SDKTools/cabwiz.exe" "$(MOZ_PKG_DIR)" "$(MOZ_APP_DISPLAYNAME)" "$(PKG_PATH)$(PKG_BASENAME).cab" && $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR) && echo "Installer $(PKG_PATH)$(PKG_BASENAME).cab created!"
endif
+
+DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+# package name comes from mobile/installer/debian/changelog.in
+DEB_PKG_NAME = $(MOZ_PKG_APPNAME)_$(MOZ_APP_VERSION)_$(DEB_BUILD_ARCH).deb
+# relative to $(DIST)
+UPLOAD_EXTRA_FILES += ../mobile/$(DEB_PKG_NAME)
+
--- a/mobile/installer/debian/changelog.in
+++ b/mobile/installer/debian/changelog.in
@@ -1,5 +1,6 @@
+# if the naming changes please modify DEB_PKG_NAME in mobile/installer/Makefile.in as well
fennec (@MOZ_APP_VERSION@) unstable; urgency=low
* Mozilla Nightly (Closes: #nnnn) <nnnn is the bug number of your ITP>
-- Mozilla fennec <blassey@mozilla.com> @MOZ_DEB_TIMESTAMP@