Bug 875059, part 6: Move mailnews/base/util to mailnews/base/src. r=mkmelin

Depends on D85674

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

--HG--
rename : mailnews/base/util/ABQueryUtils.jsm => mailnews/base/src/ABQueryUtils.jsm
rename : mailnews/base/util/ErrUtils.jsm => mailnews/base/src/ErrUtils.jsm
rename : mailnews/base/util/IOUtils.jsm => mailnews/base/src/IOUtils.jsm
rename : mailnews/base/util/JXON.jsm => mailnews/base/src/JXON.jsm
rename : mailnews/base/util/JsTreeSelection.jsm => mailnews/base/src/JsTreeSelection.jsm
rename : mailnews/base/util/MailServices.jsm => mailnews/base/src/MailServices.jsm
rename : mailnews/base/util/MailnewsMigrator.jsm => mailnews/base/src/MailnewsMigrator.jsm
rename : mailnews/base/util/MsgDBCacheManager.jsm => mailnews/base/src/MsgDBCacheManager.jsm
rename : mailnews/base/util/OAuth2.jsm => mailnews/base/src/OAuth2.jsm
rename : mailnews/base/util/OAuth2Providers.jsm => mailnews/base/src/OAuth2Providers.jsm
rename : mailnews/base/util/ServiceList.h => mailnews/base/src/ServiceList.h
rename : mailnews/base/util/Services.cpp => mailnews/base/src/Services.cpp
rename : mailnews/base/util/Services.h => mailnews/base/src/Services.h
rename : mailnews/base/util/TemplateUtils.jsm => mailnews/base/src/TemplateUtils.jsm
rename : mailnews/base/util/TraceHelper.jsm => mailnews/base/src/TraceHelper.jsm
rename : mailnews/base/util/converterWorker.js => mailnews/base/src/converterWorker.js
rename : mailnews/base/util/folderUtils.jsm => mailnews/base/src/folderUtils.jsm
rename : mailnews/base/util/hostnameUtils.jsm => mailnews/base/src/hostnameUtils.jsm
rename : mailnews/base/util/iteratorUtils.jsm => mailnews/base/src/iteratorUtils.jsm
rename : mailnews/base/util/mailstoreConverter.jsm => mailnews/base/src/mailstoreConverter.jsm
rename : mailnews/base/util/nsImapMoveCoalescer.cpp => mailnews/base/src/nsImapMoveCoalescer.cpp
rename : mailnews/base/util/nsImapMoveCoalescer.h => mailnews/base/src/nsImapMoveCoalescer.h
rename : mailnews/base/util/nsMsgCompressIStream.cpp => mailnews/base/src/nsMsgCompressIStream.cpp
rename : mailnews/base/util/nsMsgCompressIStream.h => mailnews/base/src/nsMsgCompressIStream.h
rename : mailnews/base/util/nsMsgCompressOStream.cpp => mailnews/base/src/nsMsgCompressOStream.cpp
rename : mailnews/base/util/nsMsgCompressOStream.h => mailnews/base/src/nsMsgCompressOStream.h
rename : mailnews/base/util/nsMsgDBFolder.cpp => mailnews/base/src/nsMsgDBFolder.cpp
rename : mailnews/base/util/nsMsgDBFolder.h => mailnews/base/src/nsMsgDBFolder.h
rename : mailnews/base/util/nsMsgFileStream.cpp => mailnews/base/src/nsMsgFileStream.cpp
rename : mailnews/base/util/nsMsgFileStream.h => mailnews/base/src/nsMsgFileStream.h
rename : mailnews/base/util/nsMsgI18N.cpp => mailnews/base/src/nsMsgI18N.cpp
rename : mailnews/base/util/nsMsgI18N.h => mailnews/base/src/nsMsgI18N.h
rename : mailnews/base/util/nsMsgIdentity.cpp => mailnews/base/src/nsMsgIdentity.cpp
rename : mailnews/base/util/nsMsgIdentity.h => mailnews/base/src/nsMsgIdentity.h
rename : mailnews/base/util/nsMsgIncomingServer.cpp => mailnews/base/src/nsMsgIncomingServer.cpp
rename : mailnews/base/util/nsMsgIncomingServer.h => mailnews/base/src/nsMsgIncomingServer.h
rename : mailnews/base/util/nsMsgKeyArray.cpp => mailnews/base/src/nsMsgKeyArray.cpp
rename : mailnews/base/util/nsMsgKeyArray.h => mailnews/base/src/nsMsgKeyArray.h
rename : mailnews/base/util/nsMsgKeySet.cpp => mailnews/base/src/nsMsgKeySet.cpp
rename : mailnews/base/util/nsMsgKeySet.h => mailnews/base/src/nsMsgKeySet.h
rename : mailnews/base/util/nsMsgLineBuffer.cpp => mailnews/base/src/nsMsgLineBuffer.cpp
rename : mailnews/base/util/nsMsgLineBuffer.h => mailnews/base/src/nsMsgLineBuffer.h
rename : mailnews/base/util/nsMsgMailNewsUrl.cpp => mailnews/base/src/nsMsgMailNewsUrl.cpp
rename : mailnews/base/util/nsMsgMailNewsUrl.h => mailnews/base/src/nsMsgMailNewsUrl.h
rename : mailnews/base/util/nsMsgProtocol.cpp => mailnews/base/src/nsMsgProtocol.cpp
rename : mailnews/base/util/nsMsgProtocol.h => mailnews/base/src/nsMsgProtocol.h
rename : mailnews/base/util/nsMsgReadStateTxn.cpp => mailnews/base/src/nsMsgReadStateTxn.cpp
rename : mailnews/base/util/nsMsgReadStateTxn.h => mailnews/base/src/nsMsgReadStateTxn.h
rename : mailnews/base/util/nsMsgTxn.cpp => mailnews/base/src/nsMsgTxn.cpp
rename : mailnews/base/util/nsMsgTxn.h => mailnews/base/src/nsMsgTxn.h
rename : mailnews/base/util/nsMsgUtils.cpp => mailnews/base/src/nsMsgUtils.cpp
rename : mailnews/base/util/nsMsgUtils.h => mailnews/base/src/nsMsgUtils.h
rename : mailnews/base/util/nsNewMailnewsURI.cpp => mailnews/base/src/nsNewMailnewsURI.cpp
rename : mailnews/base/util/nsNewMailnewsURI.h => mailnews/base/src/nsNewMailnewsURI.h
rename : mailnews/base/util/nsStopwatch.cpp => mailnews/base/src/nsStopwatch.cpp
rename : mailnews/base/util/nsStopwatch.h => mailnews/base/src/nsStopwatch.h
extra : moz-landing-system : lando

