[mq]: move-search draft
authorJoshua Cranmer <Pidgeot18@gmail.com>
Sun, 10 Jan 2016 16:21:00 -0600
changeset 33618 a4dc8bdc03c4a7e07c8805ff8b463ccb7d2d926c
parent 33617 26c44198ea8106d66f1d910e09018bb717c04c25
child 33619 cc866c14f588f9b453d1320a6fc493d54dbeeb84
push id2871
push userPidgeot18@gmail.com
push dateFri, 15 Jan 2016 05:54:08 +0000
treeherdertry-comm-central@11014e10b0f6 [default view] [failures only]
[mq]: move-search
mailnews/base/moz.build
mailnews/base/search/content/CustomHeaders.js
mailnews/base/search/content/CustomHeaders.xul
mailnews/base/search/content/FilterEditor.js
mailnews/base/search/content/FilterEditor.xul
mailnews/base/search/content/searchTermOverlay.js
mailnews/base/search/content/searchTermOverlay.xul
mailnews/base/search/content/searchWidgets.xml
mailnews/base/search/content/viewLog.js
mailnews/base/search/content/viewLog.xul
mailnews/base/search/public/moz.build
mailnews/base/search/public/nsIMsgFilter.idl
mailnews/base/search/public/nsIMsgFilterCustomAction.idl
mailnews/base/search/public/nsIMsgFilterHitNotify.idl
mailnews/base/search/public/nsIMsgFilterList.idl
mailnews/base/search/public/nsIMsgFilterPlugin.idl
mailnews/base/search/public/nsIMsgFilterService.idl
mailnews/base/search/public/nsIMsgOperationListener.idl
mailnews/base/search/public/nsIMsgSearchAdapter.idl
mailnews/base/search/public/nsIMsgSearchCustomTerm.idl
mailnews/base/search/public/nsIMsgSearchNotify.idl
mailnews/base/search/public/nsIMsgSearchScopeTerm.idl
mailnews/base/search/public/nsIMsgSearchSession.idl
mailnews/base/search/public/nsIMsgSearchTerm.idl
mailnews/base/search/public/nsIMsgSearchValidityManager.idl
mailnews/base/search/public/nsIMsgSearchValidityTable.idl
mailnews/base/search/public/nsIMsgSearchValue.idl
mailnews/base/search/public/nsIMsgTraitService.idl
mailnews/base/search/public/nsMsgBodyHandler.h
mailnews/base/search/public/nsMsgFilterCore.idl
mailnews/base/search/public/nsMsgResultElement.h
mailnews/base/search/public/nsMsgSearchAdapter.h
mailnews/base/search/public/nsMsgSearchBoolExpression.h
mailnews/base/search/public/nsMsgSearchCore.idl
mailnews/base/search/public/nsMsgSearchScopeTerm.h
mailnews/base/search/public/nsMsgSearchTerm.h
mailnews/base/search/src/Bogofilter.sfd
mailnews/base/search/src/DSPAM.sfd
mailnews/base/search/src/Habeas.sfd
mailnews/base/search/src/POPFile.sfd
mailnews/base/search/src/SpamAssassin.sfd
mailnews/base/search/src/SpamCatcher.sfd
mailnews/base/search/src/SpamPal.sfd
mailnews/base/search/src/moz.build
mailnews/base/search/src/nsMsgBodyHandler.cpp
mailnews/base/search/src/nsMsgFilter.cpp
mailnews/base/search/src/nsMsgFilter.h
mailnews/base/search/src/nsMsgFilterList.cpp
mailnews/base/search/src/nsMsgFilterList.h
mailnews/base/search/src/nsMsgFilterService.cpp
mailnews/base/search/src/nsMsgFilterService.h
mailnews/base/search/src/nsMsgImapSearch.cpp
mailnews/base/search/src/nsMsgLocalSearch.cpp
mailnews/base/search/src/nsMsgLocalSearch.h
mailnews/base/search/src/nsMsgSearchAdapter.cpp
mailnews/base/search/src/nsMsgSearchImap.h
mailnews/base/search/src/nsMsgSearchNews.cpp
mailnews/base/search/src/nsMsgSearchNews.h
mailnews/base/search/src/nsMsgSearchSession.cpp
mailnews/base/search/src/nsMsgSearchSession.h
mailnews/base/search/src/nsMsgSearchTerm.cpp
mailnews/base/search/src/nsMsgSearchValue.cpp
mailnews/base/search/src/nsMsgSearchValue.h
mailnews/base/search/src/nsMsgTraitService.js
mailnews/base/search/src/nsMsgTraitService.manifest
mailnews/build/moz.build
mailnews/jar.mn
mailnews/moz.build
mailnews/search/content/CustomHeaders.js
mailnews/search/content/CustomHeaders.xul
mailnews/search/content/FilterEditor.js
mailnews/search/content/FilterEditor.xul
mailnews/search/content/searchTermOverlay.js
mailnews/search/content/searchTermOverlay.xul
mailnews/search/content/searchWidgets.xml
mailnews/search/content/viewLog.js
mailnews/search/content/viewLog.xul
mailnews/search/public/moz.build
mailnews/search/public/nsIMsgFilter.idl
mailnews/search/public/nsIMsgFilterCustomAction.idl
mailnews/search/public/nsIMsgFilterHitNotify.idl
mailnews/search/public/nsIMsgFilterList.idl
mailnews/search/public/nsIMsgFilterPlugin.idl
mailnews/search/public/nsIMsgFilterService.idl
mailnews/search/public/nsIMsgOperationListener.idl
mailnews/search/public/nsIMsgSearchAdapter.idl
mailnews/search/public/nsIMsgSearchCustomTerm.idl
mailnews/search/public/nsIMsgSearchNotify.idl
mailnews/search/public/nsIMsgSearchScopeTerm.idl
mailnews/search/public/nsIMsgSearchSession.idl
mailnews/search/public/nsIMsgSearchTerm.idl
mailnews/search/public/nsIMsgSearchValidityManager.idl
mailnews/search/public/nsIMsgSearchValidityTable.idl
mailnews/search/public/nsIMsgSearchValue.idl
mailnews/search/public/nsIMsgTraitService.idl
mailnews/search/public/nsMsgBodyHandler.h
mailnews/search/public/nsMsgFilterCore.idl
mailnews/search/public/nsMsgResultElement.h
mailnews/search/public/nsMsgSearchAdapter.h
mailnews/search/public/nsMsgSearchBoolExpression.h
mailnews/search/public/nsMsgSearchCore.idl
mailnews/search/public/nsMsgSearchScopeTerm.h
mailnews/search/public/nsMsgSearchTerm.h
mailnews/search/src/Bogofilter.sfd
mailnews/search/src/DSPAM.sfd
mailnews/search/src/Habeas.sfd
mailnews/search/src/POPFile.sfd
mailnews/search/src/SpamAssassin.sfd
mailnews/search/src/SpamCatcher.sfd
mailnews/search/src/SpamPal.sfd
mailnews/search/src/moz.build
mailnews/search/src/nsMsgBodyHandler.cpp
mailnews/search/src/nsMsgFilter.cpp
mailnews/search/src/nsMsgFilter.h
mailnews/search/src/nsMsgFilterList.cpp
mailnews/search/src/nsMsgFilterList.h
mailnews/search/src/nsMsgFilterService.cpp
mailnews/search/src/nsMsgFilterService.h
mailnews/search/src/nsMsgImapSearch.cpp
mailnews/search/src/nsMsgLocalSearch.cpp
mailnews/search/src/nsMsgLocalSearch.h
mailnews/search/src/nsMsgSearchAdapter.cpp
mailnews/search/src/nsMsgSearchImap.h
mailnews/search/src/nsMsgSearchNews.cpp
mailnews/search/src/nsMsgSearchNews.h
mailnews/search/src/nsMsgSearchSession.cpp
mailnews/search/src/nsMsgSearchSession.h
mailnews/search/src/nsMsgSearchTerm.cpp
mailnews/search/src/nsMsgSearchValue.cpp
mailnews/search/src/nsMsgSearchValue.h
mailnews/search/src/nsMsgTraitService.js
mailnews/search/src/nsMsgTraitService.manifest
--- a/mailnews/base/moz.build
+++ b/mailnews/base/moz.build
@@ -3,13 +3,11 @@
 # 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',
     'src',
     'util',
     'ispdata',
-    'search/public',
-    'search/src',
 ]
 
 TEST_DIRS += ['test']
--- a/mailnews/build/moz.build
+++ b/mailnews/build/moz.build
@@ -37,27 +37,27 @@ else:
     OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     OS_LIBS += CONFIG['TK_LIBS']
     OS_LIBS += ['-framework Cocoa']
 
 LOCAL_INCLUDES += [
     '/mailnews/addrbook/src',
-    '/mailnews/base/search/src',
     '/mailnews/base/src',
     '/mailnews/base/util',
     '/mailnews/compose/src',
     '/mailnews/extensions/bayesian-spam-filter/src',
     '/mailnews/extensions/fts3/src',
     '/mailnews/extensions/mailviews/src',
     '/mailnews/extensions/mdn/src',
     '/mailnews/extensions/smime/src',
     '/mailnews/imap/src',
     '/mailnews/intl',
     '/mailnews/local/src',
     '/mailnews/mime/emitters',
     '/mailnews/mime/src',
     '/mailnews/news/src',
+    '/mailnews/search/src',
 ]
 
 if CONFIG['MOZ_LDAP_XPCOM']:
     DEFINES['MOZ_LDAP_XPCOM'] = True
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -98,25 +98,25 @@ messenger.jar:
     content/messenger/virtualFolderListDialog.xul                              (base/content/virtualFolderListDialog.xul)
     content/messenger/virtualFolderListDialog.js                               (base/content/virtualFolderListDialog.js)
     content/messenger/msgPrintEngine.js                                        (base/content/msgPrintEngine.js)
 *   content/messenger/junkMailInfo.xul                                         (base/content/junkMailInfo.xul)
     content/messenger/junkCommands.js                                          (base/content/junkCommands.js)
     content/messenger/junkLog.xul                                              (base/content/junkLog.xul)
     content/messenger/junkLog.js                                               (base/content/junkLog.js)
     content/messenger/jsTreeView.js                                            (base/content/jsTreeView.js)
