1133263 - Partial updates broken since december

Status: RESOLVED FIXED

(Instantbird Graveyard :: Other, defect)

Description

[Florian Quèze [:florian]]

Attachment: fix-partial-updates.patch

Since December 2014, our nightlies no longer have partial.mar files uploaded on the ftp, and instead we have a bunch of files we don't need (eg. mar.exe).

There are some error messages in the build logs (eg. "No previous MAR found; not creating a partial MAR") but that's just noise caused by http://hg.mozilla.org/mozilla-central/diff/44aadcfb5f57/tools/update-packaging/Makefile.in
We can silence that noise by replacing "$(MAKE) -C tools/update-packaging full-update" at http://hg.mozilla.org/comm-central/annotate/a4d860e127ed/im/build.mk#l86 by "$(MAKE) -C tools/update-packaging complete-patch"

The partial update files are actually correctly generated, but not uploaded. The list of files we upload is the one defined in http://mxr.mozilla.org/comm-central/source/mozilla/toolkit/mozapps/installer/upload-files.mk rather than the one we define at http://mxr.mozilla.org/comm-central/source/im/build.mk#38

This is because of http://hg.mozilla.org/mozilla-central/rev/c0efa7f1e54c (bug 978211), causing moz-automation.mk to be read after <app>/build.mk by the top level Makefile. And moz-automation.mk includes upload-files.mk.

However, our bustage is more recent than that, and appeared only with http://hg.mozilla.org/mozilla-central/rev/9cc41324a5e1 (bug 1109136).

To list the files that will be uploaded, one can run this command from the objdir:
UPLOAD_CMD='echo $(UPLOAD_FILES)' make upload

Adding the -d (debug) option to make will list the makefiles in the order they are read, which helped me to understand how upload-files.mk was getting included, and showed me that the only file in im/ that's read after upload-files.mk is app-rules.mk. That's why in the attached patch I moved our custom UPLOAD_FILES variable to a new app-rules.mk file.

Comment 1

[aleth [:aleth]]

Comment on attachment 8564623 [details] [diff] [review]
fix-partial-updates.patch

Review of attachment 8564623 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks for looking into this!

Comment 2

[Florian Quèze [:florian]]

https://hg.mozilla.org/comm-central/rev/107eff88da0b