mail/base/content/msgMail3PaneWindow.js

@@ -5,7 +5,7 @@
 
 /* import-globals-from ../../../../toolkit/modules/PageMenu.jsm */
 /* import-globals-from ../../../mailnews/base/prefs/content/accountUtils.js */
-/* import-globals-from ../../../mailnews/base/util/MailnewsMigrator.jsm */
+/* import-globals-from ../../../mailnews/base/src/MailnewsMigrator.jsm */
 /* import-globals-from ../../components/customizableui/content/panelUI.js */
 /* import-globals-from ../../components/newmailaccount/content/accountProvisionerTab.js */
 /* import-globals-from ../../components/preferences/preferencesTab.js */

mailnews/base/moz.build

@@ -6,7 +6,6 @@
 DIRS += [
     'public',
     'src',
-    'util',
 ]
 
 TEST_DIRS += ['test']

mailnews/base/src/moz.build

@@ -4,7 +4,28 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXPORTS += [
+    'nsImapMoveCoalescer.h',
     'nsMailDirServiceDefs.h',
+    'nsMsgCompressIStream.h',
+    'nsMsgCompressOStream.h',
+    'nsMsgDBFolder.h',
+    'nsMsgI18N.h',
+    'nsMsgIdentity.h',
+    'nsMsgIncomingServer.h',
+    'nsMsgKeyArray.h',
+    'nsMsgKeySet.h',
+    'nsMsgLineBuffer.h',
+    'nsMsgMailNewsUrl.h',
+    'nsMsgProtocol.h',
+    'nsMsgReadStateTxn.h',
+    'nsMsgTxn.h',
+    'nsMsgUtils.h',
+    'nsNewMailnewsURI.h',
+]
+
+EXPORTS.mozilla.mailnews += [
+    'ServiceList.h',
+    'Services.h',
 ]
 
 SOURCES += [
@@ -12,6 +33,7 @@ SOURCES += [
     'MailnewsLoadContextInfo.cpp',
     'nsCidProtocolHandler.cpp',
     'nsCopyMessageStreamListener.cpp',
+    'nsImapMoveCoalescer.cpp',
     'nsMailDirProvider.cpp',
     'nsMessenger.cpp',
     'nsMessengerBootstrap.cpp',
@@ -19,31 +41,49 @@ SOURCES += [
     'nsMsgAccount.cpp',
     'nsMsgAccountManager.cpp',
     'nsMsgBiffManager.cpp',
+    'nsMsgCompressIStream.cpp',
+    'nsMsgCompressOStream.cpp',
     'nsMsgContentPolicy.cpp',
     'nsMsgCopyService.cpp',
+    'nsMsgDBFolder.cpp',
     'nsMsgDBView.cpp',
+    'nsMsgFileStream.cpp',
     'nsMsgFolderCache.cpp',
     'nsMsgFolderCacheElement.cpp',
     'nsMsgFolderCompactor.cpp',
     'nsMsgFolderNotificationService.cpp',
     'nsMsgGroupThread.cpp',
     'nsMsgGroupView.cpp',
+    'nsMsgI18N.cpp',
+    'nsMsgIdentity.cpp',
+    'nsMsgIncomingServer.cpp',
+    'nsMsgKeyArray.cpp',
+    'nsMsgKeySet.cpp',
+    'nsMsgLineBuffer.cpp',
+    'nsMsgMailNewsUrl.cpp',
     'nsMsgMailSession.cpp',
     'nsMsgOfflineManager.cpp',
     'nsMsgProgress.cpp',
+    'nsMsgProtocol.cpp',
     'nsMsgPurgeService.cpp',
     'nsMsgQuickSearchDBView.cpp',
+    'nsMsgReadStateTxn.cpp',
     'nsMsgSearchDBView.cpp',
     'nsMsgSpecialViews.cpp',
     'nsMsgStatusFeedback.cpp',
     'nsMsgTagService.cpp',
     'nsMsgThreadedDBView.cpp',
+    'nsMsgTxn.cpp',
+    'nsMsgUtils.cpp',
     'nsMsgWindow.cpp',
     'nsMsgXFViewThread.cpp',
     'nsMsgXFVirtualFolderDBView.cpp',
+    'nsNewMailnewsURI.cpp',
     'nsSpamSettings.cpp',
     'nsStatusBarBiffManager.cpp',
-    'nsSubscribableServer.cpp'
+    'nsStopwatch.cpp',
+    'nsSubscribableServer.cpp',
+    'Services.cpp',
 ]
 
 if CONFIG['NS_PRINTING']:
@@ -58,15 +98,33 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     SOURCES += ['nsMessengerOSXIntegration.mm']
 
 EXTRA_JS_MODULES += [
+    'ABQueryUtils.jsm',
+    'converterWorker.js',
+    'ErrUtils.jsm',
     'FolderLookupService.jsm',
+    'folderUtils.jsm',
+    'hostnameUtils.jsm',
+    'IOUtils.jsm',
+    'iteratorUtils.jsm',
+    'JsTreeSelection.jsm',
+    'JXON.jsm',
     'MailNewsCommandLineHandler.jsm',
+    'MailnewsMigrator.jsm',
     'MailNotificationService.jsm',
+    'MailServices.jsm',
+    'mailstoreConverter.jsm',
     'MsgAsyncPrompter.jsm',
+    'MsgDBCacheManager.jsm',
+    'OAuth2.jsm',
     'OAuth2Module.jsm',
+    'OAuth2Providers.jsm',
+    'TemplateUtils.jsm',
+    'TraceHelper.jsm',
     'VirtualFolderWrapper.jsm',
 ]
 LOCAL_INCLUDES += [
   '/%s/dom/base' % CONFIG['mozreltopsrcdir'],
+  '/%s/netwerk/base' % CONFIG['mozreltopsrcdir']
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')

mailnews/base/util/moz.build

@@ -1,80 +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/.
-
-EXPORTS += [
-    'nsImapMoveCoalescer.h',
-    'nsMsgCompressIStream.h',
-    'nsMsgCompressOStream.h',
-    'nsMsgDBFolder.h',
-    'nsMsgI18N.h',
-    'nsMsgIdentity.h',
-    'nsMsgIncomingServer.h',
-    'nsMsgKeyArray.h',
-    'nsMsgKeySet.h',
-    'nsMsgLineBuffer.h',
-    'nsMsgMailNewsUrl.h',
-    'nsMsgProtocol.h',
-    'nsMsgReadStateTxn.h',
-    'nsMsgTxn.h',
-    'nsMsgUtils.h',
-    'nsNewMailnewsURI.h',
-]
-
-EXPORTS.mozilla.mailnews += [
-    'ServiceList.h',
-    'Services.h',
-]
-
-SOURCES += [
-    'nsImapMoveCoalescer.cpp',
-    'nsMsgCompressIStream.cpp',
-    'nsMsgCompressOStream.cpp',
-    'nsMsgDBFolder.cpp',
-    'nsMsgFileStream.cpp',
-    'nsMsgI18N.cpp',
-    'nsMsgIdentity.cpp',
-    'nsMsgIncomingServer.cpp',
-    'nsMsgKeyArray.cpp',
-    'nsMsgKeySet.cpp',
-    'nsMsgLineBuffer.cpp',
-    'nsMsgMailNewsUrl.cpp',
-    'nsMsgProtocol.cpp',
-    'nsMsgReadStateTxn.cpp',
-    'nsMsgTxn.cpp',
-    'nsMsgUtils.cpp',
-    'nsNewMailnewsURI.cpp',
-    'nsStopwatch.cpp',
-    'Services.cpp',
-]
-
-EXTRA_JS_MODULES += [
-    'ABQueryUtils.jsm',
-    'converterWorker.js',
-    'ErrUtils.jsm',
-    'folderUtils.jsm',
-    'hostnameUtils.jsm',
-    'IOUtils.jsm',
-    'iteratorUtils.jsm',
-    'JsTreeSelection.jsm',
-    'JXON.jsm',
-    'MailnewsMigrator.jsm',
-    'MailServices.jsm',
-    'mailstoreConverter.jsm',
-    'MsgDBCacheManager.jsm',
-    'OAuth2.jsm',
-    'OAuth2Providers.jsm',
-    'TemplateUtils.jsm',
-    'TraceHelper.jsm',
-]
-
-LOCAL_INCLUDES += [
-  '/%s/netwerk/base' % CONFIG['mozreltopsrcdir']
-]
-
-FINAL_LIBRARY = 'mail'
-
-Library('msgbsutl_s')
-
-DEFINES['_IMPL_NS_MSG_BASE'] = True

mailnews/build/moz.build

@@ -34,7 +34,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
 LOCAL_INCLUDES += [
     '../addrbook/src',
     '../base/src',
-    '../base/util',
     '../compose/src',
     '../extensions/bayesian-spam-filter',
     '../extensions/fts3',

mailnews/imap/test/moz.build

@@ -6,7 +6,7 @@
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 LOCAL_INCLUDES += [
-   '../../base/util',
+   '../../base/src',
    '../src',
    '/%s/xpcom/tests' % CONFIG['mozreltopsrcdir'],
 ]

mailnews/intl/nsCharsetConverterManager.cpp

@@ -14,7 +14,7 @@
 
 #include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
-#include "../base/util/nsMsgI18N.h"
+#include "../base/src/nsMsgI18N.h"
 
 // just for CONTRACTIDs
 #include "nsCharsetConverterManager.h"