Bug 1318966 - Remove MOZ_INCOMPLETE_EXTERNAL_LINKAGE from c-c build files. r=aleth,Ratty a=Ratty
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Mon, 05 Dec 2016 15:19:32 +0100
changeset 27135 7364d427246cc5712b0befd47ffff6e5eefc5372
parent 27134 c400a36f3e2ce341ae4775bcfec876f46b5b5541
child 27136 edfe6af9e70592537a05d22efad7de6a723a8217
push id1878
push userclokep@gmail.com
push dateTue, 07 Mar 2017 14:18:40 +0000
treeherdercomm-beta@ab59ffd05575 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaleth, Ratty, Ratty
bugs1318966
Bug 1318966 - Remove MOZ_INCOMPLETE_EXTERNAL_LINKAGE from c-c build files. r=aleth,Ratty a=Ratty
db/mork/build/moz.build
ldap/xpcom/src/moz.build
mail/components/build/moz.build
mail/configure.in
mail/moz.build
mailnews/build/moz.build
mailnews/import/build/moz.build
mailnews/mapi/mapiDll/moz.build
mailnews/mapi/mapihook/build/moz.build
mailnews/mapi/mapihook/src/moz.build
suite/configure.in
--- a/db/mork/build/moz.build
+++ b/db/mork/build/moz.build
@@ -7,18 +7,10 @@ EXPORTS += [
     'nsIMdbFactoryFactory.h',
     'nsMorkCID.h',
 ]
 
 SOURCES += [
     'nsMorkFactory.cpp',
 ]
 
-if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    XPCOMBinaryComponent('mork')
-    USE_LIBS += [
-        'nspr',
-        'xpcomglue_s',
-        'xul',
-    ]
-else:
-    Library('mork')
-    FINAL_LIBRARY = 'xul'
+Library('mork')
+FINAL_LIBRARY = 'xul'
--- a/ldap/xpcom/src/moz.build
+++ b/ldap/xpcom/src/moz.build
@@ -26,28 +26,15 @@ EXTRA_COMPONENTS += [
     'ldapComponents.manifest',
     'nsLDAPProtocolHandler.js',
 ]
 
 USE_LIBS += [
     'ldapsdks',
 ]
 
-if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    XPCOMBinaryComponent('mozldap')
-    USE_LIBS += [
-        'nspr',
-        'xpcomglue_s',
-        'xul',
-    ]
-# js needs to come after xul for now, because it is an archive and its content
-# is discarded when it comes first.
-    USE_LIBS += [
-        'js',
-    ]
-else:
-    Library('mozldap')
-    FINAL_LIBRARY = 'xul'
+Library('mozldap')
+FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/ldap/c-sdk/include',
 ]
 
--- a/mail/components/build/moz.build
+++ b/mail/components/build/moz.build
@@ -2,30 +2,18 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsMailComps.cpp',
 ]
 
