diff options
45 files changed, 149 insertions, 106 deletions
diff --git a/application/palemoon/base/content/aboutDialog.xul b/application/palemoon/base/content/aboutDialog.xul index 1ba8f06a1..743ff21df 100644 --- a/application/palemoon/base/content/aboutDialog.xul +++ b/application/palemoon/base/content/aboutDialog.xul @@ -88,6 +88,9 @@ </vbox> <description class="text-pmcreds"> +#ifdef MC_PRIVATE_BUILD + This is a private build of Pale Moon. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.palemoon.org/">Pale Moon website</label>. +#else Pale Moon is released by <label class="text-link" href="http://www.moonchildproductions.info">Moonchild Productions</label>. </description> <description class="text-pmcreds"> @@ -96,6 +99,7 @@ <description class="text-blurb"> If you wish to contribute, please consider helping out by providing support to other users on the <label class="text-link" href="https://forum.palemoon.org/">Pale Moon forum</label> or getting involved in our development by tackling some of the issues found in our GitHub issue tracker. +#endif </description> </vbox> </vbox> diff --git a/application/palemoon/base/content/browser-menubar.inc b/application/palemoon/base/content/browser-menubar.inc index f818f5149..fa9d7f0f4 100644 --- a/application/palemoon/base/content/browser-menubar.inc +++ b/application/palemoon/base/content/browser-menubar.inc @@ -85,8 +85,8 @@ observes="workOfflineMenuitemState" oncommand="BrowserOffline.toggleOfflineStatus();"/> <menuitem id="menu_restart" - label="&appMenuRestart.label;" - accesskey="&appMenuRestart.accesskey;" + label="&restartCmd.label;" + accesskey="&restartCmd.accesskey;" command="cmd_restartApplication"/> <menuitem id="menu_FileQuitItem" #ifdef XP_WIN diff --git a/application/palemoon/components/preferences/tabs.js b/application/palemoon/components/preferences/tabs.js index 9e15d8bb4..f0ad8490c 100644 --- a/application/palemoon/components/preferences/tabs.js +++ b/application/palemoon/components/preferences/tabs.js @@ -89,7 +89,7 @@ var gTabsPane = { case "about:logopage": newtabUrlChoice.value = 1; break; - case "https://start.palemoon.org/": + case "http://start.palemoon.org/": newtabUrlChoice.value = 2; break; case newtabUrlSanitizedPref.value: @@ -101,6 +101,8 @@ var gTabsPane = { default: // Custom URL entered. document.getElementById("newtabPageCustom").hidden = false; newtabUrlChoice.value = 0; + // We need this to consider instantApply. + this.newtabPageCustom = newtabUrlPref.value; } }, @@ -109,32 +111,45 @@ var gTabsPane = { * if the choice is "my home page", get and sanitize the browser home page * URL to make it suitable for newtab use. * - * Called from prefwindow's ondialogaccept handler. + * Called from prefwindow's ondialogaccept handler and + * from browser.newtab.choice's oncommand to consider instantApply. */ - writeNewtabUrl: function() { + writeNewtabUrl: function(newtabUrlChoice) { try { - let newtabUrlChoice = Services.prefs.getIntPref("browser.newtab.choice"); - let browserHomepageUrl = Services.prefs.getCharPref("browser.startup.homepage"); + if (newtabUrlChoice) { + if (Services.prefs.getBoolPref("browser.preferences.instantApply")) { + newtabUrlChoice = parseInt(newtabUrlChoice); + } else { + return; + } + } else { + newtabUrlChoice = Services.prefs.getIntPref("browser.newtab.choice"); + } + let browserHomepageUrl = Services.prefs.getComplexValue("browser.startup.homepage", + Components.interfaces.nsIPrefLocalizedString).data; let newtabUrlPref = Services.prefs.getCharPref("browser.newtab.url"); switch (newtabUrlChoice) { case 1: - newtabUrlPref="about:logopage"; + newtabUrlPref = "about:logopage"; break; case 2: - newtabUrlPref="https://start.palemoon.org/"; + newtabUrlPref = "http://start.palemoon.org/"; break; case 3: // If url is a pipe-delimited set of pages, just take the first one. let newtabUrlSanitizedPref=browserHomepageUrl.split("|")[0]; // XXX: do we need extra sanitation here, e.g. for invalid URLs? Services.prefs.setCharPref("browser.newtab.myhome", newtabUrlSanitizedPref); - newtabUrlPref=newtabUrlSanitizedPref; + newtabUrlPref = newtabUrlSanitizedPref; break; case 4: - newtabUrlPref="about:newtab"; + newtabUrlPref = "about:newtab"; break; default: - // In case of any other value it's a custom URL, so don't change anything... + // In case of any other value it's a custom URL, consider instantApply. + if (this.newtabPageCustom) { + newtabUrlPref = this.newtabPageCustom; + } } Services.prefs.setCharPref("browser.newtab.url",newtabUrlPref); } catch(e) { console.error(e); } diff --git a/application/palemoon/components/preferences/tabs.xul b/application/palemoon/components/preferences/tabs.xul index fc15a87ef..f5b44b776 100644 --- a/application/palemoon/components/preferences/tabs.xul +++ b/application/palemoon/components/preferences/tabs.xul @@ -84,7 +84,8 @@ <label value="&newtabPage.label;"/> <menulist id="newtabPage" - preference="browser.newtab.choice"> + preference="browser.newtab.choice" + oncommand="gTabsPane.writeNewtabUrl(event.target.value);"> <menupopup> <menuitem label="&newtabPage.custom.label;" value="0" id="newtabPageCustom" hidden="true" /> <menuitem label="&newtabPage.blank.label;" value="1" /> diff --git a/application/palemoon/config/version.txt b/application/palemoon/config/version.txt index bdad95223..1d43844fa 100644 --- a/application/palemoon/config/version.txt +++ b/application/palemoon/config/version.txt @@ -1 +1 @@ -27.8.0a1
\ No newline at end of file +27.9.0a1
\ No newline at end of file diff --git a/application/palemoon/confvars.sh b/application/palemoon/confvars.sh index ba760f0aa..7466d0c3c 100644 --- a/application/palemoon/confvars.sh +++ b/application/palemoon/confvars.sh @@ -8,6 +8,10 @@ MOZ_APP_VENDOR=Moonchild MOZ_UPDATER=1 MOZ_PHOENIX=1 +if test "$OS_TARGET" = "WINNT"; then + MOZ_BUNDLED_FONTS=1 +fi + MOZ_CHROME_FILE_FORMAT=omni MOZ_SERVICES_COMMON=1 MOZ_MEDIA_NAVIGATOR=1 diff --git a/application/palemoon/fonts/EmojiOneMozilla.ttf b/application/palemoon/fonts/EmojiOneMozilla.ttf Binary files differnew file mode 100644 index 000000000..50356509d --- /dev/null +++ b/application/palemoon/fonts/EmojiOneMozilla.ttf diff --git a/application/palemoon/fonts/README.txt b/application/palemoon/fonts/README.txt new file mode 100644 index 000000000..188ea3fff --- /dev/null +++ b/application/palemoon/fonts/README.txt @@ -0,0 +1,9 @@ +EmojiOne Mozilla +================ + +The upstream repository of EmojiOne Mozilla can be found at + + https://github.com/mozilla/emojione-colr + +Please refer commit history for the current version of the font. +This file purposely omit the version, so there is no need to update it here. diff --git a/application/palemoon/fonts/moz.build b/application/palemoon/fonts/moz.build new file mode 100644 index 000000000..93d07120b --- /dev/null +++ b/application/palemoon/fonts/moz.build @@ -0,0 +1,11 @@ +# -*- Mode: python; c-basic-offset: 4; 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/. + +if CONFIG['OS_ARCH'] in ('WINNT'): + DIST_SUBDIR = '' + FINAL_TARGET_FILES.fonts += [ + 'EmojiOneMozilla.ttf' + ] diff --git a/application/palemoon/installer/package-manifest.in b/application/palemoon/installer/package-manifest.in index 0228deb52..a581ff469 100644 --- a/application/palemoon/installer/package-manifest.in +++ b/application/palemoon/installer/package-manifest.in @@ -51,6 +51,9 @@ @RESPATH@/browser/defaults/profile/localstore.rdf @RESPATH@/browser/defaults/profile/mimeTypes.rdf @RESPATH@/dictionaries/* +#if defined(XP_WIN) +@RESPATH@/fonts/* +#endif @RESPATH@/hyphenation/* @RESPATH@/browser/@PREF_DIR@/palemoon-l10n.js @RESPATH@/browser/searchplugins/* diff --git a/application/palemoon/locales/en-US/chrome/browser/browser.dtd b/application/palemoon/locales/en-US/chrome/browser/browser.dtd index d6965cd74..fe5f64854 100644 --- a/application/palemoon/locales/en-US/chrome/browser/browser.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/browser.dtd @@ -67,6 +67,9 @@ can reach it easily. --> <!ENTITY goOfflineCmd.label "Work Offline"> <!ENTITY goOfflineCmd.accesskey "k"> +<!ENTITY restartCmd.label "Restart…"> +<!ENTITY restartCmd.accesskey "R"> + <!ENTITY menubarCmd.label "Menu Bar"> <!ENTITY menubarCmd.accesskey "M"> <!ENTITY navbarCmd.label "Navigation Toolbar"> @@ -307,7 +310,7 @@ These should match what Safari and other Apple applications use on OS X Lion. -- <!ENTITY viewToolbarsMenu.accesskey "T"> <!ENTITY viewSidebarMenu.label "Sidebar"> <!ENTITY viewSidebarMenu.accesskey "e"> -<!ENTITY viewCustomizeToolbar.label "Customize…"> +<!ENTITY viewCustomizeToolbar.label "Customize"> <!ENTITY viewCustomizeToolbar.accesskey "C"> <!ENTITY viewTabsOnTop.label "Tabs on Top"> <!ENTITY viewTabsOnTop.accesskey "T"> @@ -325,7 +328,7 @@ These should match what Safari and other Apple applications use on OS X Lion. -- <!ENTITY appMenuEdit.label "Edit"> <!ENTITY appMenuCustomize.label "Customize"> -<!ENTITY appMenuToolbarLayout.label "Toolbar Layout…"> +<!ENTITY appMenuToolbarLayout.label "Toolbar Layout"> <!ENTITY appMenuSidebars.label "Sidebars"> <!ENTITY appMenuFind.label "Find…"> <!ENTITY appMenuUnsorted.label "Unsorted Bookmarks"> @@ -546,7 +549,7 @@ you can use these alternative items. Otherwise, their values should be empty. - <!ENTITY zoomInButton.tooltip "Zoom in"> <!ENTITY zoomControls.label "Zoom Controls"> -<!ENTITY appMenuRestart.label "Restart"> +<!ENTITY appMenuRestart.label "Restart…"> <!ENTITY appMenuRestart.accesskey "R"> <!ENTITY quitApplicationCmdWin.label "Exit"> @@ -573,11 +576,8 @@ you can use these alternative items. Otherwise, their values should be empty. - <!ENTITY pageReportIcon.tooltip "Change pop-up blocking settings for this website"> <!ENTITY allowPopups.accesskey "p"> -<!-- On Windows we use the term "Options" to describe settings, but - on Linux and Mac OS X we use "Preferences" - carry that distinction - over into this string, which is used in the "popup blocked" info bar . --> -<!ENTITY editPopupSettingsUnix.label "Edit Pop-up Blocker Preferences…"> -<!ENTITY editPopupSettings.label "Edit Pop-up Blocker Options…"> +<!ENTITY editPopupSettingsUnix.label "Edit Pop-up Blocker Preferences"> +<!ENTITY editPopupSettings.label "Edit Pop-up Blocker Preferences"> <!ENTITY editPopupSettings.accesskey "E"> <!ENTITY dontShowMessage.accesskey "D"> diff --git a/application/palemoon/locales/en-US/chrome/browser/statusbar/meta.properties b/application/palemoon/locales/en-US/chrome/browser/statusbar/meta.properties index fd8a13547..24cb5c092 100644 --- a/application/palemoon/locales/en-US/chrome/browser/statusbar/meta.properties +++ b/application/palemoon/locales/en-US/chrome/browser/statusbar/meta.properties @@ -1,5 +1,5 @@ # Translator names. If there is more than one, separate with commas. Only include your name, not the locale you're translating. -translator=Sparky Bluefang +translator=Moonchild # Extension title. This usually should not be translated. name=Status-4-Evar diff --git a/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd b/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd index 0ea5ffc26..bb0ab95f8 100644 --- a/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd @@ -4,7 +4,7 @@ <!ENTITY status4evar.progress.widget.title "Progress Meter"> <!ENTITY status4evar.throbber.widget.title "Activity Indicator"> <!ENTITY status4evar.download.widget.title "Download Status"> -<!ENTITY status4evar.options.widget.title "Pale Moon status bar options"> +<!ENTITY status4evar.options.widget.title "Status Bar Preferences"> <!ENTITY status4evar.options.widget.label "Pale Moon status bar"> -<!ENTITY status4evar.menu.options.label "Status bar options..."> +<!ENTITY status4evar.menu.options.label "Status Bar Preferences"> diff --git a/application/palemoon/moz.build b/application/palemoon/moz.build index b911f2818..2b9d8f09b 100644 --- a/application/palemoon/moz.build +++ b/application/palemoon/moz.build @@ -9,6 +9,7 @@ CONFIGURE_SUBST_FILES += ['installer/Makefile'] DIRS += [ 'base', 'components', + 'fonts', 'locales', 'modules', 'themes', diff --git a/application/palemoon/themes/windows/browser.css b/application/palemoon/themes/windows/browser.css index 9fdd67b55..7c837764d 100644 --- a/application/palemoon/themes/windows/browser.css +++ b/application/palemoon/themes/windows/browser.css @@ -1887,7 +1887,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- /* Hide the transparent top border by default */ margin-top: -1px; /* Reduce the gap between the tabs */ - -moz-margin-start: -0.8px; + -moz-margin-start: -1px; box-shadow: var(--tab-box-shadow); } diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul index f64e79681..5780e5ec1 100644 --- a/browser/base/content/aboutDialog.xul +++ b/browser/base/content/aboutDialog.xul @@ -122,12 +122,18 @@ &warningDesc.version; </description> </vbox> +#ifdef MC_PRIVATE_BUILD +<description class="text-blurb" id="communityDesc"> + This is a private build of Basilisk. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.basilisk-browser.org/">Basilisk website</label>. + </description> +#else <description class="text-blurb" id="communityDesc"> Basilisk is community software released by <label class="text-link" href="http://www.palemoon.org/">the Pale Moon team</label> and Mozilla developers. Learn <label class="text-link" useoriginprincipal="true" href="about:credits">who contributed</label> to this software. </description> <description class="text-blurb" id="contributeDesc"> - Want to help? Please consider <label class="text-link" href="https://www.palemoon.org/donations.shtml">donating</label> or get involved with our <label class="text-link" href="https://github.com/MoonchildProductions/moebius">development</label> of the Unified XUL Platform. + Want to help? Please consider <label class="text-link" href="https://www.palemoon.org/donations.shtml">donating</label> or get involved with our <label class="text-link" href="https://github.com/MoonchildProductions/UXP">development</label> of the Unified XUL Platform. </description> +#endif </vbox> </vbox> </hbox> diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest index dbfc3d2ec..0c80006be 100644 --- a/browser/components/BrowserComponents.manifest +++ b/browser/components/BrowserComponents.manifest @@ -39,6 +39,4 @@ component {eab9012e-5f74-4cbc-b2b5-a590235513cc} nsBrowserGlue.js contract @mozilla.org/browser/browserglue;1 {eab9012e-5f74-4cbc-b2b5-a590235513cc} category app-startup nsBrowserGlue service,@mozilla.org/browser/browserglue;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={d1bfe7d9-c01e-4237-998b-7b5f960a4314} component {d8903bf6-68d5-4e97-bcd1-e4d3012f721a} nsBrowserGlue.js -#ifndef MOZ_MULET contract @mozilla.org/content-permission/prompt;1 {d8903bf6-68d5-4e97-bcd1-e4d3012f721a} -#endif diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index ccfce3cd9..4a934fe45 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -13,11 +13,7 @@ MOZ_PKG_MANIFEST = $(srcdir)/package-manifest.in MOZ_PKG_DUPEFLAGS = -f $(srcdir)/allowed-dupes.mn # Some files have been already bundled with xulrunner -ifndef MOZ_MULET MOZ_PKG_FATAL_WARNINGS = 1 -else -DEFINES += -DMOZ_MULET -endif # When packaging an artifact build not all xpt files expected by the # packager will be present. diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index dee6a3faa..015daa8c7 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -831,7 +831,3 @@ bin/libfreebl_32int64_3.so @RESPATH@/components/GfxSanityTest.manifest @RESPATH@/components/SanityTest.js #endif - -#ifdef MOZ_MULET -#include ../../b2g/installer/package-manifest.in -#endif diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in index a8305d077..600bdfeb6 100644 --- a/browser/installer/windows/Makefile.in +++ b/browser/installer/windows/Makefile.in @@ -5,7 +5,7 @@ include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk CONFIG_DIR = instgen -SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx +SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/uxp/7zSD.sfx INSTALLER_FILES = \ app.tag \ diff --git a/build/directive4.py b/build/directive4.py index 2a49f3028..8f05eeed5 100644 --- a/build/directive4.py +++ b/build/directive4.py @@ -4,11 +4,9 @@ # Imports from __future__ import print_function, unicode_literals -from collections import OrderedDict import os import sys -import json # Sanity check if not len(sys.argv) > 1: @@ -19,6 +17,7 @@ if not len(sys.argv) > 1: listConfigure = sys.argv[1:] listConfig = [] strBrandingDirectory = "" +listViolations = [] # Build a list of set configure variables for _value in listConfigure: @@ -33,8 +32,8 @@ for _value in listConfigure: if ('MOZ_OFFICIAL_BRANDING' in listConfig) or (strBrandingDirectory.endswith("branding/official")) or (strBrandingDirectory.endswith("branding/unstable")): # Applies to Pale Moon and Basilisk if ('MC_BASILISK' in listConfig) or ('MC_PALEMOON' in listConfig): - # Define a list of system libs - listSystemLibs = [ + listViolations += [ + 'MOZ_SANDBOX', 'MOZ_SYSTEM_LIBEVENT', 'MOZ_SYSTEM_NSS', 'MOZ_SYSTEM_NSPR', @@ -47,25 +46,17 @@ if ('MOZ_OFFICIAL_BRANDING' in listConfig) or (strBrandingDirectory.endswith("br 'MOZ_SYSTEM_JEMALLOC' ] - # Iterate through system libs and output 1 to DIRECTIVE4 if any are found - for _value in listSystemLibs: - if _value in listConfig: - sys.stdout.write("1") - sys.exit(1) - - # Applies only to Pale Moon + # Applies to Pale Moon Only if 'MC_PALEMOON' in listConfig: - # Define a list of configure features that are in violation of Official branding - listFeatureViolations = [ - 'MOZ_SANDBOX', + listViolations += [ 'MOZ_WEBRTC' ] - - # Iterate through features and output 1 to DIRECTIVE4 if any violations are found - for _value in listFeatureViolations: - if _value in listConfig: - sys.stdout.write("1") - sys.exit(1) + + # Iterate through enabled violations and output 1 to DIRECTIVE4 if any are found + for _value in listViolations: + if _value in listConfig: + sys.stdout.write("1") + sys.exit(1) # Exit outputting nothing to DIRECTIVE4 being empty because there are no violations sys.exit(0) diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index c9bdc9682..ffdea81b0 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -214,6 +214,7 @@ def old_configure_options(*options): '--enable-png-arm-neon-support', '--enable-posix-nspr-emulation', '--enable-pref-extensions', + '--enable-private-build', '--enable-pulseaudio', '--enable-raw', '--enable-readline', diff --git a/devtools/shared/qrcode/moz.build b/devtools/shared/qrcode/moz.build index 68a093b1c..41516675b 100644 --- a/devtools/shared/qrcode/moz.build +++ b/devtools/shared/qrcode/moz.build @@ -9,7 +9,7 @@ DIRS += [ ] # Save file size on Fennec until there are active plans to use the decoder there -if CONFIG['MOZ_BUILD_APP'] != 'mobile/android': +if CONFIG['MOZ_FENNEC']: DIRS += [ 'decoder' ] diff --git a/dom/base/moz.build b/dom/base/moz.build index 0bc9902e4..686d76e73 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -411,7 +411,7 @@ EXTRA_COMPONENTS += [ ] # Firefox for Android provides an alternate version of this component -if CONFIG['MOZ_BUILD_APP'] != 'mobile/android': +if not CONFIG['MOZ_FENNEC']: EXTRA_COMPONENTS += [ 'SiteSpecificUserAgent.js', 'SiteSpecificUserAgent.manifest', @@ -472,7 +472,7 @@ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' -if CONFIG['MOZ_BUILD_APP'] in ['mobile/android', 'xulrunner'] or CONFIG['MOZ_PHOENIX']: +if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']: DEFINES['HAVE_SIDEBAR'] = True if CONFIG['MOZ_X11']: diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build index eb00482c6..f1ce9e276 100644 --- a/dom/bindings/moz.build +++ b/dom/bindings/moz.build @@ -139,7 +139,7 @@ FINAL_LIBRARY = 'xul' SPHINX_TREES['webidl'] = 'docs' SPHINX_PYTHON_PACKAGE_DIRS += ['mozwebidlcodegen'] -if CONFIG['MOZ_BUILD_APP'] in ['mobile/android', 'xulrunner'] or CONFIG['MOZ_PHOENIX']: +if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']: # This is needed for Window.webidl DEFINES['HAVE_SIDEBAR'] = True diff --git a/dom/push/moz.build b/dom/push/moz.build index b96099161..35683120f 100644 --- a/dom/push/moz.build +++ b/dom/push/moz.build @@ -16,7 +16,7 @@ EXTRA_JS_MODULES += [ 'PushService.jsm', ] -if CONFIG['MOZ_BUILD_APP'] != 'mobile/android': +if not CONFIG['MOZ_FENNEC']: # Everything but Fennec. EXTRA_JS_MODULES += [ 'PushServiceHttp2.jsm', diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build index 5dc637799..8682aee97 100644 --- a/dom/webidl/moz.build +++ b/dom/webidl/moz.build @@ -773,7 +773,7 @@ if CONFIG['MOZ_BUILD_APP'] in ['xulrunner'] or CONFIG['MOZ_PHOENIX'] or CONFIG[' 'BrowserFeedWriter.webidl', ] -if CONFIG['MOZ_BUILD_APP'] in ['mobile/android', 'xulrunner'] or CONFIG['MOZ_PHOENIX']: +if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']: WEBIDL_FILES += [ 'External.webidl', ] diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp index 95c214867..85591bc8a 100644 --- a/js/xpconnect/loader/mozJSComponentLoader.cpp +++ b/js/xpconnect/loader/mozJSComponentLoader.cpp @@ -306,14 +306,6 @@ mozJSComponentLoader::ReallyInit() mReuseLoaderGlobal = Preferences::GetBool("jsloader.reuseGlobal"); - // XXXkhuey B2G child processes have some sort of preferences race that - // results in getting the wrong value. - // But we don't want that on Firefox Mulet as it break most Firefox JSMs... - // Also disable on debug builds to break js components that rely on this. -#if defined(MOZ_B2G) && !defined(MOZ_MULET) && !defined(DEBUG) - mReuseLoaderGlobal = true; -#endif - nsCOMPtr<nsIScriptSecurityManager> secman = do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID); if (!secman) diff --git a/mobile/android/configure.in b/mobile/android/configure.in new file mode 100644 index 000000000..9e13f39b3 --- /dev/null +++ b/mobile/android/configure.in @@ -0,0 +1,12 @@ +dnl -*- Mode: Autoconf; tab-width: 2; indent-tabs-mode: nil; -*- +dnl vi: set tabstop=2 shiftwidth=2 expandtab: +dnl This Source Code Form is subject to the terms of the Mozilla Public +dnl License, v. 2.0. If a copy of the MPL was not distributed with this +dnl file, You can obtain one at http://mozilla.org/MPL/2.0/. + +dnl Things we need to carry from confvars.sh +AC_DEFINE(MOZ_FENNEC) +AC_SUBST(MOZ_FENNEC) + +dnl Optional parts of the build. + diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh index f2c7ec113..c1b81c079 100644 --- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -4,6 +4,7 @@ MOZ_APP_BASENAME=Fennec MOZ_APP_VENDOR=Mozilla +MOZ_FENNEC=1 MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt` MOZ_APP_VERSION_DISPLAY=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt` diff --git a/old-configure.in b/old-configure.in index 3cb499b93..a67e65ce7 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2425,10 +2425,6 @@ if test -n "$MOZ_GRAPHENE"; then AC_DEFINE(MOZ_GRAPHENE) fi -if test -n "$MOZ_MULET"; then - AC_DEFINE(MOZ_MULET) -fi - # Propagate feature switches for code written in rust from confvars.sh if test -n "$MOZ_RUST"; then if test -n "$MOZ_RUST_MP4PARSE"; then @@ -2441,7 +2437,6 @@ fi AC_SUBST(MOZ_XULRUNNER) AC_SUBST(MOZ_B2G) -AC_SUBST(MOZ_MULET) AC_SUBST(MOZ_B2G_VERSION) dnl ======================================================== @@ -2624,6 +2619,22 @@ fi AC_SUBST(MOZ_BRANDING_DIRECTORY) dnl ======================================================== +dnl = Private Build +dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(private-build, +[ --enable-private-build Enable private builds + This allows you to build with official + branding for personal use only using any + build time configuration.], + MC_PRIVATE_BUILD=1, + MC_PRIVATE_BUILD=) + +AC_SUBST(MC_PRIVATE_BUILD) +if test -n "$MC_PRIVATE_BUILD"; then + AC_DEFINE(MC_PRIVATE_BUILD) +fi + +dnl ======================================================== dnl = Distribution ID dnl ======================================================== MOZ_ARG_WITH_STRING(distribution-id, @@ -5771,7 +5782,8 @@ dnl ======================================================== dnl Directive 4 dnl ======================================================== -DIRECTIVE4_LIST="MOZ_OFFICIAL_BRANDING=$MOZ_OFFICIAL_BRANDING +DIRECTIVE4_LIST=" +MOZ_OFFICIAL_BRANDING=$MOZ_OFFICIAL_BRANDING MOZ_BRANDING_DIRECTORY=$MOZ_BRANDING_DIRECTORY MC_BASILISK=$MC_BASILISK MC_PALEMOON=$MC_PALEMOON @@ -5791,7 +5803,11 @@ MOZ_SYSTEM_JEMALLOC=$MOZ_SYSTEM_JEMALLOC" DIRECTIVE4=`$PYTHON $_topsrcdir/build/directive4.py $DIRECTIVE4_LIST` if test -n "$DIRECTIVE4"; then - AC_ERROR([Branding Violation - Please see: http://www.palemoon.org/redist.shtml]) + if test -n "$MC_PRIVATE_BUILD"; then + AC_MSG_WARN([Private Build - The configuration you have chosen to use with official branding deviates from official build configuration. Your build is thus for personal and private use only and must not be (re)distributed - Please see: http://www.palemoon.org/redist.shtml]) + else + AC_MSG_ERROR([Branding Violation - Please see: http://www.palemoon.org/redist.shtml]) + fi fi AC_SUBST(DIRECTIVE4) diff --git a/other-licenses/7zstub/firefox/7zSD.sfx b/other-licenses/7zstub/firefox/7zSD.sfx Binary files differdeleted file mode 100644 index 0880e7669..000000000 --- a/other-licenses/7zstub/firefox/7zSD.sfx +++ /dev/null diff --git a/other-licenses/7zstub/palemoon/7zSD.sfx b/other-licenses/7zstub/palemoon/7zSD.sfx Binary files differnew file mode 100644 index 000000000..ecb03bad3 --- /dev/null +++ b/other-licenses/7zstub/palemoon/7zSD.sfx diff --git a/other-licenses/7zstub/uxp/7zSD.sfx b/other-licenses/7zstub/uxp/7zSD.sfx Binary files differnew file mode 100644 index 000000000..62318e1f3 --- /dev/null +++ b/other-licenses/7zstub/uxp/7zSD.sfx diff --git a/python/mozbuild/mozbuild/mozinfo.py b/python/mozbuild/mozbuild/mozinfo.py index f0b0df9bb..2c08c4e9f 100755 --- a/python/mozbuild/mozbuild/mozinfo.py +++ b/python/mozbuild/mozbuild/mozinfo.py @@ -52,9 +52,7 @@ def build_dict(config, env=os.environ): d["appname"] = substs["MOZ_APP_NAME"] # Build app name - if 'MOZ_MULET' in substs and substs.get('MOZ_MULET') == "1": - d["buildapp"] = "mulet" - elif 'MOZ_BUILD_APP' in substs: + if 'MOZ_BUILD_APP' in substs: d["buildapp"] = substs["MOZ_BUILD_APP"] # processor diff --git a/security/manager/moz.build b/security/manager/moz.build index 8097ef5f6..4ce95f226 100644 --- a/security/manager/moz.build +++ b/security/manager/moz.build @@ -6,5 +6,5 @@ DIRS += ['ssl', 'locales'] -if CONFIG['MOZ_XUL'] and CONFIG['MOZ_BUILD_APP'] != 'mobile/android': +if CONFIG['MOZ_XUL'] and CONFIG['MOZ_FENNEC']: DIRS += ['pki'] diff --git a/toolkit/components/cookie/moz.build b/toolkit/components/cookie/moz.build index e3ed99703..aac3a838c 100644 --- a/toolkit/components/cookie/moz.build +++ b/toolkit/components/cookie/moz.build @@ -4,7 +4,4 @@ # 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['MOZ_BUILD_APP'] == 'mobile/android': - DEFINES['MOZ_FENNEC'] = True - JAR_MANIFESTS += ['jar.mn'] diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build index ce8722910..12e1748e9 100644 --- a/toolkit/components/moz.build +++ b/toolkit/components/moz.build @@ -73,7 +73,7 @@ if CONFIG['MOZ_WEBEXTENSIONS']: if CONFIG['ENABLE_INTL_API']: DIRS += ['mozintl'] -if CONFIG['MOZ_BUILD_APP'] != 'mobile/android': +if not CONFIG['MOZ_FENNEC']: DIRS += ['narrate', 'viewsource']; if CONFIG['NS_PRINTING']: diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build index 2dc142882..b06816c34 100644 --- a/toolkit/components/search/moz.build +++ b/toolkit/components/search/moz.build @@ -11,9 +11,9 @@ EXTRA_COMPONENTS += [ 'nsSearchSuggestions.js', ] -if CONFIG['MOZ_BUILD_APP'] in ['mobile/android', 'xulrunner'] or CONFIG['MOZ_PHOENIX']:
+if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
DEFINES['HAVE_SIDEBAR'] = True
- EXTRA_COMPONENTS += [ + EXTRA_PP_COMPONENTS += [ 'nsSidebar.js', ] diff --git a/toolkit/components/search/nsSearchService.js b/toolkit/components/search/nsSearchService.js index bbe66ba7e..8abe56d2f 100644 --- a/toolkit/components/search/nsSearchService.js +++ b/toolkit/components/search/nsSearchService.js @@ -4676,9 +4676,9 @@ SearchService.prototype = { Services.obs.addObserver(this, SEARCH_ENGINE_TOPIC, false); Services.obs.addObserver(this, QUIT_APPLICATION_TOPIC, false); - if (AppConstants.MOZ_BUILD_APP == "mobile/android") { - Services.prefs.addObserver(LOCALE_PREF, this, false); - } +#ifdef MOZ_FENNEC + Services.prefs.addObserver(LOCALE_PREF, this, false); +#endif // The current stage of shutdown. Used to help analyze crash // signatures in case of shutdown timeout. @@ -4721,9 +4721,9 @@ SearchService.prototype = { Services.obs.removeObserver(this, SEARCH_ENGINE_TOPIC); Services.obs.removeObserver(this, QUIT_APPLICATION_TOPIC); - if (AppConstants.MOZ_BUILD_APP == "mobile/android") { - Services.prefs.removeObserver(LOCALE_PREF, this); - } +#ifdef MOZ_FENNEC + Services.prefs.removeObserver(LOCALE_PREF, this); +#endif }, QueryInterface: XPCOMUtils.generateQI([ diff --git a/toolkit/content/moz.build b/toolkit/content/moz.build index cc86890bf..de50a82f5 100644 --- a/toolkit/content/moz.build +++ b/toolkit/content/moz.build @@ -17,9 +17,6 @@ if CONFIG['OS_TARGET'] == 'Android': if CONFIG['MOZ_ANDROID_CXX_STL'] == 'libc++': DEFINES['MOZ_USE_LIBCXX'] = True -if CONFIG['MOZ_BUILD_APP'] == 'mobile/android': - DEFINES['MOZ_FENNEC'] = True - JAR_MANIFESTS += ['jar.mn'] with Files('aboutTelemetry.*'): diff --git a/toolkit/locales/moz.build b/toolkit/locales/moz.build index 91719f14b..0fbac0c89 100644 --- a/toolkit/locales/moz.build +++ b/toolkit/locales/moz.build @@ -4,9 +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/. -if CONFIG['MOZ_BUILD_APP'] == 'mobile/android': - DEFINES['MOZ_FENNEC'] = True - if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: DEFINES['MOZ_GTK'] = True diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk index a2caff914..d88975f36 100644 --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -22,7 +22,7 @@ endif ifndef MOZ_PKG_PLATFORM MOZ_PKG_PLATFORM := $(TARGET_OS)-$(TARGET_CPU) -ifeq ($(MOZ_BUILD_APP),mobile/android) +ifdef MOZ_FENNEC MOZ_PKG_PLATFORM := android-$(TARGET_CPU) endif diff --git a/toolkit/mozapps/installer/upload-files-APK.mk b/toolkit/mozapps/installer/upload-files-APK.mk index 9bb5b2e18..f9bfd6735 100644 --- a/toolkit/mozapps/installer/upload-files-APK.mk +++ b/toolkit/mozapps/installer/upload-files-APK.mk @@ -23,7 +23,7 @@ GECKO_APP_AP_PATH = $(topobjdir)/mobile/android/base ifdef ENABLE_TESTS INNER_ROBOCOP_PACKAGE=true -ifeq ($(MOZ_BUILD_APP),mobile/android) +ifdef MOZ_FENNEC UPLOAD_EXTRA_FILES += robocop.apk # Robocop/Robotium tests, Android Background tests, and Fennec need to diff --git a/toolkit/mozapps/webextensions/moz.build b/toolkit/mozapps/webextensions/moz.build index 12640e115..b92915ae8 100644 --- a/toolkit/mozapps/webextensions/moz.build +++ b/toolkit/mozapps/webextensions/moz.build @@ -6,9 +6,6 @@ SPHINX_TREES['addon-manager'] = 'docs' -if CONFIG['MOZ_BUILD_APP'] == 'mobile/android': - DEFINES['MOZ_FENNEC'] = True - DIRS += ['internal'] TEST_DIRS += ['test'] |