diff options
-rw-r--r-- | browser/common/source_files/browser/components/moz.build | 101 | ||||
-rwxr-xr-x | browser/linux/build.sh | 4 |
2 files changed, 2 insertions, 103 deletions
diff --git a/browser/common/source_files/browser/components/moz.build b/browser/common/source_files/browser/components/moz.build deleted file mode 100644 index cb016ca..0000000 --- a/browser/common/source_files/browser/components/moz.build +++ /dev/null @@ -1,101 +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/. - -with Files("**"): - BUG_COMPONENT = ("Firefox", "General") - -with Files("distribution.js"): - BUG_COMPONENT = ("Firefox", "Distributions") - -with Files("tests/**"): - BUG_COMPONENT = ("Firefox", "General") - -with Files("tests/browser/browser_bug538331.js"): - BUG_COMPONENT = ("Toolkit", "Application Update") - -with Files("tests/browser/browser_contentpermissionprompt.js"): - BUG_COMPONENT = ("Firefox", "Site Identity and Permission Panels") - -with Files("tests/unit/test_distribution.js"): - BUG_COMPONENT = ("Firefox", "Distributions") - -with Files("safebrowsing/**"): - BUG_COMPONENT = ("Toolkit", "Safe Browsing") - -with Files('controlcenter/**'): - BUG_COMPONENT = ('Firefox', 'General') - - -DIRS += [ - 'about', - 'attribution', - 'contextualidentity', - 'customizableui', - 'dirprovider', - 'downloads', - 'enterprisepolicies', - 'extensions', - 'library', - 'migration', - 'newtab', - 'originattributes', - 'places', - #'pocket', - 'preferences', - 'privatebrowsing', - 'protocolhandler', - 'resistfingerprinting', - 'search', - 'sessionstore', - 'shell', - 'syncedtabs', - 'uitour', - 'urlbar', - 'translation', -] - -DIRS += ['build'] - -if CONFIG['NIGHTLY_BUILD']: - DIRS += [ - 'aboutconfig', - 'payments', - ] - -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - DIRS += ['touchbar'] - -XPIDL_SOURCES += [ - 'nsIBrowserHandler.idl', -] - -XPIDL_MODULE = 'browsercompsbase' - -XPCOM_MANIFESTS += [ - 'components.conf', -] - -EXTRA_COMPONENTS += [ - 'BrowserComponents.manifest', - 'tests/startupRecorder.js', - 'tests/testComponents.manifest', -] - -EXTRA_JS_MODULES += [ - 'BrowserContentHandler.jsm', - 'BrowserGlue.jsm', - 'distribution.js', -] - -BROWSER_CHROME_MANIFESTS += [ - 'safebrowsing/content/test/browser.ini', - 'tests/browser/browser.ini' -] - -XPCSHELL_TESTS_MANIFESTS += [ - 'tests/unit/xpcshell.ini' -] diff --git a/browser/linux/build.sh b/browser/linux/build.sh index 0714cef..2007d4b 100755 --- a/browser/linux/build.sh +++ b/browser/linux/build.sh @@ -76,8 +76,8 @@ hg clone https://hg.mozilla.org/releases/mozilla-release; printf "\nCopying branding to firefox source code\n"; cp -r $SOURCE_FOLDER/* ./mozilla-release; -# Adds fix to allow user preferences to be locked -sed -i '\|MOZ_ASSERT(!aIsLocked); // `locked` is disallowed in user pref files|d' ./mozilla-release/modules/libpref/Preferences.cpp; +#Disables pocket +sed -i "s/'pocket'/#'pocket'/g" ./mozilla-release/browser/components/moz.build; cd mozilla-release; |