diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-06-04 13:17:38 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-06-04 13:17:38 +0200 |
commit | a1be17c1cea81ebb1e8b131a662c698d78f3f7f2 (patch) | |
tree | a92f7de513be600cc07bac458183e9af40e00c06 /browser/components/build | |
parent | bf11fdd304898ac675e39b01b280d39550e419d0 (diff) | |
download | UXP-a1be17c1cea81ebb1e8b131a662c698d78f3f7f2.tar UXP-a1be17c1cea81ebb1e8b131a662c698d78f3f7f2.tar.gz UXP-a1be17c1cea81ebb1e8b131a662c698d78f3f7f2.tar.lz UXP-a1be17c1cea81ebb1e8b131a662c698d78f3f7f2.tar.xz UXP-a1be17c1cea81ebb1e8b131a662c698d78f3f7f2.zip |
Issue #303 Part 1: Move basilisk files from /browser to /application/basilisk
Diffstat (limited to 'browser/components/build')
-rw-r--r-- | browser/components/build/Makefile.in | 8 | ||||
-rw-r--r-- | browser/components/build/moz.build | 42 | ||||
-rw-r--r-- | browser/components/build/nsBrowserCompsCID.h | 43 | ||||
-rw-r--r-- | browser/components/build/nsModule.cpp | 132 |
4 files changed, 0 insertions, 225 deletions
diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in deleted file mode 100644 index 2387227ab..000000000 --- a/browser/components/build/Makefile.in +++ /dev/null @@ -1,8 +0,0 @@ -# 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/. - -include $(topsrcdir)/config/rules.mk - -# Ensure that we don't embed a manifest referencing the CRT. -EMBED_MANIFEST_AT = diff --git a/browser/components/build/moz.build b/browser/components/build/moz.build deleted file mode 100644 index 622cf449c..000000000 --- a/browser/components/build/moz.build +++ /dev/null @@ -1,42 +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/. - -EXPORTS += [ - 'nsBrowserCompsCID.h', -] - -SOURCES += [ - 'nsModule.cpp', -] - -XPCOMBinaryComponent('browsercomps') - -LOCAL_INCLUDES += [ - '../about', - '../dirprovider', - '../feeds', - '../migration', - '../shell', -] - -if CONFIG['OS_ARCH'] == 'WINNT': - OS_LIBS += [ - 'esent', - 'netapi32', - 'ole32', - 'shell32', - 'shlwapi', - 'version', - ] - DELAYLOAD_DLLS += [ - 'esent.dll', - 'netapi32.dll', - ] - -# Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code) -# GTK2: Need to link with glib for GNOME shell service -if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'gtk2', 'gtk3'): - OS_LIBS += CONFIG['TK_LIBS'] diff --git a/browser/components/build/nsBrowserCompsCID.h b/browser/components/build/nsBrowserCompsCID.h deleted file mode 100644 index e325e43d4..000000000 --- a/browser/components/build/nsBrowserCompsCID.h +++ /dev/null @@ -1,43 +0,0 @@ -/* 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/. */ - -///////////////////////////////////////////////////////////////////////////// - -#ifdef XP_WIN -#define NS_WINIEHISTORYENUMERATOR_CID \ -{ 0x93480624, 0x806e, 0x4756, { 0xb7, 0xcb, 0x0f, 0xb7, 0xdd, 0x74, 0x6a, 0x8f } } - -#define NS_IEHISTORYENUMERATOR_CONTRACTID \ - "@mozilla.org/profile/migrator/iehistoryenumerator;1" -#endif - -#define NS_SHELLSERVICE_CID \ -{ 0x63c7b9f4, 0xcc8, 0x43f8, { 0xb6, 0x66, 0xa, 0x66, 0x16, 0x55, 0xcb, 0x73 } } - -#define NS_SHELLSERVICE_CONTRACTID \ - "@mozilla.org/browser/shell-service;1" - -#define NS_RDF_FORWARDPROXY_INFER_DATASOURCE_CID \ -{ 0x7a024bcf, 0xedd5, 0x4d9a, { 0x86, 0x14, 0xd4, 0x4b, 0xe1, 0xda, 0xda, 0xd3 } } - -#define NS_FEEDSNIFFER_CID \ -{ 0x6893e69, 0x71d8, 0x4b23, { 0x81, 0xeb, 0x80, 0x31, 0x4d, 0xaf, 0x3e, 0x66 } } - -#define NS_FEEDSNIFFER_CONTRACTID \ - "@mozilla.org/browser/feeds/sniffer;1" - -#define NS_ABOUTFEEDS_CID \ -{ 0x12ff56ec, 0x58be, 0x402c, { 0xb0, 0x57, 0x1, 0xf9, 0x61, 0xde, 0x96, 0x9b } } - -// 136e2c4d-c5a4-477c-b131-d93d7d704f64 -#define NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID \ -{ 0x136e2c4d, 0xc5a4, 0x477c, { 0xb1, 0x31, 0xd9, 0x3d, 0x7d, 0x70, 0x4f, 0x64 } } - -// 7e4bb6ad-2fc4-4dc6-89ef-23e8e5ccf980 -#define NS_BROWSER_ABOUT_REDIRECTOR_CID \ -{ 0x7e4bb6ad, 0x2fc4, 0x4dc6, { 0x89, 0xef, 0x23, 0xe8, 0xe5, 0xcc, 0xf9, 0x80 } } - -// {6DEB193C-F87D-4078-BC78-5E64655B4D62} -#define NS_BROWSERDIRECTORYPROVIDER_CID \ -{ 0x6deb193c, 0xf87d, 0x4078, { 0xbc, 0x78, 0x5e, 0x64, 0x65, 0x5b, 0x4d, 0x62 } } diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp deleted file mode 100644 index 1baccd710..000000000 --- a/browser/components/build/nsModule.cpp +++ /dev/null @@ -1,132 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* 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/. */ - -#include "mozilla/ModuleUtils.h" - -#include "nsBrowserCompsCID.h" -#include "DirectoryProvider.h" - -#if defined(XP_WIN) -#include "nsWindowsShellService.h" -#elif defined(XP_MACOSX) -#include "nsMacShellService.h" -#elif defined(MOZ_WIDGET_GTK) -#include "nsGNOMEShellService.h" -#endif - -#if defined(XP_WIN) -#include "nsIEHistoryEnumerator.h" -#endif - -#include "rdf.h" -#include "nsFeedSniffer.h" -#include "AboutRedirector.h" -#include "nsIAboutModule.h" - -#include "nsNetCID.h" - -using namespace mozilla::browser; - -///////////////////////////////////////////////////////////////////////////// - -NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) -#if defined(XP_WIN) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService) -#elif defined(XP_MACOSX) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) -#elif defined(MOZ_WIDGET_GTK) -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) -#endif - -#if defined(XP_WIN) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator) -#endif - -NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) - -NS_DEFINE_NAMED_CID(NS_BROWSERDIRECTORYPROVIDER_CID); -#if defined(XP_WIN) -NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID); -#elif defined(MOZ_WIDGET_GTK) -NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID); -#endif -NS_DEFINE_NAMED_CID(NS_FEEDSNIFFER_CID); -NS_DEFINE_NAMED_CID(NS_BROWSER_ABOUT_REDIRECTOR_CID); -#if defined(XP_WIN) -NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUMERATOR_CID); -#elif defined(XP_MACOSX) -NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID); -#endif - -static const mozilla::Module::CIDEntry kBrowserCIDs[] = { - { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor }, -#if defined(XP_WIN) - { &kNS_SHELLSERVICE_CID, false, nullptr, nsWindowsShellServiceConstructor }, -#elif defined(MOZ_WIDGET_GTK) - { &kNS_SHELLSERVICE_CID, false, nullptr, nsGNOMEShellServiceConstructor }, -#endif - { &kNS_FEEDSNIFFER_CID, false, nullptr, nsFeedSnifferConstructor }, - { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, nullptr, AboutRedirector::Create }, -#if defined(XP_WIN) - { &kNS_WINIEHISTORYENUMERATOR_CID, false, nullptr, nsIEHistoryEnumeratorConstructor }, -#elif defined(XP_MACOSX) - { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, -#endif - { nullptr } -}; - -static const mozilla::Module::ContractIDEntry kBrowserContracts[] = { - { NS_BROWSERDIRECTORYPROVIDER_CONTRACTID, &kNS_BROWSERDIRECTORYPROVIDER_CID }, -#if defined(XP_WIN) - { NS_SHELLSERVICE_CONTRACTID, &kNS_SHELLSERVICE_CID }, -#elif defined(MOZ_WIDGET_GTK) - { NS_SHELLSERVICE_CONTRACTID, &kNS_SHELLSERVICE_CID }, -#endif - { NS_FEEDSNIFFER_CONTRACTID, &kNS_FEEDSNIFFER_CID }, - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "basilisk", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, -#ifdef MOZ_SAFE_BROWSING - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "blocked", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, -#endif - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "certerror", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "tabcrashed", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "feeds", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "privatebrowsing", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "rights", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "robots", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "searchreset", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "sessionrestore", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "welcomeback", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "sync-tabs", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "home", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "newtab", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "preferences", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "downloads", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "accounts", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, -#ifdef MOZ_SERVICES_HEALTHREPORT - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "healthreport", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, -#endif - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "reader", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, -#if defined(XP_WIN) - { NS_IEHISTORYENUMERATOR_CONTRACTID, &kNS_WINIEHISTORYENUMERATOR_CID }, -#elif defined(XP_MACOSX) - { NS_SHELLSERVICE_CONTRACTID, &kNS_SHELLSERVICE_CID }, -#endif - { nullptr } -}; - -static const mozilla::Module::CategoryEntry kBrowserCategories[] = { - { XPCOM_DIRECTORY_PROVIDER_CATEGORY, "browser-directory-provider", NS_BROWSERDIRECTORYPROVIDER_CONTRACTID }, - { NS_CONTENT_SNIFFER_CATEGORY, "Feed Sniffer", NS_FEEDSNIFFER_CONTRACTID }, - { nullptr } -}; - -static const mozilla::Module kBrowserModule = { - mozilla::Module::kVersion, - kBrowserCIDs, - kBrowserContracts, - kBrowserCategories -}; - -NSMODULE_DEFN(nsBrowserCompsModule) = &kBrowserModule; |