-    content/messenger/searchTermOverlay.js                                     (base/search/content/searchTermOverlay.js)
-    content/messenger/searchTermOverlay.xul                                    (base/search/content/searchTermOverlay.xul)
-    content/messenger/CustomHeaders.xul                                        (base/search/content/CustomHeaders.xul)
-    content/messenger/CustomHeaders.js                                         (base/search/content/CustomHeaders.js)
-    content/messenger/FilterEditor.xul                                         (base/search/content/FilterEditor.xul)
-    content/messenger/FilterEditor.js                                          (base/search/content/FilterEditor.js)
-    content/messenger/searchWidgets.xml                                        (base/search/content/searchWidgets.xml)
-    content/messenger/viewLog.xul                                              (base/search/content/viewLog.xul)
-    content/messenger/viewLog.js                                               (base/search/content/viewLog.js)
+    content/messenger/searchTermOverlay.js                                     (search/content/searchTermOverlay.js)
+    content/messenger/searchTermOverlay.xul                                    (search/content/searchTermOverlay.xul)
+    content/messenger/CustomHeaders.xul                                        (search/content/CustomHeaders.xul)
+    content/messenger/CustomHeaders.js                                         (search/content/CustomHeaders.js)
+    content/messenger/FilterEditor.xul                                         (search/content/FilterEditor.xul)
+    content/messenger/FilterEditor.js                                          (search/content/FilterEditor.js)
+    content/messenger/searchWidgets.xml                                        (search/content/searchWidgets.xml)
+    content/messenger/viewLog.xul                                              (search/content/viewLog.xul)
+    content/messenger/viewLog.js                                               (search/content/viewLog.js)
     content/messenger/messengercompose/askSendFormat.js                        (compose/content/askSendFormat.js)
     content/messenger/messengercompose/askSendFormat.xul                       (compose/content/askSendFormat.xul)
     content/messenger/messengercompose/sendProgress.xul                        (compose/content/sendProgress.xul)
     content/messenger/messengercompose/sendProgress.js                         (compose/content/sendProgress.js)
     content/messenger/messengercompose/mailComposeEditorOverlay.xul            (compose/content/mailComposeEditorOverlay.xul)
     content/messenger/messengercompose/menulistCompactBindings.xml             (compose/content/menulistCompactBindings.xml)
 *   content/messenger/importDialog.js                                          (import/content/importDialog.js)
 *   content/messenger/importDialog.xul                                         (import/content/importDialog.xul)
