From c8923c1a473bc8e1cf6391153b2ecf5d9a723783 Mon Sep 17 00:00:00 2001 From: Armen Zambrano Gasparnian Date: Thu, 12 Nov 2009 11:00:26 -0500 Subject: [PATCH] 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 --- mobile/build.mk | 3 +++ mobile/installer/Makefile.in | 7 +++++++ mobile/installer/debian/changelog.in | 1 + 3 files changed, 11 insertions(+) diff --git a/mobile/build.mk b/mobile/build.mk index e08f944e1d2..fc682416093 100644 --- a/mobile/build.mk +++ b/mobile/build.mk @@ -67,6 +67,9 @@ install:: @echo "Mobile can't be installed directly." @exit 1 +upload:: + @$(MAKE) -C mobile/installer upload + ifeq ($(OS_TARGET),Linux) deb: installer endif diff --git a/mobile/installer/Makefile.in b/mobile/installer/Makefile.in index 4c78d11f718..c03f574b540 100644 --- a/mobile/installer/Makefile.in +++ b/mobile/installer/Makefile.in @@ -163,3 +163,10 @@ installer: stage-package package-xulrunner 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) + diff --git a/mobile/installer/debian/changelog.in b/mobile/installer/debian/changelog.in index 6c201e2af99..58d5675248a 100644 --- a/mobile/installer/debian/changelog.in +++ b/mobile/installer/debian/changelog.in @@ -1,3 +1,4 @@ +# 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)