Last Comment Bug 825853 - Port bug 818394 - Universal symlink not created correctly
: Port bug 818394 - Universal symlink not created correctly
Status: RESOLVED FIXED
:
Product: Thunderbird
Classification: Client Software
Component: Build Config (show other bugs)
: Trunk
: All Mac OS X
: -- normal (vote)
: Thunderbird 20.0
Assigned To: Mark Banner (:standard8, limited time in Dec)
:
:
Mentors:
Depends on: 818394
Blocks: 818255
  Show dependency treegraph
 
Reported: 2013-01-02 03:02 PST by Mark Banner (:standard8, limited time in Dec)
Modified: 2013-01-02 05:20 PST (History)
3 users (show)
See Also:
Crash Signature:
(edit)
QA Whiteboard:
Iteration: ---
Points: ---


Attachments
The fix (916 bytes, patch)
2013-01-02 03:02 PST, Mark Banner (:standard8, limited time in Dec)
bugspam.Callek: review+
mh+mozilla: feedback-
Details | Diff | Splinter Review

Description Mark Banner (:standard8, limited time in Dec) 2013-01-02 03:02:23 PST
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.
Comment 1 Mark Banner (:standard8, limited time in Dec) 2013-01-02 03:02:48 PST
(btw a try server build was happy with this change)
Comment 2 Mike Hommey [:glandium] 2013-01-02 03:12:24 PST
Why does c-c use its own flight.mk instead of using the one in m-c?
Comment 3 Mike Hommey [:glandium] 2013-01-02 03:18:51 PST
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.
Comment 4 Mike Hommey [:glandium] 2013-01-02 03:20:18 PST
Note the ENABLE_TESTS part is already out of sync.
Comment 5 Justin Wood (:Callek) 2013-01-02 03:21:56 PST
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
Comment 6 Mike Hommey [:glandium] 2013-01-02 03:32:56 PST
Note c-c will be broken by bug 780561 without my suggested change.
Comment 7 Mark Banner (:standard8, limited time in Dec) 2013-01-02 05:17:28 PST
(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.
Comment 8 Mark Banner (:standard8, limited time in Dec) 2013-01-02 05:20:10 PST
https://hg.mozilla.org/comm-central/rev/8895d1a0a3f1

Note You need to log in before you can comment on or make changes to this bug.