Port bug 818394 - Universal symlink not created correctly

RESOLVED FIXED in Thunderbird 20.0

Status

Thunderbird
Build Config
RESOLVED FIXED
5 years ago
5 years ago

People

(Reporter: standard8, Assigned: standard8)

Tracking

Trunk
Thunderbird 20.0
All
Mac OS X
Dependency tree / graph

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

Created attachment 696976 [details] [diff] [review]
The fix

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

flight.mk executes the following command:
  ln -s obj-firefox/i386/dist/universal obj-firefox/x86_64/dist/universal

This results in not quite the expected thing.


The attached patch ports the change from mozilla-central.
Attachment #696976 - Flags: review?(bugspam.Callek)
(btw a try server build was happy with this change)
Why does c-c use its own flight.mk instead of using the one in m-c?
Comment on attachment 696976 [details] [diff] [review]
The fix

I think you should just replace flight.mk with something like:

include $(TOPSRCDIR)/mozilla/build/macosx/universal/flight.mk
DIST_ARCH_1 = $(OBJDIR_ARCH_1)/mozilla/dist
DIST_ARCH_2 = $(OBJDIR_ARCH_2)/mozilla/dist
DIST = $(OBJDIR)/mozilla/dist

That should avoid requiring any further changes to c-c's copy.
Attachment #696976 - Flags: feedback-
Note the ENABLE_TESTS part is already out of sync.
Comment on attachment 696976 [details] [diff] [review]
The fix

rather than think deeply on if swapping this out for an include is the right thing I'm going to r+ this. Mark if you agree with glandium and think its worth it over doing this patch I'm all for it though
Attachment #696976 - Flags: review?(bugspam.Callek) → review+
Note c-c will be broken by bug 780561 without my suggested change.
(In reply to Mike Hommey [:glandium] from comment #4)
> Note the ENABLE_TESTS part is already out of sync.

On two counts: 1) we haven't picked up the specialpowers changes, but more importantly 2) Firefox/mozilla-central doesn't currently allow creation of a directory for mozmill tests. Which I suspect we could get incorporated into m-c land, but obviously that's an extra step.

As for the other changes, we'd also need to change the m-c version to allow for a slightly different source directory, as we use $(TOPSRCDIR)/mozilla in places.

However, given it looks like bug 780561 is going to remove most of the places where we currently need that, I think it would be best if we delay fixing flight.mk as suggested in comment 3 to a bug which ports bug 780561 for us.

That also allows this bug to land in sync with bug 818394 regardless of if bug 780561 lands before the next merge.
https://hg.mozilla.org/comm-central/rev/8895d1a0a3f1
Status: ASSIGNED → RESOLVED
Last Resolved: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 20.0
You need to log in before you can comment on or make changes to this bug.