summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-08-06 06:11:17 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-08-06 06:11:17 -0400
commit82eb8109c9f7b40ee76c7dc8788a159511900fe6 (patch)
tree1f5502989af89eefe561659b8bd82c63d2346ab0
parent3d1043672c38f2ec4155520e1e46ad162d6092b6 (diff)
downloadUXP-82eb8109c9f7b40ee76c7dc8788a159511900fe6.tar
UXP-82eb8109c9f7b40ee76c7dc8788a159511900fe6.tar.gz
UXP-82eb8109c9f7b40ee76c7dc8788a159511900fe6.tar.lz
UXP-82eb8109c9f7b40ee76c7dc8788a159511900fe6.tar.xz
UXP-82eb8109c9f7b40ee76c7dc8788a159511900fe6.zip
Move the "native" search service to a subdirectory
-rw-r--r--toolkit/components/search/current/SearchStaticData.jsm (renamed from toolkit/components/search/SearchStaticData.jsm)0
-rw-r--r--toolkit/components/search/current/SearchSuggestionController.jsm (renamed from toolkit/components/search/SearchSuggestionController.jsm)0
-rw-r--r--toolkit/components/search/current/moz.build31
-rw-r--r--toolkit/components/search/current/nsSearchService.js (renamed from toolkit/components/search/nsSearchService.js)0
-rw-r--r--toolkit/components/search/current/nsSearchSuggestions.js (renamed from toolkit/components/search/nsSearchSuggestions.js)0
-rw-r--r--toolkit/components/search/current/nsSidebar.js (renamed from toolkit/components/search/nsSidebar.js)0
-rw-r--r--toolkit/components/search/current/toolkitsearch.manifest (renamed from toolkit/components/search/toolkitsearch.manifest)0
-rw-r--r--toolkit/components/search/moz.build26
8 files changed, 33 insertions, 24 deletions
diff --git a/toolkit/components/search/SearchStaticData.jsm b/toolkit/components/search/current/SearchStaticData.jsm
index de2be695c..de2be695c 100644
--- a/toolkit/components/search/SearchStaticData.jsm
+++ b/toolkit/components/search/current/SearchStaticData.jsm
diff --git a/toolkit/components/search/SearchSuggestionController.jsm b/toolkit/components/search/current/SearchSuggestionController.jsm
index 952838c0c..952838c0c 100644
--- a/toolkit/components/search/SearchSuggestionController.jsm
+++ b/toolkit/components/search/current/SearchSuggestionController.jsm
diff --git a/toolkit/components/search/current/moz.build b/toolkit/components/search/current/moz.build
new file mode 100644
index 000000000..4ca679087
--- /dev/null
+++ b/toolkit/components/search/current/moz.build
@@ -0,0 +1,31 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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 += [
+ 'nsSearchSuggestions.js',
+]
+
+EXTRA_PP_COMPONENTS += [
+ 'nsSearchService.js',
+]
+
+if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
+ DEFINES['HAVE_SIDEBAR'] = True
+ EXTRA_COMPONENTS += [
+ 'nsSidebar.js',
+ ]
+
+EXTRA_JS_MODULES += [
+ 'SearchSuggestionController.jsm',
+]
+
+EXTRA_PP_COMPONENTS += [
+ 'toolkitsearch.manifest',
+]
+
+EXTRA_JS_MODULES += [
+ 'SearchStaticData.jsm',
+]
diff --git a/toolkit/components/search/nsSearchService.js b/toolkit/components/search/current/nsSearchService.js
index 9f9003516..9f9003516 100644
--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/current/nsSearchService.js
diff --git a/toolkit/components/search/nsSearchSuggestions.js b/toolkit/components/search/current/nsSearchSuggestions.js
index a05d8b4b4..a05d8b4b4 100644
--- a/toolkit/components/search/nsSearchSuggestions.js
+++ b/toolkit/components/search/current/nsSearchSuggestions.js
diff --git a/toolkit/components/search/nsSidebar.js b/toolkit/components/search/current/nsSidebar.js
index 63976cba7..63976cba7 100644
--- a/toolkit/components/search/nsSidebar.js
+++ b/toolkit/components/search/current/nsSidebar.js
diff --git a/toolkit/components/search/toolkitsearch.manifest b/toolkit/components/search/current/toolkitsearch.manifest
index b7c55da0e..b7c55da0e 100644
--- a/toolkit/components/search/toolkitsearch.manifest
+++ b/toolkit/components/search/current/toolkitsearch.manifest
diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build
index 0a2695152..739dc6ab8 100644
--- a/toolkit/components/search/moz.build
+++ b/toolkit/components/search/moz.build
@@ -6,30 +6,8 @@
XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
-EXTRA_COMPONENTS += [
- 'nsSearchSuggestions.js',
-]
-
-EXTRA_PP_COMPONENTS += [
- 'nsSearchService.js',
-]
-
-if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
- DEFINES['HAVE_SIDEBAR'] = True
- EXTRA_COMPONENTS += [
- 'nsSidebar.js',
- ]
-
-EXTRA_JS_MODULES += [
- 'SearchSuggestionController.jsm',
-]
-
-EXTRA_PP_COMPONENTS += [
- 'toolkitsearch.manifest',
-]
-
-EXTRA_JS_MODULES += [
- 'SearchStaticData.jsm',
+DIRS += [
+ 'current',
]
with Files('**'):