Closed Bug 1062630 Opened 5 years ago Closed 5 years ago

Port bug 1041941 to c-c

Categories

(MailNews Core :: Build Config, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
Thunderbird 35.0

People

(Reporter: glandium, Assigned: glandium)

Details

Attachments

(2 files, 3 obsolete files)

Running the script from bug 1041941 should be enough.
Attached patch Port bug 1041941 to c-c (obsolete) — Splinter Review
Attachment #8483868 - Flags: review?(Pidgeot18)
Attached patch Port bug 1041941 to c-c (obsolete) — Splinter Review
In fact, it was missing the XPCOMBinaryComponent part.
Attachment #8483871 - Flags: review?(Pidgeot18)
Attachment #8483868 - Attachment is obsolete: true
Attachment #8483868 - Flags: review?(Pidgeot18)
Attached patch Port bug 1041941 to c-c (obsolete) — Splinter Review
Sorry for the noise, just testing an updated-bzexport.
Attachment #8483873 - Flags: review?(Pidgeot18)
Attachment #8483871 - Attachment is obsolete: true
Attachment #8483871 - Flags: review?(Pidgeot18)
Comment on attachment 8483873 [details] [diff] [review]
Port bug 1041941 to c-c

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

And you will probably come to hate MOZ_INCOMPLETE_EXTERNAL_LINKAGE like I do, because:

::: db/mork/build/moz.build
@@ +23,5 @@
>          'xpcomglue_s',
>          'xul',
>      ]
>  else:
>      FINAL_LIBRARY = 'xul'

You'll need to add a Library("mork") here, I think.

::: ldap/xpcom/src/moz.build
@@ +43,5 @@
>      USE_LIBS += [
>          'js',
>      ]
>  else:
>      FINAL_LIBRARY = 'xul'

... here

::: mail/components/build/moz.build
@@ +22,5 @@
>          'xul',
>      ]
>      OS_LIBS += CONFIG['GLIB_LIBS']
>  else:
>      FINAL_LIBRARY = 'xul'

... and here

::: mailnews/build/moz.build
@@ +20,5 @@
>          'xpcomglue_s',
>          'xul',
>      ]
>  else:
>      FINAL_LIBRARY = 'xul'

... here

::: mailnews/import/build/moz.build
@@ +20,5 @@
>          'xpcomglue_s',
>          'xul',
>      ]
>  else:
>      FINAL_LIBRARY = 'xul'

.. here.

::: mailnews/mapi/mapihook/src/moz.build
@@ +17,2 @@
>  else:
>      FINAL_LIBRARY = 'xul'

... and here.
Turns out some more Library()s were needed.
Attachment #8483880 - Flags: review?(Pidgeot18)
Attachment #8483873 - Attachment is obsolete: true
Attachment #8483873 - Flags: review?(Pidgeot18)
Attachment #8483880 - Flags: review?(Pidgeot18) → review+
https://hg.mozilla.org/comm-central/rev/54d373ca636e
Status: NEW → RESOLVED
Closed: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 35.0
> ==============================
> ERROR PROCESSING MOZBUILD FILE
> ==============================

> The error occurred while processing the following file:
>     c:/t1/hg/comm-central/mailnews/mapi/mapiDLL/moz.build
> The error was triggered on line 12 of this file:
>     FORCE_SHARED_LIB = True
> The underlying problem is an attempt to write a reserved UPPERCASE variable that does not exist.
> The variable write causing the error is:
>     FORCE_SHARED_LIB
> Please use
>     SharedLibrary('foo')
> instead of
>     Library('foo') [ or LIBRARY_NAME = 'foo' ]
>     FORCE_SHARED_LIB = True
Attachment #8484185 - Flags: review?(Pidgeot18)
Comment on attachment 8484185 [details] [diff] [review]
Port Bug 1059113 to c-c MAPI part [check-in comment 10]

Looks good, r=Standard8 (ftr this is actually porting bug 1059113).
Attachment #8484185 - Flags: review?(Pidgeot18) → review+
Comment on attachment 8484185 [details] [diff] [review]
Port Bug 1059113 to c-c MAPI part [check-in comment 10]

Pushed to comm-central:
http://hg.mozilla.org/comm-central/rev/5baf3a87af2d
Attachment #8484185 - Attachment description: mapisharedlibBug1062630.diff → Port bug 1041941 to c-c MAPI part [check-in comment 10]
Attachment #8484185 - Attachment description: Port bug 1041941 to c-c MAPI part [check-in comment 10] → Port Bug 1059113 to c-c MAPI part [check-in comment 10]
(In reply to Joshua Cranmer [:jcranmer] from comment #6)
> https://hg.mozilla.org/comm-central/rev/54d373ca636e

(In reply to Philip Chee from comment #7)
> Pushed to comm-central
> http://hg.mozilla.org/comm-central/rev/3fe94160f168

Why did this land twice?
(In reply to Mike Hommey [:glandium] (out from Sep 6 to Sep 22) from comment #11)
> (In reply to Joshua Cranmer [:jcranmer] from comment #6)
> > https://hg.mozilla.org/comm-central/rev/54d373ca636e
> 
> (In reply to Philip Chee from comment #7)
> > Pushed to comm-central
> > http://hg.mozilla.org/comm-central/rev/3fe94160f168
> 
> Why did this land twice?

I commented that the patch needed landing, and then did it myself about half an hour later. Then Philip saw my comment and pushed himself ten minutes later, apparently not noticing either that I pushed and landed it or that I commented that I landed it in IRC.
Comment on attachment 8483880 [details] [diff] [review]
Port bug 1041941 to c-c

>diff --git a/mailnews/mapi/mapihook/src/moz.build b/mailnews/mapi/mapihook/src/moz.build

>-LIBRARY_NAME = 'msgMapi'
>-
> SOURCES += [
>     'msgMapiFactory.cpp',
>     'msgMapiHook.cpp',
>     'msgMapiImp.cpp',
>     'msgMapiMain.cpp',
>     'msgMapiSupport.cpp',
>     'Registry.cpp',
> ]
> 
> if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
>-    IS_COMPONENT = True
>+    XPCOMBinaryComponent('msgMapi')
> else:
>     FINAL_LIBRARY = 'xul'
> 
Just wondering why this file doesn't have an equivalent Library() entry in the else part whereas every other file that has XPCOMBinaryComponent() entry in an MOZ_INCOMPLETE_EXTERNAL_LINKAGE if statement does?
(In reply to Ian Neal from comment #13)
> Just wondering why this file doesn't have an equivalent Library() entry in
> the else part whereas every other file that has XPCOMBinaryComponent() entry
> in an MOZ_INCOMPLETE_EXTERNAL_LINKAGE if statement does?

Because there is nothing that does FINAL_LIBRARY = 'msgMapi'.
You need to log in before you can comment on or make changes to this bug.