Closed Bug 1048687 Opened 10 years ago Closed 10 years ago

Handle move of dependentlibs.list from Contents/MacOS to Contents/Resources

Categories

(Firefox :: General, defect)

x86
macOS
defect
Not set
normal

Tracking

()

RESOLVED FIXED
Firefox 35
Tracking Status
firefox34 --- fixed
firefox35 --- fixed

People

(Reporter: spohl, Assigned: spohl)

References

Details

Attachments

(1 file, 5 obsolete files)

dependentlibs.list now lives under Contents/Resources instead of Contents/MacOS since it is a data file. We need to fix up our XPCOM glue code to pick this up properly.
Attached patch Patch (obsolete) — Splinter Review
Will request reviews once we've fixed up all the other dependencies that have been broken by the new bundle structure.
Assignee: nobody → spohl.mozilla.bugs
Status: NEW → ASSIGNED
Blocks: 1046906
No longer blocks: 1047584
Blocks: 1050944
Group: mozilla-employee-confidential
Attached patch Patch (obsolete) — Splinter Review
Attachment #8467526 - Attachment is obsolete: true
Attachment #8473015 - Flags: feedback?(benjamin)
Comment on attachment 8473015 [details] [diff] [review]
Patch

This needs more comments about we're modifying tempBuffer and what the goal of this code is.

Oh how we need a C++ library equivalent of python os.path.
Attachment #8473015 - Flags: feedback?(benjamin) → feedback+
Attached patch Patch (obsolete) — Splinter Review
Just updated for current trunk, not addressed feedback yet.
Attachment #8473015 - Attachment is obsolete: true
Attachment #8480257 - Flags: feedback+
Comment on attachment 8485799 [details] [diff] [review]
unbitrotted

meh! The latest was already unbitrotted!
Attachment #8485799 - Attachment is obsolete: true
Attached patch Patch (obsolete) — Splinter Review
Addressed feedback.

Try push is almost completely green, so requesting review (updater xpcshell test failures and gaia python integration test suite failures are handled in separate bugs):
https://tbpl.mozilla.org/?tree=Try&rev=7362867ad903
Attachment #8480257 - Attachment is obsolete: true
Attachment #8487889 - Flags: review?(benjamin)
Comment on attachment 8487889 [details] [diff] [review]
Patch

>diff --git a/xpcom/glue/standalone/nsXPCOMGlue.cpp b/xpcom/glue/standalone/nsXPCOMGlue.cpp

> static GetFrozenFunctionsFunc
> XPCOMGlueLoad(const char* aXPCOMFile)
> {
>   char xpcomDir[MAXPATHLEN];
>-#if defined(XP_WIN)
>+#if XP_WIN

Why did this change from an #ifdef to an #if? I believe #ifdef is still the standard for these.

Please put this back or explain why it had to change, r=me
Attachment #8487889 - Flags: review?(benjamin) → review+
(In reply to Benjamin Smedberg  [:bsmedberg] from comment #8)
> Comment on attachment 8487889 [details] [diff] [review]
> Patch
> 
> >diff --git a/xpcom/glue/standalone/nsXPCOMGlue.cpp b/xpcom/glue/standalone/nsXPCOMGlue.cpp
> 
> > static GetFrozenFunctionsFunc
> > XPCOMGlueLoad(const char* aXPCOMFile)
> > {
> >   char xpcomDir[MAXPATHLEN];
> >-#if defined(XP_WIN)
> >+#if XP_WIN
> 
> Why did this change from an #ifdef to an #if? I believe #ifdef is still the
> standard for these.
> 
> Please put this back or explain why it had to change, r=me

Oops, I meant to change this from an #if defined() to an #ifdef, but forgot to add 'def' after removing the defined(). Thanks for catching this!
Attached patch PatchSplinter Review
Changed #if to #ifdef. Carrying over r+.
Attachment #8487889 - Attachment is obsolete: true
Attachment #8488644 - Flags: review+
https://hg.mozilla.org/mozilla-central/rev/f877c9b66cec
Status: ASSIGNED → RESOLVED
Closed: 10 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 35
Landed on aurora in the Mac V2 signing combined patch in bug 1047584
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: