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

RESOLVED FIXED in Firefox 34

Status

()

Firefox
General
RESOLVED FIXED
4 years ago
3 years ago

People

(Reporter: spohl, Assigned: spohl)

Tracking

Trunk
Firefox 35
x86
Mac OS X
Points:
---
Dependency tree / graph

Firefox Tracking Flags

(firefox34 fixed, firefox35 fixed)

Details

Attachments

(1 attachment, 5 obsolete attachments)

(Assignee)

Description

4 years ago
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.
(Assignee)

Comment 1

4 years ago
Created attachment 8467526 [details] [diff] [review]
Patch

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
(Assignee)

Updated

4 years ago
Blocks: 1046906
No longer blocks: 1047584
(Assignee)

Updated

4 years ago
Blocks: 1050944
(Assignee)

Updated

4 years ago
Group: mozilla-employee-confidential
(Assignee)

Comment 2

4 years ago
Created attachment 8473015 [details] [diff] [review]
Patch
Attachment #8467526 - Attachment is obsolete: true
Attachment #8473015 - Flags: feedback?(benjamin)

Comment 3

4 years ago
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+
(Assignee)

Comment 4

4 years ago
Created attachment 8480257 [details] [diff] [review]
Patch

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
(Assignee)

Comment 7

4 years ago
Created attachment 8487889 [details] [diff] [review]
Patch

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 8

4 years ago
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+
(Assignee)

Comment 9

4 years ago
(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!
(Assignee)

Comment 10

4 years ago
Created attachment 8488644 [details] [diff] [review]
Patch

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
Last Resolved: 3 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 35
Landed on aurora in the Mac V2 signing combined patch in bug 1047584
status-firefox34: --- → fixed
status-firefox35: --- → fixed
Depends on: 1081906
You need to log in before you can comment on or make changes to this bug.