summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-04-23 14:44:40 -0400
committerMatt A. Tobin <email@mattatobin.com>2019-04-23 14:44:40 -0400
commit63295d0087eb58a6eb34cad324c4c53d1b220491 (patch)
treebf5471c5eb5ac35cd81659a903bc33c3259136cb
parent0c84220a4f93a3e4f48d8d183aa0f5d8b15eb7ab (diff)
downloadUXP-63295d0087eb58a6eb34cad324c4c53d1b220491.tar
UXP-63295d0087eb58a6eb34cad324c4c53d1b220491.tar.gz
UXP-63295d0087eb58a6eb34cad324c4c53d1b220491.tar.lz
UXP-63295d0087eb58a6eb34cad324c4c53d1b220491.tar.xz
UXP-63295d0087eb58a6eb34cad324c4c53d1b220491.zip
Sort out search service
The ESR52 implementation is now Basilisk specific and the older implementation is the shared toolkit one
-rw-r--r--application/basilisk/components/search/moz.build2
-rw-r--r--application/basilisk/components/search/service/SearchStaticData.jsm (renamed from toolkit/components/search/current/SearchStaticData.jsm)0
-rw-r--r--application/basilisk/components/search/service/SearchSuggestionController.jsm (renamed from toolkit/components/search/current/SearchSuggestionController.jsm)0
-rw-r--r--application/basilisk/components/search/service/moz.build (renamed from toolkit/components/search/orginal/moz.build)19
-rw-r--r--application/basilisk/components/search/service/nsSearchService.js (renamed from toolkit/components/search/current/nsSearchService.js)0
-rw-r--r--application/basilisk/components/search/service/nsSearchSuggestions.js (renamed from toolkit/components/search/current/nsSearchSuggestions.js)0
-rw-r--r--application/basilisk/components/search/service/nsSidebar.js (renamed from toolkit/components/search/current/nsSidebar.js)0
-rw-r--r--application/basilisk/components/search/service/toolkitsearch.manifest (renamed from toolkit/components/search/current/toolkitsearch.manifest)0
-rw-r--r--toolkit/components/moz.build4
-rw-r--r--toolkit/components/search/SearchStaticData.jsm (renamed from toolkit/components/search/orginal/SearchStaticData.jsm)0
-rw-r--r--toolkit/components/search/SearchSuggestionController.jsm (renamed from toolkit/components/search/orginal/SearchSuggestionController.jsm)0
-rw-r--r--toolkit/components/search/current/moz.build31
-rw-r--r--toolkit/components/search/moz.build20
-rw-r--r--toolkit/components/search/nsSearchService.js (renamed from toolkit/components/search/orginal/nsSearchService.js)2
-rw-r--r--toolkit/components/search/nsSearchSuggestions.js (renamed from toolkit/components/search/orginal/nsSearchSuggestions.js)0
-rw-r--r--toolkit/components/search/nsSidebar.js (renamed from toolkit/components/search/orginal/nsSidebar.js)0
-rw-r--r--toolkit/components/search/toolkitsearch.manifest (renamed from toolkit/components/search/orginal/toolkitsearch.manifest)0
17 files changed, 28 insertions, 50 deletions
diff --git a/application/basilisk/components/search/moz.build b/application/basilisk/components/search/moz.build
index aac3a838c..b406d5f16 100644
--- a/application/basilisk/components/search/moz.build
+++ b/application/basilisk/components/search/moz.build
@@ -4,4 +4,6 @@
# 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 += ['service']
+
JAR_MANIFESTS += ['jar.mn']
diff --git a/toolkit/components/search/current/SearchStaticData.jsm b/application/basilisk/components/search/service/SearchStaticData.jsm
index de2be695c..de2be695c 100644
--- a/toolkit/components/search/current/SearchStaticData.jsm
+++ b/application/basilisk/components/search/service/SearchStaticData.jsm
diff --git a/toolkit/components/search/current/SearchSuggestionController.jsm b/application/basilisk/components/search/service/SearchSuggestionController.jsm
index 952838c0c..952838c0c 100644
--- a/toolkit/components/search/current/SearchSuggestionController.jsm
+++ b/application/basilisk/components/search/service/SearchSuggestionController.jsm
diff --git a/toolkit/components/search/orginal/moz.build b/application/basilisk/components/search/service/moz.build
index 4ca679087..423faeffd 100644
--- a/toolkit/components/search/orginal/moz.build
+++ b/application/basilisk/components/search/service/moz.build
@@ -4,28 +4,21 @@
# 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',
-]
+DIST_SUBDIR = ''
-EXTRA_PP_COMPONENTS += [
- 'nsSearchService.js',
-]
+DEFINES['HAVE_SIDEBAR'] = True
-if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
- DEFINES['HAVE_SIDEBAR'] = True
- EXTRA_COMPONENTS += [
+EXTRA_COMPONENTS += [
+ 'nsSearchSuggestions.js',
'nsSidebar.js',
- ]
-
-EXTRA_JS_MODULES += [
- 'SearchSuggestionController.jsm',
]
EXTRA_PP_COMPONENTS += [
+ 'nsSearchService.js',
'toolkitsearch.manifest',
]
EXTRA_JS_MODULES += [
'SearchStaticData.jsm',
+ 'SearchSuggestionController.jsm',
]
diff --git a/toolkit/components/search/current/nsSearchService.js b/application/basilisk/components/search/service/nsSearchService.js
index 2ea9384f5..2ea9384f5 100644
--- a/toolkit/components/search/current/nsSearchService.js
+++ b/application/basilisk/components/search/service/nsSearchService.js
diff --git a/toolkit/components/search/current/nsSearchSuggestions.js b/application/basilisk/components/search/service/nsSearchSuggestions.js
index a05d8b4b4..a05d8b4b4 100644
--- a/toolkit/components/search/current/nsSearchSuggestions.js
+++ b/application/basilisk/components/search/service/nsSearchSuggestions.js
diff --git a/toolkit/components/search/current/nsSidebar.js b/application/basilisk/components/search/service/nsSidebar.js
index 63976cba7..63976cba7 100644
--- a/toolkit/components/search/current/nsSidebar.js
+++ b/application/basilisk/components/search/service/nsSidebar.js
diff --git a/toolkit/components/search/current/toolkitsearch.manifest b/application/basilisk/components/search/service/toolkitsearch.manifest
index b7c55da0e..b7c55da0e 100644
--- a/toolkit/components/search/current/toolkitsearch.manifest
+++ b/application/basilisk/components/search/service/toolkitsearch.manifest
diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index 7173ca4e7..3f17bfb6d 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -86,7 +86,9 @@ if CONFIG['MOZ_XUL']:
if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
DIRS += ['filepicker']
-if CONFIG['MOZ_TOOLKIT_SEARCH']:
+if CONFIG['MOZ_TOOLKIT_SEARCH'] and not CONFIG['MC_BASILISK'] \
+ and not CONFIG['HYPE_ICEWEASEL'] \
+ and not CONFIG['HYPE_ICEDOVE']:
DIRS += ['search']
if CONFIG['MOZ_URL_CLASSIFIER']:
diff --git a/toolkit/components/search/orginal/SearchStaticData.jsm b/toolkit/components/search/SearchStaticData.jsm
index de2be695c..de2be695c 100644
--- a/toolkit/components/search/orginal/SearchStaticData.jsm
+++ b/toolkit/components/search/SearchStaticData.jsm
diff --git a/toolkit/components/search/orginal/SearchSuggestionController.jsm b/toolkit/components/search/SearchSuggestionController.jsm
index 0858974bf..0858974bf 100644
--- a/toolkit/components/search/orginal/SearchSuggestionController.jsm
+++ b/toolkit/components/search/SearchSuggestionController.jsm
diff --git a/toolkit/components/search/current/moz.build b/toolkit/components/search/current/moz.build
deleted file mode 100644
index 4ca679087..000000000
--- a/toolkit/components/search/current/moz.build
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- 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/moz.build b/toolkit/components/search/moz.build
index e19e70f18..2f8b3e54c 100644
--- a/toolkit/components/search/moz.build
+++ b/toolkit/components/search/moz.build
@@ -4,7 +4,19 @@
# 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['MC_BASILISK'] or CONFIG['HYPE_ICEWEASEL'] or CONFIG['HYPE_ICEDOVE']:
- DIRS += ['current']
-else:
- DIRS += ['orginal']
+EXTRA_COMPONENTS += ['nsSearchSuggestions.js']
+
+EXTRA_PP_COMPONENTS += [
+ 'nsSearchService.js',
+ 'toolkitsearch.manifest',
+]
+
+if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
+ DEFINES['HAVE_SIDEBAR'] = True
+ EXTRA_COMPONENTS += ['nsSidebar.js']
+
+EXTRA_JS_MODULES += [
+ 'SearchStaticData.jsm',
+ 'SearchSuggestionController.jsm',
+]
+
diff --git a/toolkit/components/search/orginal/nsSearchService.js b/toolkit/components/search/nsSearchService.js
index 760f13e72..82f8d155a 100644
--- a/toolkit/components/search/orginal/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -4556,4 +4556,4 @@ var engineUpdateService = {
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SearchService]);
-#include ../../../../toolkit/modules/debug.js
+#include ../../../toolkit/modules/debug.js
diff --git a/toolkit/components/search/orginal/nsSearchSuggestions.js b/toolkit/components/search/nsSearchSuggestions.js
index a05d8b4b4..a05d8b4b4 100644
--- a/toolkit/components/search/orginal/nsSearchSuggestions.js
+++ b/toolkit/components/search/nsSearchSuggestions.js
diff --git a/toolkit/components/search/orginal/nsSidebar.js b/toolkit/components/search/nsSidebar.js
index deb455734..deb455734 100644
--- a/toolkit/components/search/orginal/nsSidebar.js
+++ b/toolkit/components/search/nsSidebar.js
diff --git a/toolkit/components/search/orginal/toolkitsearch.manifest b/toolkit/components/search/toolkitsearch.manifest
index b7c55da0e..b7c55da0e 100644
--- a/toolkit/components/search/orginal/toolkitsearch.manifest
+++ b/toolkit/components/search/toolkitsearch.manifest