Bug 875059, part 5: Flatten mailnews/import/* into a single directory. r=mkmelin

Depends on D85673

Differential Revision: https://phabricator.services.mozilla.com/D85674

--HG--
rename : mailnews/import/outlook/src/MapiApi.cpp => mailnews/import/src/MapiApi.cpp
rename : mailnews/import/outlook/src/MapiApi.h => mailnews/import/src/MapiApi.h
rename : mailnews/import/outlook/src/MapiDbgLog.h => mailnews/import/src/MapiDbgLog.h
rename : mailnews/import/outlook/src/MapiMessage.cpp => mailnews/import/src/MapiMessage.cpp
rename : mailnews/import/outlook/src/MapiMessage.h => mailnews/import/src/MapiMessage.h
rename : mailnews/import/outlook/src/MapiMimeTypes.cpp => mailnews/import/src/MapiMimeTypes.cpp
rename : mailnews/import/outlook/src/MapiMimeTypes.h => mailnews/import/src/MapiMimeTypes.h
rename : mailnews/import/outlook/src/MapiTagStrs.cpp => mailnews/import/src/MapiTagStrs.cpp
rename : mailnews/import/seamonkey/src/SeamonkeyImport.jsm => mailnews/import/src/SeamonkeyImport.jsm
rename : mailnews/import/seamonkey/src/SeamonkeyImport.manifest => mailnews/import/src/SeamonkeyImport.manifest
rename : mailnews/import/seamonkey/src/components.conf => mailnews/import/src/components.conf
rename : mailnews/import/applemail/src/nsAppleMailImport.cpp => mailnews/import/src/nsAppleMailImport.cpp
rename : mailnews/import/applemail/src/nsAppleMailImport.h => mailnews/import/src/nsAppleMailImport.h
rename : mailnews/import/becky/src/nsBeckyAddressBooks.cpp => mailnews/import/src/nsBeckyAddressBooks.cpp
rename : mailnews/import/becky/src/nsBeckyAddressBooks.h => mailnews/import/src/nsBeckyAddressBooks.h
rename : mailnews/import/becky/src/nsBeckyFilters.cpp => mailnews/import/src/nsBeckyFilters.cpp
rename : mailnews/import/becky/src/nsBeckyFilters.h => mailnews/import/src/nsBeckyFilters.h
rename : mailnews/import/becky/src/nsBeckyImport.cpp => mailnews/import/src/nsBeckyImport.cpp
rename : mailnews/import/becky/src/nsBeckyImport.h => mailnews/import/src/nsBeckyImport.h
rename : mailnews/import/becky/src/nsBeckyMail.cpp => mailnews/import/src/nsBeckyMail.cpp
rename : mailnews/import/becky/src/nsBeckyMail.h => mailnews/import/src/nsBeckyMail.h
rename : mailnews/import/becky/src/nsBeckySettings.cpp => mailnews/import/src/nsBeckySettings.cpp
rename : mailnews/import/becky/src/nsBeckySettings.h => mailnews/import/src/nsBeckySettings.h
rename : mailnews/import/becky/src/nsBeckyStringBundle.cpp => mailnews/import/src/nsBeckyStringBundle.cpp
rename : mailnews/import/becky/src/nsBeckyStringBundle.h => mailnews/import/src/nsBeckyStringBundle.h
rename : mailnews/import/becky/src/nsBeckyUtils.cpp => mailnews/import/src/nsBeckyUtils.cpp
rename : mailnews/import/becky/src/nsBeckyUtils.h => mailnews/import/src/nsBeckyUtils.h
rename : mailnews/import/applemail/src/nsEmlxHelperUtils.h => mailnews/import/src/nsEmlxHelperUtils.h
rename : mailnews/import/applemail/src/nsEmlxHelperUtils.mm => mailnews/import/src/nsEmlxHelperUtils.mm
rename : mailnews/import/outlook/src/nsOutlookCompose.cpp => mailnews/import/src/nsOutlookCompose.cpp
rename : mailnews/import/outlook/src/nsOutlookCompose.h => mailnews/import/src/nsOutlookCompose.h
rename : mailnews/import/outlook/src/nsOutlookImport.cpp => mailnews/import/src/nsOutlookImport.cpp
rename : mailnews/import/outlook/src/nsOutlookImport.h => mailnews/import/src/nsOutlookImport.h
rename : mailnews/import/outlook/src/nsOutlookMail.cpp => mailnews/import/src/nsOutlookMail.cpp
rename : mailnews/import/outlook/src/nsOutlookMail.h => mailnews/import/src/nsOutlookMail.h
rename : mailnews/import/outlook/src/nsOutlookSettings.cpp => mailnews/import/src/nsOutlookSettings.cpp
rename : mailnews/import/outlook/src/nsOutlookSettings.h => mailnews/import/src/nsOutlookSettings.h
rename : mailnews/import/outlook/src/nsOutlookStringBundle.cpp => mailnews/import/src/nsOutlookStringBundle.cpp
rename : mailnews/import/outlook/src/nsOutlookStringBundle.h => mailnews/import/src/nsOutlookStringBundle.h
rename : mailnews/import/text/src/nsTextAddress.cpp => mailnews/import/src/nsTextAddress.cpp
rename : mailnews/import/text/src/nsTextAddress.h => mailnews/import/src/nsTextAddress.h
rename : mailnews/import/text/src/nsTextImport.cpp => mailnews/import/src/nsTextImport.cpp
rename : mailnews/import/text/src/nsTextImport.h => mailnews/import/src/nsTextImport.h
rename : mailnews/import/vcard/src/nsVCardAddress.cpp => mailnews/import/src/nsVCardAddress.cpp
rename : mailnews/import/vcard/src/nsVCardAddress.h => mailnews/import/src/nsVCardAddress.h
rename : mailnews/import/vcard/src/nsVCardImport.cpp => mailnews/import/src/nsVCardImport.cpp
rename : mailnews/import/vcard/src/nsVCardImport.h => mailnews/import/src/nsVCardImport.h
rename : mailnews/import/winlivemail/nsWMImport.cpp => mailnews/import/src/nsWMImport.cpp
rename : mailnews/import/winlivemail/nsWMImport.h => mailnews/import/src/nsWMImport.h
rename : mailnews/import/winlivemail/nsWMSettings.cpp => mailnews/import/src/nsWMSettings.cpp
rename : mailnews/import/winlivemail/nsWMSettings.h => mailnews/import/src/nsWMSettings.h
rename : mailnews/import/winlivemail/nsWMStringBundle.cpp => mailnews/import/src/nsWMStringBundle.cpp
rename : mailnews/import/winlivemail/nsWMStringBundle.h => mailnews/import/src/nsWMStringBundle.h
rename : mailnews/import/winlivemail/nsWMUtils.cpp => mailnews/import/src/nsWMUtils.cpp
rename : mailnews/import/winlivemail/nsWMUtils.h => mailnews/import/src/nsWMUtils.h
rename : mailnews/import/outlook/src/rtfDecoder.cpp => mailnews/import/src/rtfDecoder.cpp
rename : mailnews/import/outlook/src/rtfDecoder.h => mailnews/import/src/rtfDecoder.h
rename : mailnews/import/outlook/src/rtfMailDecoder.cpp => mailnews/import/src/rtfMailDecoder.cpp
rename : mailnews/import/outlook/src/rtfMailDecoder.h => mailnews/import/src/rtfMailDecoder.h
extra : moz-landing-system : lando

mailnews/import/applemail/src/moz.build

@@ -1,15 +0,0 @@
-# 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/.
-
-SOURCES += [
-    'nsAppleMailImport.cpp',
-]
-
-SOURCES += [
-    'nsEmlxHelperUtils.mm',
-]
-
-FINAL_LIBRARY = 'import'
-

mailnews/import/becky/src/moz.build

@@ -1,16 +0,0 @@
-# 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/.
-
-UNIFIED_SOURCES += [
-    'nsBeckyAddressBooks.cpp',
-    'nsBeckyFilters.cpp',
-    'nsBeckyImport.cpp',
-    'nsBeckyMail.cpp',
-    'nsBeckySettings.cpp',
-    'nsBeckyStringBundle.cpp',
-    'nsBeckyUtils.cpp',
-]
-
-FINAL_LIBRARY = 'import'

mailnews/import/build/moz.build

@@ -22,29 +22,11 @@ USE_LIBS += [
 
 LOCAL_INCLUDES += [
     '../src',
-    '../text/src',
-    '../vcard/src',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    LOCAL_INCLUDES += [
-        '../applemail/src',
-    ]
     OS_LIBS += CONFIG['TK_LIBS']
     OS_LIBS += ['-framework Cocoa']
 
-if CONFIG['OS_ARCH'] == 'WINNT':
-    LOCAL_INCLUDES += [
-    ]
-    if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
-        LOCAL_INCLUDES += [
-            '../becky/src',
-            '../outlook/src',
-            '../winlivemail',
-        ]
-    if CONFIG['MOZ_MAPI_SUPPORT']:
-        LOCAL_INCLUDES += [
-            '../outlook/src',
-        ]
-else:
+if CONFIG['OS_ARCH'] != 'WINNT':
     OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']

mailnews/import/outlook/src/moz.build

@@ -1,27 +0,0 @@
-# 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/.
-
-SOURCES += [
-    'MapiApi.cpp',
-    'MapiMessage.cpp',
-    'MapiMimeTypes.cpp',
-    'nsOutlookCompose.cpp',
-    'nsOutlookImport.cpp',
-    'nsOutlookMail.cpp',
-    'nsOutlookSettings.cpp',
-    'nsOutlookStringBundle.cpp',
-    'rtfDecoder.cpp',
-    'rtfMailDecoder.cpp',
-]
-
-FINAL_LIBRARY = 'import'
-
-LOCAL_INCLUDES += [
-    '../../src'
-]
-
-# clang-cl rightly complains about switch on nsresult.
-if CONFIG['CC_TYPE'] == 'clang-cl':
-    CXXFLAGS += ['-Wno-switch']

mailnews/import/seamonkey/src/moz.build

@@ -1,16 +0,0 @@
-# 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/.
-
-EXTRA_COMPONENTS += [
-    'SeamonkeyImport.manifest',
-]
-
-EXTRA_JS_MODULES += [
-    'SeamonkeyImport.jsm',
-]
-
-XPCOM_MANIFESTS += [
-    'components.conf',
-]

mailnews/import/src/moz.build

@@ -18,10 +18,69 @@ SOURCES += [
     'nsImportService.cpp',
     'nsImportStringBundle.cpp',
     'nsImportTranslator.cpp',
+    'nsTextAddress.cpp',
+    'nsTextImport.cpp',
+    'nsVCardAddress.cpp',
+    'nsVCardImport.cpp',
 ]
 
+if not CONFIG['MOZ_SUITE']:
+    EXTRA_COMPONENTS += [
+        'SeamonkeyImport.manifest',
+    ]
+
+    EXTRA_JS_MODULES += [
+        'SeamonkeyImport.jsm',
+    ]
+
+    XPCOM_MANIFESTS += [
+        'components.conf',
+    ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    SOURCES += [
+        'nsAppleMailImport.cpp',
+        'nsEmlxHelperUtils.mm',
+    ]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    UNIFIED_SOURCES += [
+        'nsBeckyAddressBooks.cpp',
+        'nsBeckyFilters.cpp',
+        'nsBeckyImport.cpp',
+        'nsBeckyMail.cpp',
+        'nsBeckySettings.cpp',
+        'nsBeckyStringBundle.cpp',
+        'nsBeckyUtils.cpp',
+    ]
+
+    if CONFIG['MOZ_MAPI_SUPPORT']:
+        SOURCES += [
+            'MapiApi.cpp',
+            'MapiMessage.cpp',
+            'MapiMimeTypes.cpp',
+            'nsOutlookCompose.cpp',
+            'nsOutlookImport.cpp',
+            'nsOutlookMail.cpp',
+            'nsOutlookSettings.cpp',
+            'nsOutlookStringBundle.cpp',
+            'rtfDecoder.cpp',
+            'rtfMailDecoder.cpp',
+        ]
+
+        SOURCES['rtfDecoder.cpp'].flags += ['-Wno-switch']
+
+    if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
+        SOURCES += [
+            'nsWMImport.cpp',
+            'nsWMSettings.cpp',
+            'nsWMStringBundle.cpp',
+            'nsWMUtils.cpp',
+        ]
+
 EXPORTS += [
     'ImportDebug.h',
+    'nsVCardAddress.h',
 ]
 
 FINAL_LIBRARY = 'import'

mailnews/import/text/src/moz.build

@@ -1,16 +0,0 @@
-# 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/.
-
-SOURCES += [
-    'nsTextAddress.cpp',
-    'nsTextImport.cpp',
-]
-
-FINAL_LIBRARY = 'import'
-
-LOCAL_INCLUDES += [
-    '../../src'
-]
-

mailnews/import/vcard/src/moz.build

@@ -1,20 +0,0 @@
-# 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/.
-
-SOURCES += [
-    'nsVCardAddress.cpp',
-    'nsVCardImport.cpp',
-]
-
-EXPORTS += [
-    'nsVCardAddress.h',
-]
-
-FINAL_LIBRARY = 'import'
-
-LOCAL_INCLUDES += [
-    '../../src'
-]
-

mailnews/import/winlivemail/moz.build

@@ -1,13 +0,0 @@
-# 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/.
-
-SOURCES += [
-    'nsWMImport.cpp',
-    'nsWMSettings.cpp',
-    'nsWMStringBundle.cpp',
-    'nsWMUtils.cpp',
-]
-
-FINAL_LIBRARY = 'import'

mailnews/moz.build

@@ -15,8 +15,6 @@ DIRS += [
     'imap/src',
     'import/public',
     'import/src',
-    'import/text/src',
-    'import/vcard/src',
     'intl',
     'jsaccount',
     'local/public',
@@ -27,27 +25,6 @@ DIRS += [
     'search/src',
 ]
 
-if not CONFIG['MOZ_SUITE']:
-    DIRS += [
-        'import/seamonkey/src',
-    ]
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    DIRS += [
-        'import/applemail/src',
-    ]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    DIRS += [ 'import/becky/src' ]
-
-    if CONFIG['MOZ_MAPI_SUPPORT']:
-        DIRS += ['import/outlook/src']
-
-    if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
-        DIRS += [
-            'import/winlivemail',
-        ]
-
 TEST_DIRS += [
     'imap/test',
     'import/test',