-# NOTE: if we switch away from LIBXUL_LIBRARY at any stage
-# we need to clear the EMBED_MANIFEST_AT flag. (See Bug 714495)
-if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    XPCOMBinaryComponent('mailcomps')
-    USE_LIBS += [
-        'nspr',
-        'unicharutil_external_s',
-        'xpcomglue_s',
-        'xul',
-    ]
-    OS_LIBS += CONFIG['GLIB_LIBS']
-else:
-    Library('mailcomps')
-    FINAL_LIBRARY = 'xul'
+Library('mailcomps')
+FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../migration/src',
     '../shell',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     OS_LIBS += [
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -31,23 +31,16 @@ dnl ====================================
 dnl = Lightning extension
 dnl =========================================================
 MOZ_ARG_ENABLE_BOOL(calendar,
 [  --enable-calendar      Enable building of the Lightning calendar extension],
     MOZ_CALENDAR=1,
     MOZ_CALENDAR= )
 AC_SUBST(MOZ_CALENDAR)
 
-MOZ_ARG_ENABLE_BOOL(incomplete-external-linkage,
-[  --enable-incomplete-external-linkage Changes some comm-central code to be built with external linkage. Developer only option, incomplete broken builds will result - There are already existing bugs for this. ],
-    MOZ_INCOMPLETE_EXTERNAL_LINKAGE=1,
-    MOZ_INCOMPLETE_EXTERNAL_LINKAGE= )
-
-AC_SUBST(MOZ_INCOMPLETE_EXTERNAL_LINKAGE)
-
 dnl =========================================================
 dnl = LDAP
 dnl =========================================================
 MOZ_ARG_DISABLE_BOOL(ldap,
 [  --disable-ldap          Disable LDAP support],
     MOZ_LDAP_XPCOM=,
     MOZ_LDAP_XPCOM=1)
 
--- a/mail/moz.build
+++ b/mail/moz.build
@@ -10,17 +10,13 @@ DIRS += [
     'base',
     'locales',
     'extensions',
     'steel',
     'themes',
     'app',
 ]
 
-# Add components for external linkage build
-if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    DIRS += ['components']
-
 if CONFIG['MAKENSISU']:
     DIRS += ['installer/windows']
 
 TEST_DIRS += ['test/mozmill']
 
--- a/mailnews/build/moz.build
+++ b/mailnews/build/moz.build
@@ -6,27 +6,18 @@
 SOURCES += [
     'nsMailModule.cpp',
 ]
 
 USE_LIBS += [
     'nspr',
 ]
 
-if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    XPCOMBinaryComponent('mail')
-    USE_LIBS += [
-        'rdfutil_external_s',
-        'unicharutil_external_s',
-        'xpcomglue_s',
-        'xul',
-    ]
-else:
-    Library('mail')
-    FINAL_LIBRARY = 'xul'
+Library('mail')
+FINAL_LIBRARY = 'xul'
 
 # js needs to come after xul for now, because it is an archive and its content
 # is discarded when it comes first.
 USE_LIBS += [
     'js',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
--- a/mailnews/import/build/moz.build
+++ b/mailnews/import/build/moz.build
@@ -6,28 +6,18 @@
 SOURCES += [
     'nsImportModule.cpp',
 ]
 
 USE_LIBS += [
     'nspr',
 ]
 
-if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    XPCOMBinaryComponent('import')
-    USE_LIBS += [
-        'msgbsutl_s',
-        'rdfutil_external_s',
-        'unicharutil_external_s',
-        'xpcomglue_s',
-        'xul',
-    ]
-else:
-    Library('import')
-    FINAL_LIBRARY = 'xul'
+Library('import')
+FINAL_LIBRARY = 'xul'
 
 # js needs to come after xul for now, because it is an archive and its content
 # is discarded when it comes first.
 USE_LIBS += [
     'js',
 ]
 
 LOCAL_INCLUDES += [
--- a/mailnews/mapi/mapiDll/moz.build
+++ b/mailnews/mapi/mapiDll/moz.build
@@ -13,12 +13,11 @@ SOURCES += [
 
 OS_LIBS += [
     'ole32',
 ]
 
 DEFINES['UNICODE'] = True
 DEFINES['_UNICODE'] = True
 
-if not CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    DEFINES['MOZILLA_INTERNAL_API'] = True
+DEFINES['MOZILLA_INTERNAL_API'] = True
 
 DEFFILE	= SRCDIR + '/Mapi32.def'
--- a/mailnews/mapi/mapihook/build/moz.build
+++ b/mailnews/mapi/mapihook/build/moz.build
@@ -10,13 +10,12 @@ OS_LIBS += [
 ]
 
 for var in ('REGISTER_PROXY_DLL', 'UNICODE', '_UNICODE'):
     DEFINES[var] = True
 
 # This produces a compile warning mozilla-config.h(145): warning C4005: '_WIN32_WINNT': macro redefinition
 #DEFINES['_WIN32_WINNT'] = '0x400'
 
-if not CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    DEFINES['MOZILLA_INTERNAL_API'] = True
+DEFINES['MOZILLA_INTERNAL_API'] = True
 
 DEFFILE = SRCDIR + '/MapiProxy.def'
 
--- a/mailnews/mapi/mapihook/src/moz.build
+++ b/mailnews/mapi/mapihook/src/moz.build
@@ -7,19 +7,16 @@ SOURCES += [
     'msgMapiFactory.cpp',
     'msgMapiHook.cpp',
     'msgMapiImp.cpp',
     'msgMapiMain.cpp',
     'msgMapiSupport.cpp',
     'Registry.cpp',
 ]
 
-if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    XPCOMBinaryComponent('msgMapi')
-else:
-    FINAL_LIBRARY = 'xul'
+FINAL_LIBRARY = 'xul'
 
 OS_LIBS += [
     'ole32',
 ]
 
 DEFINES['UNICODE'] = True
 DEFINES['_UNICODE'] = True
--- a/suite/configure.in
+++ b/suite/configure.in
@@ -32,23 +32,16 @@ dnl ====================================
 dnl = Lightning extension
 dnl =========================================================
 MOZ_ARG_ENABLE_BOOL(calendar,
 [  --enable-calendar      Enable building of the Lightning calendar extension],
     MOZ_CALENDAR=1,
     MOZ_CALENDAR= )
 AC_SUBST(MOZ_CALENDAR)
 
-MOZ_ARG_ENABLE_BOOL(incomplete-external-linkage,
-[  --enable-incomplete-external-linkage Changes some comm-central code to be built with external linkage. Developer only option, incomplete broken builds will result - There are already existing bugs for this. ],
-    MOZ_INCOMPLETE_EXTERNAL_LINKAGE=1,
-    MOZ_INCOMPLETE_EXTERNAL_LINKAGE= )
-
-AC_SUBST(MOZ_INCOMPLETE_EXTERNAL_LINKAGE)
-
 dnl =========================================================
 dnl = LDAP
 dnl =========================================================
 MOZ_ARG_DISABLE_BOOL(ldap,
 [  --disable-ldap          Disable LDAP support],
     MOZ_LDAP_XPCOM=,
     MOZ_LDAP_XPCOM=1)