Port bug 929905 (combine all *SOURCES into a single SOURCES variable) to comm-central, rs=port by build system peer
authorJoshua Cranmer <Pidgeot18@gmail.com>
Fri, 25 Oct 2013 08:34:13 -0500
changeset 16739 8a70195074b2d8d6225f403cab3e1a6a0424df0f
parent 16738 756933362e51358e80262fbabc35ae5cee9f5842
child 16740 cf5cc2cc6e2cf08e1e1f515055a3c45682c69567
push id1048
push userbugzilla@standard8.plus.com
push dateMon, 09 Dec 2013 20:31:40 +0000
treeherdercomm-beta@16699e4eae0e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersport
bugs929905
Port bug 929905 (combine all *SOURCES into a single SOURCES variable) to comm-central, rs=port by build system peer Partly fixing SeaMonkey's CLOSED TREE too.
calendar/base/backend/libical/build/moz.build
calendar/base/backend/libical/moz.build
calendar/libical/src/libical/moz.build
db/mork/build/moz.build
db/mork/src/moz.build
ldap/xpcom/src/moz.build
mail/app/moz.build
mail/components/build/moz.build
mail/components/migration/src/moz.build
mail/components/search/moz.build
mail/components/search/wsenable/moz.build
mail/components/shell/moz.build
mailnews/addrbook/src/moz.build
mailnews/base/search/src/moz.build
mailnews/base/src/moz.build
mailnews/base/util/moz.build
mailnews/build/moz.build
mailnews/compose/src/moz.build
mailnews/db/msgdb/src/moz.build
mailnews/extensions/bayesian-spam-filter/src/moz.build
mailnews/extensions/fts3/src/moz.build
mailnews/extensions/mailviews/src/moz.build
mailnews/extensions/mdn/src/moz.build
mailnews/extensions/smime/src/moz.build
mailnews/imap/src/moz.build
mailnews/import/applemail/src/moz.build
mailnews/import/build/moz.build
mailnews/import/eudora/src/moz.build
mailnews/import/oexpress/moz.build
mailnews/import/outlook/src/moz.build
mailnews/import/src/moz.build
mailnews/import/text/src/moz.build
mailnews/import/vcard/src/moz.build
mailnews/import/winlivemail/moz.build
mailnews/local/src/moz.build
mailnews/mapi/mapiDll/moz.build
mailnews/mapi/mapihook/src/moz.build
mailnews/mime/cthandlers/glue/moz.build
mailnews/mime/cthandlers/pgpmime/moz.build
mailnews/mime/cthandlers/vcard/moz.build
mailnews/mime/emitters/moz.build
mailnews/mime/src/moz.build
mailnews/news/src/moz.build
suite/app/moz.build
suite/build/moz.build
suite/feeds/src/moz.build
suite/profile/migration/src/moz.build
suite/profile/moz.build
suite/shell/src/moz.build
--- a/calendar/base/backend/libical/build/moz.build
+++ b/calendar/base/backend/libical/build/moz.build
@@ -1,17 +1,17 @@
 # vim: set filetype=python:
 # 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/.
 
 XPIDL_MODULE = 'caldatetime_libical'
 MODULE = 'calbasecomps'
 