--- a/mailnews/moz.build
+++ b/mailnews/moz.build
@@ -17,16 +17,18 @@ DIRS += [
     'import/src',
     'import/text/src',
     'import/vcard/src',
     'intl',
     'local/public',
     'local/src',
     'mime',
     'news',
+    'search/public',
+    'search/src',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     DIRS += [
         'import/eudora/src',
         'import/applemail/src',
     ]
 
rename from mailnews/base/search/content/CustomHeaders.js
rename to mailnews/search/content/CustomHeaders.js
rename from mailnews/base/search/content/CustomHeaders.xul
rename to mailnews/search/content/CustomHeaders.xul
rename from mailnews/base/search/content/FilterEditor.js
rename to mailnews/search/content/FilterEditor.js
rename from mailnews/base/search/content/FilterEditor.xul
rename to mailnews/search/content/FilterEditor.xul
rename from mailnews/base/search/content/searchTermOverlay.js
rename to mailnews/search/content/searchTermOverlay.js
rename from mailnews/base/search/content/searchTermOverlay.xul
rename to mailnews/search/content/searchTermOverlay.xul
rename from mailnews/base/search/content/searchWidgets.xml
rename to mailnews/search/content/searchWidgets.xml
rename from mailnews/base/search/content/viewLog.js
rename to mailnews/search/content/viewLog.js
rename from mailnews/base/search/content/viewLog.xul
rename to mailnews/search/content/viewLog.xul
rename from mailnews/base/search/public/moz.build
rename to mailnews/search/public/moz.build
rename from mailnews/base/search/public/nsIMsgFilter.idl
rename to mailnews/search/public/nsIMsgFilter.idl
rename from mailnews/base/search/public/nsIMsgFilterCustomAction.idl
rename to mailnews/search/public/nsIMsgFilterCustomAction.idl
rename from mailnews/base/search/public/nsIMsgFilterHitNotify.idl
rename to mailnews/search/public/nsIMsgFilterHitNotify.idl
rename from mailnews/base/search/public/nsIMsgFilterList.idl
rename to mailnews/search/public/nsIMsgFilterList.idl
rename from mailnews/base/search/public/nsIMsgFilterPlugin.idl
rename to mailnews/search/public/nsIMsgFilterPlugin.idl
rename from mailnews/base/search/public/nsIMsgFilterService.idl
rename to mailnews/search/public/nsIMsgFilterService.idl
rename from mailnews/base/search/public/nsIMsgOperationListener.idl
rename to mailnews/search/public/nsIMsgOperationListener.idl
rename from mailnews/base/search/public/nsIMsgSearchAdapter.idl
rename to mailnews/search/public/nsIMsgSearchAdapter.idl
rename from mailnews/base/search/public/nsIMsgSearchCustomTerm.idl
rename to mailnews/search/public/nsIMsgSearchCustomTerm.idl
rename from mailnews/base/search/public/nsIMsgSearchNotify.idl
rename to mailnews/search/public/nsIMsgSearchNotify.idl
rename from mailnews/base/search/public/nsIMsgSearchScopeTerm.idl
rename to mailnews/search/public/nsIMsgSearchScopeTerm.idl
rename from mailnews/base/search/public/nsIMsgSearchSession.idl
rename to mailnews/search/public/nsIMsgSearchSession.idl
rename from mailnews/base/search/public/nsIMsgSearchTerm.idl
rename to mailnews/search/public/nsIMsgSearchTerm.idl
rename from mailnews/base/search/public/nsIMsgSearchValidityManager.idl
rename to mailnews/search/public/nsIMsgSearchValidityManager.idl
rename from mailnews/base/search/public/nsIMsgSearchValidityTable.idl
rename to mailnews/search/public/nsIMsgSearchValidityTable.idl
rename from mailnews/base/search/public/nsIMsgSearchValue.idl
rename to mailnews/search/public/nsIMsgSearchValue.idl
rename from mailnews/base/search/public/nsIMsgTraitService.idl
rename to mailnews/search/public/nsIMsgTraitService.idl
rename from mailnews/base/search/public/nsMsgBodyHandler.h
rename to mailnews/search/public/nsMsgBodyHandler.h
rename from mailnews/base/search/public/nsMsgFilterCore.idl
rename to mailnews/search/public/nsMsgFilterCore.idl
rename from mailnews/base/search/public/nsMsgResultElement.h
rename to mailnews/search/public/nsMsgResultElement.h
rename from mailnews/base/search/public/nsMsgSearchAdapter.h
rename to mailnews/search/public/nsMsgSearchAdapter.h
rename from mailnews/base/search/public/nsMsgSearchBoolExpression.h
rename to mailnews/search/public/nsMsgSearchBoolExpression.h
rename from mailnews/base/search/public/nsMsgSearchCore.idl
rename to mailnews/search/public/nsMsgSearchCore.idl
rename from mailnews/base/search/public/nsMsgSearchScopeTerm.h
rename to mailnews/search/public/nsMsgSearchScopeTerm.h
rename from mailnews/base/search/public/nsMsgSearchTerm.h
rename to mailnews/search/public/nsMsgSearchTerm.h
rename from mailnews/base/search/src/Bogofilter.sfd
rename to mailnews/search/src/Bogofilter.sfd
rename from mailnews/base/search/src/DSPAM.sfd
rename to mailnews/search/src/DSPAM.sfd
rename from mailnews/base/search/src/Habeas.sfd
rename to mailnews/search/src/Habeas.sfd
rename from mailnews/base/search/src/POPFile.sfd
rename to mailnews/search/src/POPFile.sfd
rename from mailnews/base/search/src/SpamAssassin.sfd
rename to mailnews/search/src/SpamAssassin.sfd
rename from mailnews/base/search/src/SpamCatcher.sfd
rename to mailnews/search/src/SpamCatcher.sfd
rename from mailnews/base/search/src/SpamPal.sfd
rename to mailnews/search/src/SpamPal.sfd
rename from mailnews/base/search/src/moz.build
rename to mailnews/search/src/moz.build
rename from mailnews/base/search/src/nsMsgBodyHandler.cpp
rename to mailnews/search/src/nsMsgBodyHandler.cpp
rename from mailnews/base/search/src/nsMsgFilter.cpp
rename to mailnews/search/src/nsMsgFilter.cpp
rename from mailnews/base/search/src/nsMsgFilter.h
rename to mailnews/search/src/nsMsgFilter.h
rename from mailnews/base/search/src/nsMsgFilterList.cpp
rename to mailnews/search/src/nsMsgFilterList.cpp
rename from mailnews/base/search/src/nsMsgFilterList.h
rename to mailnews/search/src/nsMsgFilterList.h
rename from mailnews/base/search/src/nsMsgFilterService.cpp
rename to mailnews/search/src/nsMsgFilterService.cpp
rename from mailnews/base/search/src/nsMsgFilterService.h
rename to mailnews/search/src/nsMsgFilterService.h
rename from mailnews/base/search/src/nsMsgImapSearch.cpp
rename to mailnews/search/src/nsMsgImapSearch.cpp
rename from mailnews/base/search/src/nsMsgLocalSearch.cpp
rename to mailnews/search/src/nsMsgLocalSearch.cpp
rename from mailnews/base/search/src/nsMsgLocalSearch.h
rename to mailnews/search/src/nsMsgLocalSearch.h
rename from mailnews/base/search/src/nsMsgSearchAdapter.cpp
rename to mailnews/search/src/nsMsgSearchAdapter.cpp
rename from mailnews/base/search/src/nsMsgSearchImap.h
rename to mailnews/search/src/nsMsgSearchImap.h
rename from mailnews/base/search/src/nsMsgSearchNews.cpp
rename to mailnews/search/src/nsMsgSearchNews.cpp
rename from mailnews/base/search/src/nsMsgSearchNews.h
rename to mailnews/search/src/nsMsgSearchNews.h
rename from mailnews/base/search/src/nsMsgSearchSession.cpp
rename to mailnews/search/src/nsMsgSearchSession.cpp
rename from mailnews/base/search/src/nsMsgSearchSession.h
rename to mailnews/search/src/nsMsgSearchSession.h
rename from mailnews/base/search/src/nsMsgSearchTerm.cpp
rename to mailnews/search/src/nsMsgSearchTerm.cpp
rename from mailnews/base/search/src/nsMsgSearchValue.cpp
rename to mailnews/search/src/nsMsgSearchValue.cpp
rename from mailnews/base/search/src/nsMsgSearchValue.h
rename to mailnews/search/src/nsMsgSearchValue.h
rename from mailnews/base/search/src/nsMsgTraitService.js
rename to mailnews/search/src/nsMsgTraitService.js
rename from mailnews/base/search/src/nsMsgTraitService.manifest
rename to mailnews/search/src/nsMsgTraitService.manifest