Sort out manifests for ABPrime

custom-2020
Matt A. Tobin 4 years ago committed by Roy Tam
parent 3f43e3cf55
commit 2d11d900bb
  1. 15
      abprime/addon/jar.mn
  2. 5
      abprime/components/components.manifest
  3. 3
      abprime/components/moz.build
  4. 11
      abprime/content/jar.mn

@ -4,24 +4,9 @@
#filter substitution
# We are seperating out the additional chrome.manifest directives to here because it keeps the others cleaner
# Though, properly we SHOULD keep relevent ones in the relevant jar.mn files.. idc
[.] chrome.jar:
#ifdef ADDON_TARGET_BASILISK
% overlay chrome://browser/content/browser.xul chrome://@ADDON_CHROME_NAME@/content/phoenixOverlay.xul application=@ADDON_TARGET_APP_ID@ application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
#else
% overlay chrome://browser/content/browser.xul chrome://@ADDON_CHROME_NAME@/content/phoenixOverlay.xul application=@ADDON_TARGET_APP_ID@
#endif
% overlay chrome://navigator/content/navigator.xul chrome://@ADDON_CHROME_NAME@/content/navigatorOverlay.xul application={a3210b97-8e8a-4737-9aa0-aa0e607640b9}
# Hack to prevent .Net Framework Assistant from messing up the browser
% override chrome://dotnetassistant/content/bootstrap.xul data:text/xml,<nada/>
% resource @ADDON_CHROME_NAME@ /
# Component registration
% component {d32a3c00-4ed3-11de-8a39-0800200c9a66} components/Initializer.js
% contract @adblockplus.org/abp/startup;1 {d32a3c00-4ed3-11de-8a39-0800200c9a66}
% category profile-after-change @adblockplus.org/abp/startup;1 @adblockplus.org/abp/startup;1

@ -1,5 +0,0 @@
# Normally it doesn't quite matter WHEN the components load as long as they load..
# However, ABPrime wants everything to be initallized well before the main window
# spawns so we put the component registration in the main chrome.manifest elsewhere.
# The build system demands to have a manifest file along side any components though,
# so here it is to keep it from bitching.

@ -3,6 +3,7 @@
# 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 += ['components.manifest']
# Don't use sub-manifest files
NO_JS_MANIFEST = True
EXTRA_PP_COMPONENTS += ['Initializer.js']

@ -38,3 +38,14 @@
content/subscriptionSelection.js
* content/subscriptionSelection.xul
* content/utils.js
#ifdef ADDON_TARGET_BASILISK
% overlay chrome://browser/content/browser.xul chrome://@ADDON_CHROME_NAME@/content/phoenixOverlay.xul application=@ADDON_TARGET_APP_ID@ application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
#else
% overlay chrome://browser/content/browser.xul chrome://@ADDON_CHROME_NAME@/content/phoenixOverlay.xul application=@ADDON_TARGET_APP_ID@
#endif
% overlay chrome://navigator/content/navigator.xul chrome://@ADDON_CHROME_NAME@/content/navigatorOverlay.xul application={a3210b97-8e8a-4737-9aa0-aa0e607640b9}
# Hack to prevent .Net Framework Assistant from messing up the browser
% override chrome://dotnetassistant/content/bootstrap.xul data:text/xml,<nada/>

Loading…
Cancel
Save