-CPP_SOURCES += [
+SOURCES += [
     'calBaseModule.cpp',
 ]
 
 # We don't want an EXPORT_LIBRARY
 FORCE_SHARED_LIB = True
 IS_COMPONENT = True
 
 LIBRARY_NAME = 'calbasecomps'
--- a/calendar/base/backend/libical/moz.build
+++ b/calendar/base/backend/libical/moz.build
@@ -10,17 +10,17 @@ DIRS = [
 ]
 
 XPIDL_SOURCES += [
     'calIDateTime.idl',
 ]
 
 XPIDL_MODULE = 'caldatetime_libical'
 
-CPP_SOURCES += [
+SOURCES += [
     'calDateTime.cpp',
     'calDuration.cpp',
     'calICSService.cpp',
     'calPeriod.cpp',
     'calRecurrenceRule.cpp',
     'calTimezone.cpp',
     'calUtils.cpp',
 ]
--- a/calendar/libical/src/libical/moz.build
+++ b/calendar/libical/src/libical/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'ical'
 
-CSRCS += [
+SOURCES += [
     'caldate.c',
     'icalarray.c',
     'icalattach.c',
     'icalcomponent.c',
     'icalduration.c',
     'icalenums.c',
     'icalerror.c',
     'icallangbind.c',
--- a/db/mork/build/moz.build
+++ b/db/mork/build/moz.build
@@ -5,17 +5,17 @@
 
 MODULE = 'mork'
 
 EXPORTS += [
     'nsIMdbFactoryFactory.h',
     'nsMorkCID.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsMorkFactory.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
     FORCE_SHARED_LIB = True
 else:
     LIBXUL_LIBRARY = True
--- a/db/mork/src/moz.build
+++ b/db/mork/src/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'mork'
 
-CPP_SOURCES += [
+SOURCES += [
     'morkArray.cpp',
     'morkAtom.cpp',
     'morkAtomMap.cpp',
     'morkAtomSpace.cpp',
     'morkBead.cpp',
     'morkBlob.cpp',
     'morkBuilder.cpp',
     'morkCell.cpp',
@@ -46,17 +46,17 @@ CPP_SOURCES += [
     'morkThumb.cpp',
     'morkWriter.cpp',
     'morkYarn.cpp',
     'morkZone.cpp',
     'orkinHeap.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    CPP_SOURCES += ['morkSearchRowCursor.cpp']
+    SOURCES += ['morkSearchRowCursor.cpp']
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'msgmork_s'
 
--- a/ldap/xpcom/src/moz.build
+++ b/ldap/xpcom/src/moz.build
@@ -1,32 +1,32 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'mozldap'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsLDAPBERElement.cpp',
     'nsLDAPBERValue.cpp',
     'nsLDAPConnection.cpp',
     'nsLDAPControl.cpp',
     'nsLDAPMessage.cpp',
     'nsLDAPModification.cpp',
     'nsLDAPOperation.cpp',
     'nsLDAPProtocolModule.cpp',
     'nsLDAPSecurityGlue.cpp',
     'nsLDAPServer.cpp',
     'nsLDAPService.cpp',
     'nsLDAPURL.cpp',
 ]
 
 if CONFIG['MOZ_PREF_EXTENSIONS']:
-    CPP_SOURCES += ['nsLDAPSyncQuery.cpp']
+    SOURCES += ['nsLDAPSyncQuery.cpp']
 
 EXTRA_COMPONENTS += [
     'ldapComponents.manifest',
     'nsLDAPProtocolHandler.js',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
--- a/mail/app/moz.build
+++ b/mail/app/moz.build
@@ -2,9 +2,9 @@
 # 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/.
 
 DIRS += ['profile']
 
 if not CONFIG['LIBXUL_SDK']:
     PROGRAM = CONFIG['MOZ_APP_NAME']
-    CPP_SOURCES += ['nsMailApp.cpp']
+    SOURCES += ['nsMailApp.cpp']
--- a/mail/components/build/moz.build
+++ b/mail/components/build/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'mailcomps'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsMailComps.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 EXPORT_LIBRARY = True
 
 LIBRARY_NAME = 'mailcomps'
 
--- a/mail/components/migration/src/moz.build
+++ b/mail/components/migration/src/moz.build
@@ -1,32 +1,32 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'mailprofilemigration'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsMailProfileMigratorUtils.cpp',
     'nsNetscapeProfileMigratorBase.cpp',
     'nsProfileMigrator.cpp',
     'nsSeamonkeyProfileMigrator.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    CPP_SOURCES += [
+    SOURCES += [
         'nsEudoraProfileMigrator.cpp',
         'nsOEProfileMigrator.cpp',
         'nsOutlookProfileMigrator.cpp',
         'nsProfileMigratorBase.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CPP_SOURCES += [
+    SOURCES += [
         'nsEudoraProfileMigrator.cpp',
         'nsProfileMigratorBase.cpp',
     ]
 
 FORCE_STATIC_LIB = True
 
 LIBRARY_NAME = 'profilemigration_s'
 
--- a/mail/components/search/moz.build
+++ b/mail/components/search/moz.build
@@ -3,17 +3,17 @@
 # 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/.
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     DIRS += ['mdimporter']
     EXTRA_PP_JS_MODULES += ['SpotlightIntegration.js']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DIRS += ['wsenable']
-    CPP_SOURCES += ['nsMailWinSearchHelper.cpp']
+    SOURCES += ['nsMailWinSearchHelper.cpp']
     EXTRA_PP_JS_MODULES += ['WinSearchIntegration.js']
     FORCE_STATIC_LIB = True
     LIBRARY_NAME = 'winsearch_s'
 
 MODULE = 'mailwinsearch'
 
 DIRS += ['public']
 
--- a/mail/components/search/wsenable/moz.build
+++ b/mail/components/search/wsenable/moz.build
@@ -1,11 +1,11 @@
 # vim: set filetype=python:
 # 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/.
 
 PROGRAM = 'WSEnable'
 
-CPP_SOURCES += [
+SOURCES += [
     'WSEnable.cpp',
 ]
 
--- a/mail/components/shell/moz.build
+++ b/mail/components/shell/moz.build
@@ -2,28 +2,28 @@
 # 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/.
 
 DIRS += ['public']
 
 MODULE = 'shellservice'
 
-CPP_SOURCES += [
+SOURCES += [
     'DirectoryProvider.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    CPP_SOURCES += ['nsMailWinIntegration.cpp']
+    SOURCES += ['nsMailWinIntegration.cpp']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
-    CPP_SOURCES += ['nsMailGNOMEIntegration.cpp']
+    SOURCES += ['nsMailGNOMEIntegration.cpp']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CPP_SOURCES += ['nsMailMacIntegration.cpp']
+    SOURCES += ['nsMailMacIntegration.cpp']
 
 EXTRA_COMPONENTS += [
     'nsSetDefaultMail.js',
     'shell.manifest',
 ]
 
 FORCE_STATIC_LIB = True
 
--- a/mailnews/addrbook/src/moz.build
+++ b/mailnews/addrbook/src/moz.build
@@ -4,17 +4,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'addrbook'
 
 EXPORTS += [
     'nsVCardObj.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsAbAddressCollector.cpp',
     'nsAbBooleanExpression.cpp',
     'nsAbBSDirectory.cpp',
     'nsAbCardProperty.cpp',
     'nsAbContentHandler.cpp',
     'nsAbDirectoryQuery.cpp',
     'nsAbDirectoryQueryProxy.cpp',
     'nsAbDirFactoryService.cpp',
@@ -32,37 +32,37 @@ CPP_SOURCES += [
     'nsAddrDatabase.cpp',
     'nsDirPrefs.cpp',
     'nsMsgVCardService.cpp',
     'nsVCard.cpp',
     'nsVCardObj.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['MOZ_MAPI_SUPPORT']:
-    CPP_SOURCES += [
+    SOURCES += [
         'nsAbOutlookDirectory.cpp',
         'nsAbOutlookDirFactory.cpp',
         'nsAbWinHelper.cpp',
         'nsMapiAddressBook.cpp',
         'nsWabAddressBook.cpp',
     ]
 
 if CONFIG['OS_ARCH'] == 'Darwin':
-    CPP_SOURCES += [
+    SOURCES += [
         'nsAbOSXDirFactory.cpp',
     ]
 
-    CMMSRCS += [
+    SOURCES += [
         'nsAbOSXCard.mm',
         'nsAbOSXDirectory.mm',
         'nsAbOSXUtils.mm',
     ]
 
 if CONFIG['MOZ_LDAP_XPCOM']:
-    CPP_SOURCES += [
+    SOURCES += [
         'nsAbBoolExprToLDAPFilter.cpp',
         'nsAbLDAPCard.cpp',
         'nsAbLDAPDirectory.cpp',
         'nsAbLDAPDirectoryModify.cpp',
         'nsAbLDAPDirectoryQuery.cpp',
         'nsAbLDAPDirFactory.cpp',
         'nsAbLDAPListenerBase.cpp',
         'nsAbLDAPReplicationData.cpp',
--- a/mailnews/base/search/src/moz.build
+++ b/mailnews/base/search/src/moz.build
@@ -2,17 +2,17 @@
 # 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/.
 
 XPIDL_MODULE = 'msgsearch'
 
 MODULE = 'msgbase'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsMsgBodyHandler.cpp',
     'nsMsgFilter.cpp',
     'nsMsgFilterList.cpp',
     'nsMsgFilterService.cpp',
     'nsMsgImapSearch.cpp',
     'nsMsgLocalSearch.cpp',
     'nsMsgSearchAdapter.cpp',
     'nsMsgSearchNews.cpp',
--- a/mailnews/base/src/moz.build
+++ b/mailnews/base/src/moz.build
@@ -6,17 +6,17 @@
 MODULE = 'msgbase'
 
 EXPORTS += [
     'nsMailDirServiceDefs.h',
     'nsMsgRDFDataSource.h',
     'nsMsgRDFUtils.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'MailNewsDLF.cpp',
     'nsCidProtocolHandler.cpp',
     'nsCopyMessageStreamListener.cpp',
     'nsMailDirProvider.cpp',
     'nsMessenger.cpp',
     'nsMessengerBootstrap.cpp',
     'nsMessengerContentHandler.cpp',
     'nsMsgAccount.cpp',
@@ -51,27 +51,27 @@ CPP_SOURCES += [
     'nsMsgXFVirtualFolderDBView.cpp',
     'nsSpamSettings.cpp',
     'nsStatusBarBiffManager.cpp',
     'nsSubscribableServer.cpp',
     'nsSubscribeDataSource.cpp',
 ]
 
 if CONFIG['NS_PRINTING']:
-    CPP_SOURCES += ['nsMsgPrintEngine.cpp']
+    SOURCES += ['nsMsgPrintEngine.cpp']
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    CPP_SOURCES += ['nsMessengerWinIntegration.cpp']
+    SOURCES += ['nsMessengerWinIntegration.cpp']
 elif CONFIG['OS_ARCH'] == 'OS2':
-    CPP_SOURCES += ['nsMessengerOS2Integration.cpp']
+    SOURCES += ['nsMessengerOS2Integration.cpp']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
-    CPP_SOURCES += ['nsMessengerUnixIntegration.cpp']
+    SOURCES += ['nsMessengerUnixIntegration.cpp']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CMMSRCS += ['nsMessengerOSXIntegration.mm']
+    SOURCES += ['nsMessengerOSXIntegration.mm']
 
 EXTRA_COMPONENTS += [
     'msgAsyncPrompter.js',
     'msgBase.manifest',
     'newMailNotificationService.js',
     'nsMailNewsCommandLineHandler.js',
 ]
 
--- a/mailnews/base/util/moz.build
+++ b/mailnews/base/util/moz.build
@@ -24,17 +24,17 @@ EXPORTS += [
     'nsMsgUtils.h',
 ]
 
 EXPORTS.mozilla.mailnews += [
     'ServiceList.h',
     'Services.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsImapMoveCoalescer.cpp',
     'nsMsgCompressIStream.cpp',
     'nsMsgCompressOStream.cpp',
     'nsMsgDBFolder.cpp',
     'nsMsgFileStream.cpp',
     'nsMsgI18N.cpp',
     'nsMsgIdentity.cpp',
     'nsMsgIncomingServer.cpp',
--- a/mailnews/build/moz.build
+++ b/mailnews/build/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'mail'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsMailModule.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
     FORCE_SHARED_LIB = True
 else:
     LIBXUL_LIBRARY = True
--- a/mailnews/compose/src/moz.build
+++ b/mailnews/compose/src/moz.build
@@ -4,17 +4,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'msgcompose'
 
 EXPORTS += [
     'nsComposeStrings.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsMsgAttachment.cpp',
     'nsMsgAttachmentHandler.cpp',
     'nsMsgCompFields.cpp',
     'nsMsgCompose.cpp',
     'nsMsgComposeContentHandler.cpp',
     'nsMsgComposeParams.cpp',
     'nsMsgComposeProgressParams.cpp',
     'nsMsgComposeService.cpp',
@@ -29,17 +29,17 @@ CPP_SOURCES += [
     'nsSmtpProtocol.cpp',
     'nsSmtpServer.cpp',
     'nsSmtpService.cpp',
     'nsSmtpUrl.cpp',
     'nsURLFetcher.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CPP_SOURCES += [
+    SOURCES += [
         'nsMsgAppleDoubleEncode.cpp',
         'nsMsgAppleEncode.cpp',
     ]
 
 EXTRA_COMPONENTS += [
     'nsSMTPProtocolHandler.js',
     'nsSMTPProtocolHandler.manifest',
 ]
--- a/mailnews/db/msgdb/src/moz.build
+++ b/mailnews/db/msgdb/src/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'msgdb'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsDBFolderInfo.cpp',
     'nsImapMailDatabase.cpp',
     'nsMailDatabase.cpp',
     'nsMsgDatabase.cpp',
     'nsMsgHdr.cpp',
     'nsMsgOfflineImapOperation.cpp',
     'nsMsgThread.cpp',
     'nsNewsDatabase.cpp',
--- a/mailnews/extensions/bayesian-spam-filter/src/moz.build
+++ b/mailnews/extensions/bayesian-spam-filter/src/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'bayesflt'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsBayesianFilter.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
--- a/mailnews/extensions/fts3/src/moz.build
+++ b/mailnews/extensions/fts3/src/moz.build
@@ -1,21 +1,21 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'fts3tok'
 
-CSRCS += [
+SOURCES += [
     'fts3_porter.c',
     'Normalize.c',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsFts3Tokenizer.cpp',
     'nsGlodaRankerFunction.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
--- a/mailnews/extensions/mailviews/src/moz.build
+++ b/mailnews/extensions/mailviews/src/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'mailview'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsMsgMailViewList.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
--- a/mailnews/extensions/mdn/src/moz.build
+++ b/mailnews/extensions/mdn/src/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'msgmdn'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsMsgMdnGenerator.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'mdn-service.js',
     'mdn-service.manifest',
 ]
 
--- a/mailnews/extensions/smime/src/moz.build
+++ b/mailnews/extensions/smime/src/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'msgsmime'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsEncryptedSMIMEURIsService.cpp',
     'nsMsgComposeSecure.cpp',
     'nsSMimeJSHelper.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'smime-service.js',
     'smime-service.manifest',
--- a/mailnews/imap/src/moz.build
+++ b/mailnews/imap/src/moz.build
@@ -4,17 +4,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'msgimap'
 
 EXPORTS += [
     'nsImapCore.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsAutoSyncManager.cpp',
     'nsAutoSyncState.cpp',
     'nsIMAPBodyShell.cpp',
     'nsImapFlagAndUidState.cpp',
     'nsIMAPGenericParser.cpp',
     'nsIMAPHostSessionList.cpp',
     'nsImapIncomingServer.cpp',
     'nsImapMailFolder.cpp',
--- a/mailnews/import/applemail/src/moz.build
+++ b/mailnews/import/applemail/src/moz.build
@@ -1,20 +1,20 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'impapplemail'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsAppleMailImport.cpp',
 ]
 
-CMMSRCS += [
+SOURCES += [
     'nsEmlxHelperUtils.mm',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
--- a/mailnews/import/build/moz.build
+++ b/mailnews/import/build/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'import'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsImportModule.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
     FORCE_SHARED_LIB = True
 else:
     LIBXUL_LIBRARY = True
--- a/mailnews/import/eudora/src/moz.build
+++ b/mailnews/import/eudora/src/moz.build
@@ -1,31 +1,31 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'impEudra'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsEudoraAddress.cpp',
     'nsEudoraCompose.cpp',
     'nsEudoraEditor.cpp',
     'nsEudoraFilters.cpp',
     'nsEudoraImport.cpp',
     'nsEudoraMailbox.cpp',
     'nsEudoraSettings.cpp',
     'nsEudoraStringBundle.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    CPP_SOURCES += ['nsEudoraWin32.cpp']
+    SOURCES += ['nsEudoraWin32.cpp']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CPP_SOURCES += ['nsEudoraMac.cpp']
+    SOURCES += ['nsEudoraMac.cpp']
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'impEudra_s'
 
--- a/mailnews/import/oexpress/moz.build
+++ b/mailnews/import/oexpress/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'importOE'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsOE5File.cpp',
     'nsOEAddressIterator.cpp',
     'nsOEImport.cpp',
     'nsOEMailbox.cpp',
     'nsOERegUtil.cpp',
     'nsOEScanBoxes.cpp',
     'nsOESettings.cpp',
     'nsOEStringBundle.cpp',
--- a/mailnews/import/outlook/src/moz.build
+++ b/mailnews/import/outlook/src/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'impOutlk'
 
-CPP_SOURCES += [
+SOURCES += [
     'MapiApi.cpp',
     'MapiMessage.cpp',
     'MapiMimeTypes.cpp',
     'nsOutlookCompose.cpp',
     'nsOutlookImport.cpp',
     'nsOutlookMail.cpp',
     'nsOutlookSettings.cpp',
     'nsOutlookStringBundle.cpp',
--- a/mailnews/import/src/moz.build
+++ b/mailnews/import/src/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'import'
 
-CPP_SOURCES += [
+SOURCES += [
     'ImportCharSet.cpp',
     'ImportOutFile.cpp',
     'ImportTranslate.cpp',
     'nsImportABDescriptor.cpp',
     'nsImportAddressBooks.cpp',
     'nsImportEmbeddedImageData.cpp',
     'nsImportEncodeScan.cpp',
     'nsImportFieldMap.cpp',
--- a/mailnews/import/text/src/moz.build
+++ b/mailnews/import/text/src/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'impText'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsTextAddress.cpp',
     'nsTextImport.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
--- a/mailnews/import/vcard/src/moz.build
+++ b/mailnews/import/vcard/src/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'impvcard'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsVCardAddress.cpp',
     'nsVCardImport.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
--- a/mailnews/import/winlivemail/moz.build
+++ b/mailnews/import/winlivemail/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'importWM'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsWMImport.cpp',
     'nsWMSettings.cpp',
     'nsWMStringBundle.cpp',
     'nsWMUtils.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
--- a/mailnews/local/src/moz.build
+++ b/mailnews/local/src/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'msglocal'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsLocalMailFolder.cpp',
     'nsLocalUndoTxn.cpp',
     'nsLocalUtils.cpp',
     'nsMailboxProtocol.cpp',
     'nsMailboxServer.cpp',
     'nsMailboxService.cpp',
     'nsMailboxUrl.cpp',
     'nsMsgBrkMBoxStore.cpp',
@@ -24,17 +24,17 @@ CPP_SOURCES += [
     'nsPop3Service.cpp',
     'nsPop3Sink.cpp',
     'nsPop3URL.cpp',
     'nsRssIncomingServer.cpp',
     'nsRssService.cpp',
 ]
 
 if CONFIG['MOZ_MOVEMAIL']:
-    CPP_SOURCES += [
+    SOURCES += [
         'nsMovemailIncomingServer.cpp',
         'nsMovemailService.cpp',
     ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
--- a/mailnews/mapi/mapiDll/moz.build
+++ b/mailnews/mapi/mapiDll/moz.build
@@ -1,14 +1,14 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'mozMapi32'
 LIBRARY_NAME = 'mozMapi32'
 
-CPP_SOURCES += [
+SOURCES += [
     'MapiDll.cpp',
 ]
 
 FORCE_SHARED_LIB = True
 
--- a/mailnews/mapi/mapihook/src/moz.build
+++ b/mailnews/mapi/mapihook/src/moz.build
@@ -1,17 +1,17 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'msgMapi'
 LIBRARY_NAME = 'msgMapi'
 
-CPP_SOURCES += [
+SOURCES += [
     'msgMapiFactory.cpp',
     'msgMapiHook.cpp',
     'msgMapiImp.cpp',
     'msgMapiMain.cpp',
     'msgMapiSupport.cpp',
     'Registry.cpp',
 ]
 
--- a/mailnews/mime/cthandlers/glue/moz.build
+++ b/mailnews/mime/cthandlers/glue/moz.build
@@ -4,17 +4,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'mime'
 
 EXPORTS += [
     'nsMimeContentTypeHandler.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'mimexpcom.cpp',
     'nsMimeContentTypeHandler.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
--- a/mailnews/mime/cthandlers/pgpmime/moz.build
+++ b/mailnews/mime/cthandlers/pgpmime/moz.build
@@ -4,17 +4,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'pgpmime'
 
 EXPORTS += [
     'nsPgpMimeProxy.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsPgpMimeProxy.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
 else:
     LIBXUL_LIBRARY = True
 
--- a/mailnews/mime/cthandlers/vcard/moz.build
+++ b/mailnews/mime/cthandlers/vcard/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'vcard'
 
-CPP_SOURCES += [
+SOURCES += [
     'mimevcrd.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
--- a/mailnews/mime/emitters/moz.build
+++ b/mailnews/mime/emitters/moz.build
@@ -4,17 +4,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'mimeemitter'
 
 EXPORTS += [
     'nsMimeEmitterCID.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsEmitterUtils.cpp',
     'nsMimeBaseEmitter.cpp',
     'nsMimeHtmlEmitter.cpp',
     'nsMimePlainEmitter.cpp',
     'nsMimeRawEmitter.cpp',
     'nsMimeRebuffer.cpp',
     'nsMimeXmlEmitter.cpp',
 ]
--- a/mailnews/mime/src/moz.build
+++ b/mailnews/mime/src/moz.build
@@ -20,17 +20,17 @@ EXPORTS += [
     'mimepbuf.h',
     'mimetext.h',
     'modlmime.h',
     'modmimee.h',
     'nsMimeStringResources.h',
     'nsStreamConverter.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'comi18n.cpp',
     'mimebuf.cpp',
     'mimecms.cpp',
     'mimecom.cpp',
     'mimecont.cpp',
     'mimecryp.cpp',
     'mimecth.cpp',
     'mimedrft.cpp',
--- a/mailnews/news/src/moz.build
+++ b/mailnews/news/src/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'msgnews'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsNewsDownloadDialogArgs.cpp',
     'nsNewsDownloader.cpp',
     'nsNewsFolder.cpp',
     'nsNewsUtils.cpp',
     'nsNNTPArticleList.cpp',
     'nsNntpIncomingServer.cpp',
     'nsNntpMockChannel.cpp',
     'nsNNTPNewsgroupList.cpp',
--- a/suite/app/moz.build
+++ b/suite/app/moz.build
@@ -1,8 +1,8 @@
 # vim: set filetype=python:
 # 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/.
 
 if not CONFIG['LIBXUL_SDK']:
     PROGRAM = CONFIG['MOZ_APP_NAME']
-    CPP_SOURCES += ['nsSuiteApp.cpp']
+    SOURCES += ['nsSuiteApp.cpp']
--- a/suite/build/moz.build
+++ b/suite/build/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'suite'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsSuiteModule.cpp',
 ]
 
 FORCE_SHARED_LIB = True
 IS_COMPONENT = True
 
 LIBRARY_NAME = 'suite'
 
--- a/suite/feeds/src/moz.build
+++ b/suite/feeds/src/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'suitefeeds'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsFeedSniffer.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'FeedConverter.js',
     'FeedWriter.js',
     'SuiteFeeds.manifest',
     'WebContentConverter.js',
--- a/suite/profile/migration/src/moz.build
+++ b/suite/profile/migration/src/moz.build
@@ -1,16 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'suitemigration'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsNetscapeProfileMigratorBase.cpp',
     'nsSuiteProfileMigratorUtils.cpp',
     'nsThunderbirdProfileMigrator.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'SuiteProfileMigrator.manifest',
 ]
--- a/suite/profile/moz.build
+++ b/suite/profile/moz.build
@@ -5,16 +5,16 @@
 
 PARALLEL_DIRS += [
     'migration/public',
     'migration/src',
 ]
 
 MODULE = 'suiteprofile'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsSuiteDirectoryProvider.cpp',
 ]
 
 FORCE_STATIC_LIB = True
 
 LIBRARY_NAME = 'suiteprofile_s'
 
--- a/suite/shell/src/moz.build
+++ b/suite/shell/src/moz.build
@@ -1,23 +1,23 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'shellservice'
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    CPP_SOURCES += ['nsWindowsShellService.cpp']
+    SOURCES += ['nsWindowsShellService.cpp']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CPP_SOURCES += ['nsMacShellService.cpp']
+    SOURCES += ['nsMacShellService.cpp']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
-    CPP_SOURCES += ['nsGNOMEShellService.cpp']
+    SOURCES += ['nsGNOMEShellService.cpp']
 
-if CPP_SOURCES:
+if SOURCES:
     EXTRA_COMPONENTS += [
         'nsSetDefault.js',
         'nsSetDefault.manifest',
     ]
 
 FORCE_STATIC_LIB = True
 
 LIBRARY_NAME = 'shellservice_s'