From 85045bf6bef02765bf895610df3938e9af000bb3 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Tue, 23 Apr 2019 14:44:40 -0400 Subject: [PATCH] Sort out search service The ESR52 implementation is now Basilisk specific and the older implementation is the shared toolkit one --- .../basilisk/components/search/moz.build | 2 ++ .../search/service}/SearchStaticData.jsm | 0 .../service}/SearchSuggestionController.jsm | 0 .../components/search/service}/moz.build | 19 ++++-------- .../search/service}/nsSearchService.js | 0 .../search/service}/nsSearchSuggestions.js | 0 .../components/search/service}/nsSidebar.js | 0 .../search/service}/toolkitsearch.manifest | 0 toolkit/components/moz.build | 4 ++- .../search/{orginal => }/SearchStaticData.jsm | 0 .../SearchSuggestionController.jsm | 0 toolkit/components/search/moz.build | 20 +++++++++--- .../search/{orginal => }/nsSearchService.js | 2 +- .../{orginal => }/nsSearchSuggestions.js | 0 .../search/{orginal => }/nsSidebar.js | 0 toolkit/components/search/orginal/moz.build | 31 ------------------- .../{orginal => }/toolkitsearch.manifest | 0 17 files changed, 28 insertions(+), 50 deletions(-) rename {toolkit/components/search/current => application/basilisk/components/search/service}/SearchStaticData.jsm (100%) rename {toolkit/components/search/current => application/basilisk/components/search/service}/SearchSuggestionController.jsm (100%) rename {toolkit/components/search/current => application/basilisk/components/search/service}/moz.build (73%) rename {toolkit/components/search/current => application/basilisk/components/search/service}/nsSearchService.js (100%) rename {toolkit/components/search/current => application/basilisk/components/search/service}/nsSearchSuggestions.js (100%) rename {toolkit/components/search/current => application/basilisk/components/search/service}/nsSidebar.js (100%) rename {toolkit/components/search/current => application/basilisk/components/search/service}/toolkitsearch.manifest (100%) rename toolkit/components/search/{orginal => }/SearchStaticData.jsm (100%) rename toolkit/components/search/{orginal => }/SearchSuggestionController.jsm (100%) rename toolkit/components/search/{orginal => }/nsSearchService.js (99%) rename toolkit/components/search/{orginal => }/nsSearchSuggestions.js (100%) rename toolkit/components/search/{orginal => }/nsSidebar.js (100%) delete mode 100644 toolkit/components/search/orginal/moz.build rename toolkit/components/search/{orginal => }/toolkitsearch.manifest (100%) diff --git a/application/basilisk/components/search/moz.build b/application/basilisk/components/search/moz.build index aac3a838c4..b406d5f16d 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 similarity index 100% rename from toolkit/components/search/current/SearchStaticData.jsm rename to application/basilisk/components/search/service/SearchStaticData.jsm diff --git a/toolkit/components/search/current/SearchSuggestionController.jsm b/application/basilisk/components/search/service/SearchSuggestionController.jsm similarity index 100% rename from toolkit/components/search/current/SearchSuggestionController.jsm rename to application/basilisk/components/search/service/SearchSuggestionController.jsm diff --git a/toolkit/components/search/current/moz.build b/application/basilisk/components/search/service/moz.build similarity index 73% rename from toolkit/components/search/current/moz.build rename to application/basilisk/components/search/service/moz.build index 4ca6790872..423faeffd5 100644 --- a/toolkit/components/search/current/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/. +DIST_SUBDIR = '' + +DEFINES['HAVE_SIDEBAR'] = True + EXTRA_COMPONENTS += [ 'nsSearchSuggestions.js', + 'nsSidebar.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', + 'SearchSuggestionController.jsm', ] diff --git a/toolkit/components/search/current/nsSearchService.js b/application/basilisk/components/search/service/nsSearchService.js similarity index 100% rename from toolkit/components/search/current/nsSearchService.js rename to application/basilisk/components/search/service/nsSearchService.js diff --git a/toolkit/components/search/current/nsSearchSuggestions.js b/application/basilisk/components/search/service/nsSearchSuggestions.js similarity index 100% rename from toolkit/components/search/current/nsSearchSuggestions.js rename to application/basilisk/components/search/service/nsSearchSuggestions.js diff --git a/toolkit/components/search/current/nsSidebar.js b/application/basilisk/components/search/service/nsSidebar.js similarity index 100% rename from toolkit/components/search/current/nsSidebar.js rename to application/basilisk/components/search/service/nsSidebar.js diff --git a/toolkit/components/search/current/toolkitsearch.manifest b/application/basilisk/components/search/service/toolkitsearch.manifest similarity index 100% rename from toolkit/components/search/current/toolkitsearch.manifest rename to application/basilisk/components/search/service/toolkitsearch.manifest diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build index 953e6c6e30..f5a44d1c8a 100644 --- a/toolkit/components/moz.build +++ b/toolkit/components/moz.build @@ -89,7 +89,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 similarity index 100% rename from toolkit/components/search/orginal/SearchStaticData.jsm rename to toolkit/components/search/SearchStaticData.jsm diff --git a/toolkit/components/search/orginal/SearchSuggestionController.jsm b/toolkit/components/search/SearchSuggestionController.jsm similarity index 100% rename from toolkit/components/search/orginal/SearchSuggestionController.jsm rename to toolkit/components/search/SearchSuggestionController.jsm diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build index e19e70f183..2f8b3e54c2 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 similarity index 99% rename from toolkit/components/search/orginal/nsSearchService.js rename to toolkit/components/search/nsSearchService.js index 760f13e72b..82f8d155a5 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 similarity index 100% rename from toolkit/components/search/orginal/nsSearchSuggestions.js rename to toolkit/components/search/nsSearchSuggestions.js diff --git a/toolkit/components/search/orginal/nsSidebar.js b/toolkit/components/search/nsSidebar.js similarity index 100% rename from toolkit/components/search/orginal/nsSidebar.js rename to toolkit/components/search/nsSidebar.js diff --git a/toolkit/components/search/orginal/moz.build b/toolkit/components/search/orginal/moz.build deleted file mode 100644 index 4ca6790872..0000000000 --- a/toolkit/components/search/orginal/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/orginal/toolkitsearch.manifest b/toolkit/components/search/toolkitsearch.manifest similarity index 100% rename from toolkit/components/search/orginal/toolkitsearch.manifest rename to toolkit/components/search/toolkitsearch.manifest