Bug 1133263 - fix partial updates, r=aleth.
authorFlorian Quèze <florian@queze.net>
Sun, 15 Feb 2015 00:53:30 +0100
changeset 21824 107eff88da0bab12b8f4eb3144c405705e86f53e
parent 21823 dc756f0e0961da1c3c374586f3165b4dbf9de64e
child 21825 eda552c6aaa59652d1e813e7cb830402465a10d4
push id1326
push usermbanner@mozilla.com
push dateMon, 30 Mar 2015 20:10:12 +0000
treeherdercomm-beta@69663dd6f687 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaleth
bugs1133263
Bug 1133263 - fix partial updates, r=aleth.
im/app-rules.mk
im/build.mk
new file mode 100644
--- /dev/null
+++ b/im/app-rules.mk
@@ -0,0 +1,11 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# This is defined here instead of in build.mk to override values from
+# upload-files.mk which is loaded by moz-automation.mk after our build.mk
+UPLOAD_FILES = $(wildcard $(foreach file,\
+	                     $(foreach AB_CD,$(AB_CD) $(SHIPPED_LOCALES),\
+                                       $(PACKAGE) $(INSTALLER_PACKAGE))\
+                             $(PKG_BASENAME).txt $(PKG_UPDATE_PATH)*.mar,\
+                            $(DIST)/$(file)))
--- a/im/build.mk
+++ b/im/build.mk
@@ -30,22 +30,16 @@ endif
 endif
 endif
 endif # PKG_SUFFIX
 PACKAGE = $(PKG_BASENAME)$(PKG_SUFFIX)
 ifeq ($(OS_TARGET), WINNT)
 INSTALLER_PACKAGE = $(PKG_INST_BASENAME).exe
 endif
 
-UPLOAD_FILES = $(wildcard $(foreach file,\
-	                     $(foreach AB_CD,$(AB_CD) $(SHIPPED_LOCALES),\
-                                       $(PACKAGE) $(INSTALLER_PACKAGE))\
-                             $(PKG_BASENAME).txt $(PKG_UPDATE_PATH)*.mar,\
-                            $(DIST)/$(file)))
-
 PREVIOUS_MAR_DIR := $(DIST)/$(PKG_UPDATE_PATH)previous
 MAR_FILE_DEST = $(PREVIOUS_MAR_DIR)/$(buildid)/$(notdir $(MAR_FILE_SRC))
 PATCH_FILE := $(DIST)/$(PKG_UPDATE_PATH)patch_list
 FORCE_UPDATE := components/components.list|Contents/MacOS/components/components.list
 
 #Example of environment variables to set before using make distribution:
 
 #Convenience variables:
@@ -78,17 +72,17 @@ FORCE_UPDATE := components/components.li
 
 distribution:
 	@$(MAKE) MAKE_SYM_STORE_PATH=$(MAKE_SYM_STORE_PATH) SYM_STORE_SOURCE_DIRS='$(topsrcdir)/mozilla/extensions/purple $(topsrcdir)/mozilla $(topsrcdir)' buildsymbols
 	@$(MAKE) -C im/installer libs installer
 ifdef ENABLE_TESTS
 	$(MAKE) xpcshell-tests
 endif
 ifdef MOZ_UPDATE_PACKAGING
-	$(MAKE) -C tools/update-packaging full-update PKG_INST_PATH=
+	$(MAKE) -C tools/update-packaging complete-patch PKG_INST_PATH=
 endif
 ifdef L10NBASEDIR
 	$(foreach locale,$(SHIPPED_LOCALES),$(MAKE) -C im/locales/ repack-$(locale) LOCALE_MERGEDIR=mergedir MOZ_MAKE_COMPLETE_MAR=$(MOZ_UPDATE_PACKAGING) ;)
 endif
 ifdef MOZ_UPDATE_PACKAGING
 ifdef LIST_PREVIOUS_MAR_CMD
 	rm -rf $(PREVIOUS_MAR_DIR) $(PATCH_FILE)
 	mkdir $(PREVIOUS_MAR_DIR)