Closed Bug 835309 Opened 7 years ago Closed 7 years ago

make package fails on mac universal builds because of extensions such as test pilot

Categories

(Firefox Build System :: General, defect)

All
macOS
defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED
mozilla21

People

(Reporter: standard8, Assigned: glandium)

References

Details

Attachments

(2 files, 3 obsolete files)

+++ This bug was initially created as a clone of Bug #713133 +++

Bug 713133 is enabling fatal warnings for Windows and Linux, but currently on try server, Mac is failing with:

/builds/slave/tb-try-c-cen-osx64/build/objdir-tb/i386/_virtualenv/bin/python /builds/slave/tb-try-c-cen-osx64/build/mozilla/toolkit/mozapps/installer/packager.py -DMOZ_THUNDERBIRD=1 -DOSTYPE=\"Darwin\" -DOSARCH=Darwin -DNO_NSPR_10_SUPPORT -DAB_CD=en-US -DMOZ_APP_NAME=thunderbird -DPREF_DIR=defaults/pref -DJAREXT= -DMOZ_UPDATER=1 -DMOZ_CHILD_PROCESS_NAME=plugin-container -DMOZ_SHARED_MOZGLUE=1 -DDLL_PREFIX=lib -DDLL_SUFFIX=.dylib -DBIN_SUFFIX= -DAPPNAME=Daily.app -DBINPATH=/Daily.app/Contents/MacOS \
		--format omni \
		--removals /builds/slave/tb-try-c-cen-osx64/build/mail/installer/removed-files.in \
		 \
		 \
		--jarlogs /builds/slave/tb-try-c-cen-osx64/build/objdir-tb/i386/mail/installer/../../jarlog//en-US \
		--optimizejars \
		--unify /builds/slave/tb-try-c-cen-osx64/build/objdir-tb/i386/../x86_64/mozilla/dist \
		package-manifest ../../mozilla/dist ../../mozilla/dist/universal/thunderbird \
		--non-resource defaults/messenger/mailViews.dat
Error: /builds/slave/tb-try-c-cen-osx64/build/objdir-tb/i386/mail/installer/package-manifest:137: Can't unify Daily.app/Contents/MacOS/distribution/extensions/tbtestpilot@labs.mozilla.com.xpi: file differs between /builds/slave/tb-try-c-cen-osx64/build/objdir-tb/i386/../x86_64/mozilla/dist and ../../mozilla/dist
--- /builds/slave/tb-try-c-cen-osx64/build/objdir-tb/i386/../x86_64/mozilla/dist/Daily.app/Contents/MacOS/distribution/extensions/tbtestpilot@labs.mozilla.com.xpi
+++ ../../mozilla/dist/Daily.app/Contents/MacOS/distribution/extensions/tbtestpilot@labs.mozilla.com.xpi
@@ -1,4 +1,4 @@

(followed by a diff)

I don't know why that would fail when Mac Nightly builds fine.
Nightlies probably don't have the test pilot extension.
(In reply to Mike Hommey [:glandium] from comment #1)
> Nightlies probably don't have the test pilot extension.

Good idea, but actually they do for Thunderbird. The diff shows the xpi diffs as well.
I guess unify.py just needs a better test for zip archives.
Attached patch Test patch (obsolete) — Splinter Review
Can you test this? (completely untested)
Assignee: nobody → mh+mozilla
 File "/builds/slave/tb-try-c-cen-osx64/build/mozilla/python/mozbuild/mozpack/unify.py", line 176, in unify_file
    jar1 = JarReader(fileobj=file1.open())
NameError: global name 'JarReader' is not defined

https://tbpl.mozilla.org/php/getParsedLog.php?id=19234855&tree=Thunderbird-Try
Attached patch Test patch (obsolete) — Splinter Review
Try this revised version (not in a landable state, but should work)
Attachment #707496 - Attachment is obsolete: true
Great! that passed.
Attachment #707576 - Attachment is obsolete: true
Attachment #708982 - Attachment is obsolete: true
Attachment #708982 - Flags: review?(gps)
Blocks: new-packager
Product: Thunderbird → Core
Summary: Make packager.pm missing file warnings fatal on Thunderbird (Mac) → make package fails on mac universal builds because of extensions such as test pilot
Comment on attachment 708981 [details] [diff] [review]
Fix JarFileReader.readlines() and make flake8 happier.

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

Thanks for making flake8 happier!
Attachment #708981 - Flags: review?(gps) → review+
Comment on attachment 708983 [details] [diff] [review]
Look at .xpi file contents when unifying them for universal builds.

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

LGTM!
Attachment #708983 - Flags: review?(gps) → review+
Status: NEW → RESOLVED
Closed: 7 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla21
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.