From 7c60bb11f56d323ea1e9ee3662786931f4d8318b Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 5 Feb 2018 00:08:42 -0500 Subject: Remove extra branding --- browser/branding/aurora/VisualElements_150.png | Bin 46222 -> 0 bytes browser/branding/aurora/VisualElements_70.png | Bin 14051 -> 0 bytes browser/branding/aurora/appname.bmp | Bin 198070 -> 0 bytes browser/branding/aurora/background.png | Bin 127432 -> 0 bytes browser/branding/aurora/bgintro.bmp | Bin 682144 -> 0 bytes browser/branding/aurora/branding.nsi | 49 - browser/branding/aurora/clock.bmp | Bin 124214 -> 0 bytes browser/branding/aurora/configure.sh | 7 - .../branding/aurora/content/about-background.png | Bin 238888 -> 0 bytes browser/branding/aurora/content/about-logo.png | Bin 39622 -> 0 bytes browser/branding/aurora/content/about-logo@2x.png | Bin 108496 -> 0 bytes browser/branding/aurora/content/about-wordmark.svg | 61 - browser/branding/aurora/content/about.png | Bin 83543 -> 0 bytes browser/branding/aurora/content/aboutDialog.css | 34 - browser/branding/aurora/content/icon48.png | Bin 4391 -> 0 bytes browser/branding/aurora/content/icon64.png | Bin 6764 -> 0 bytes .../aurora/content/identity-icons-brand.svg | 7 - browser/branding/aurora/content/jar.mn | 19 - browser/branding/aurora/content/moz.build | 7 - browser/branding/aurora/content/silhouette-40.svg | 26 - browser/branding/aurora/default16.png | Bin 790 -> 0 bytes browser/branding/aurora/default32.png | Bin 2402 -> 0 bytes browser/branding/aurora/default48.png | Bin 4391 -> 0 bytes browser/branding/aurora/disk.icns | Bin 784888 -> 0 bytes browser/branding/aurora/document.icns | Bin 914217 -> 0 bytes browser/branding/aurora/document.ico | Bin 91633 -> 0 bytes browser/branding/aurora/dsstore | Bin 12292 -> 0 bytes .../aurora/firefox.VisualElementsManifest.xml | 8 - browser/branding/aurora/firefox.icns | Bin 880996 -> 0 bytes browser/branding/aurora/firefox.ico | Bin 96012 -> 0 bytes .../aurora/locales/browserconfig.properties | 6 - browser/branding/aurora/locales/en-US/brand.dtd | 9 - .../branding/aurora/locales/en-US/brand.properties | 10 - browser/branding/aurora/locales/jar.mn | 12 - browser/branding/aurora/locales/moz.build | 9 - browser/branding/aurora/moz.build | 13 - browser/branding/aurora/mozicon128.png | Bin 20881 -> 0 bytes browser/branding/aurora/newtab.ico | Bin 6518 -> 0 bytes browser/branding/aurora/newwindow.ico | Bin 6518 -> 0 bytes browser/branding/aurora/particles.bmp | Bin 124216 -> 0 bytes browser/branding/aurora/pbmode.ico | Bin 6518 -> 0 bytes browser/branding/aurora/pencil-rtl.bmp | Bin 124214 -> 0 bytes browser/branding/aurora/pencil.bmp | Bin 124214 -> 0 bytes browser/branding/aurora/pref/firefox-branding.js | 36 - browser/branding/aurora/wizHeader.bmp | Bin 25820 -> 0 bytes browser/branding/aurora/wizHeaderRTL.bmp | Bin 25820 -> 0 bytes browser/branding/aurora/wizWatermark.bmp | Bin 154544 -> 0 bytes browser/branding/nightly/VisualElements_150.png | Bin 37693 -> 0 bytes browser/branding/nightly/VisualElements_70.png | Bin 11763 -> 0 bytes browser/branding/nightly/appname.bmp | Bin 176982 -> 0 bytes browser/branding/nightly/background.png | Bin 129900 -> 0 bytes browser/branding/nightly/bgintro.bmp | Bin 682144 -> 0 bytes browser/branding/nightly/branding.nsi | 45 - browser/branding/nightly/clock.bmp | Bin 124214 -> 0 bytes browser/branding/nightly/configure.sh | 5 - .../branding/nightly/content/about-background.png | Bin 162094 -> 0 bytes browser/branding/nightly/content/about-logo.png | Bin 44476 -> 0 bytes browser/branding/nightly/content/about-logo@2x.png | Bin 130345 -> 0 bytes .../branding/nightly/content/about-wordmark.svg | 36 - browser/branding/nightly/content/about.png | Bin 85792 -> 0 bytes browser/branding/nightly/content/aboutDialog.css | 29 - browser/branding/nightly/content/icon48.png | Bin 3937 -> 0 bytes browser/branding/nightly/content/icon64.png | Bin 5981 -> 0 bytes .../nightly/content/identity-icons-brand.svg | 7 - browser/branding/nightly/content/jar.mn | 19 - browser/branding/nightly/content/moz.build | 7 - browser/branding/nightly/content/silhouette-40.svg | 1360 -------------------- browser/branding/nightly/default16.png | Bin 939 -> 0 bytes browser/branding/nightly/default32.png | Bin 2590 -> 0 bytes browser/branding/nightly/default48.png | Bin 3937 -> 0 bytes browser/branding/nightly/disk.icns | Bin 891873 -> 0 bytes browser/branding/nightly/document.icns | Bin 809555 -> 0 bytes browser/branding/nightly/document.ico | Bin 84749 -> 0 bytes browser/branding/nightly/dsstore | Bin 12292 -> 0 bytes .../nightly/firefox.VisualElementsManifest.xml | 8 - browser/branding/nightly/firefox.icns | Bin 866586 -> 0 bytes browser/branding/nightly/firefox.ico | Bin 86932 -> 0 bytes .../nightly/locales/browserconfig.properties | 6 - browser/branding/nightly/locales/en-US/brand.dtd | 9 - .../nightly/locales/en-US/brand.properties | 10 - browser/branding/nightly/locales/jar.mn | 12 - browser/branding/nightly/locales/moz.build | 9 - browser/branding/nightly/moz.build | 13 - browser/branding/nightly/mozicon128.png | Bin 17364 -> 0 bytes browser/branding/nightly/newtab.ico | Bin 6518 -> 0 bytes browser/branding/nightly/newwindow.ico | Bin 6518 -> 0 bytes browser/branding/nightly/particles.bmp | Bin 124216 -> 0 bytes browser/branding/nightly/pbmode.ico | Bin 6518 -> 0 bytes browser/branding/nightly/pencil-rtl.bmp | Bin 124214 -> 0 bytes browser/branding/nightly/pencil.bmp | Bin 124214 -> 0 bytes browser/branding/nightly/pref/firefox-branding.js | 34 - browser/branding/nightly/wizHeader.bmp | Bin 25820 -> 0 bytes browser/branding/nightly/wizHeaderRTL.bmp | Bin 25820 -> 0 bytes browser/branding/nightly/wizWatermark.bmp | Bin 154544 -> 0 bytes 94 files changed, 1922 deletions(-) delete mode 100644 browser/branding/aurora/VisualElements_150.png delete mode 100644 browser/branding/aurora/VisualElements_70.png delete mode 100644 browser/branding/aurora/appname.bmp delete mode 100644 browser/branding/aurora/background.png delete mode 100644 browser/branding/aurora/bgintro.bmp delete mode 100644 browser/branding/aurora/branding.nsi delete mode 100644 browser/branding/aurora/clock.bmp delete mode 100644 browser/branding/aurora/configure.sh delete mode 100644 browser/branding/aurora/content/about-background.png delete mode 100644 browser/branding/aurora/content/about-logo.png delete mode 100644 browser/branding/aurora/content/about-logo@2x.png delete mode 100644 browser/branding/aurora/content/about-wordmark.svg delete mode 100644 browser/branding/aurora/content/about.png delete mode 100644 browser/branding/aurora/content/aboutDialog.css delete mode 100644 browser/branding/aurora/content/icon48.png delete mode 100644 browser/branding/aurora/content/icon64.png delete mode 100644 browser/branding/aurora/content/identity-icons-brand.svg delete mode 100644 browser/branding/aurora/content/jar.mn delete mode 100644 browser/branding/aurora/content/moz.build delete mode 100644 browser/branding/aurora/content/silhouette-40.svg delete mode 100644 browser/branding/aurora/default16.png delete mode 100644 browser/branding/aurora/default32.png delete mode 100644 browser/branding/aurora/default48.png delete mode 100644 browser/branding/aurora/disk.icns delete mode 100644 browser/branding/aurora/document.icns delete mode 100644 browser/branding/aurora/document.ico delete mode 100644 browser/branding/aurora/dsstore delete mode 100644 browser/branding/aurora/firefox.VisualElementsManifest.xml delete mode 100644 browser/branding/aurora/firefox.icns delete mode 100644 browser/branding/aurora/firefox.ico delete mode 100644 browser/branding/aurora/locales/browserconfig.properties delete mode 100644 browser/branding/aurora/locales/en-US/brand.dtd delete mode 100644 browser/branding/aurora/locales/en-US/brand.properties delete mode 100644 browser/branding/aurora/locales/jar.mn delete mode 100644 browser/branding/aurora/locales/moz.build delete mode 100644 browser/branding/aurora/moz.build delete mode 100644 browser/branding/aurora/mozicon128.png delete mode 100644 browser/branding/aurora/newtab.ico delete mode 100644 browser/branding/aurora/newwindow.ico delete mode 100644 browser/branding/aurora/particles.bmp delete mode 100644 browser/branding/aurora/pbmode.ico delete mode 100644 browser/branding/aurora/pencil-rtl.bmp delete mode 100644 browser/branding/aurora/pencil.bmp delete mode 100644 browser/branding/aurora/pref/firefox-branding.js delete mode 100644 browser/branding/aurora/wizHeader.bmp delete mode 100644 browser/branding/aurora/wizHeaderRTL.bmp delete mode 100644 browser/branding/aurora/wizWatermark.bmp delete mode 100644 browser/branding/nightly/VisualElements_150.png delete mode 100644 browser/branding/nightly/VisualElements_70.png delete mode 100644 browser/branding/nightly/appname.bmp delete mode 100644 browser/branding/nightly/background.png delete mode 100644 browser/branding/nightly/bgintro.bmp delete mode 100644 browser/branding/nightly/branding.nsi delete mode 100644 browser/branding/nightly/clock.bmp delete mode 100644 browser/branding/nightly/configure.sh delete mode 100644 browser/branding/nightly/content/about-background.png delete mode 100644 browser/branding/nightly/content/about-logo.png delete mode 100644 browser/branding/nightly/content/about-logo@2x.png delete mode 100644 browser/branding/nightly/content/about-wordmark.svg delete mode 100644 browser/branding/nightly/content/about.png delete mode 100644 browser/branding/nightly/content/aboutDialog.css delete mode 100644 browser/branding/nightly/content/icon48.png delete mode 100644 browser/branding/nightly/content/icon64.png delete mode 100644 browser/branding/nightly/content/identity-icons-brand.svg delete mode 100644 browser/branding/nightly/content/jar.mn delete mode 100644 browser/branding/nightly/content/moz.build delete mode 100644 browser/branding/nightly/content/silhouette-40.svg delete mode 100644 browser/branding/nightly/default16.png delete mode 100644 browser/branding/nightly/default32.png delete mode 100644 browser/branding/nightly/default48.png delete mode 100644 browser/branding/nightly/disk.icns delete mode 100644 browser/branding/nightly/document.icns delete mode 100644 browser/branding/nightly/document.ico delete mode 100644 browser/branding/nightly/dsstore delete mode 100644 browser/branding/nightly/firefox.VisualElementsManifest.xml delete mode 100644 browser/branding/nightly/firefox.icns delete mode 100644 browser/branding/nightly/firefox.ico delete mode 100644 browser/branding/nightly/locales/browserconfig.properties delete mode 100644 browser/branding/nightly/locales/en-US/brand.dtd delete mode 100644 browser/branding/nightly/locales/en-US/brand.properties delete mode 100644 browser/branding/nightly/locales/jar.mn delete mode 100644 browser/branding/nightly/locales/moz.build delete mode 100644 browser/branding/nightly/moz.build delete mode 100644 browser/branding/nightly/mozicon128.png delete mode 100644 browser/branding/nightly/newtab.ico delete mode 100644 browser/branding/nightly/newwindow.ico delete mode 100644 browser/branding/nightly/particles.bmp delete mode 100644 browser/branding/nightly/pbmode.ico delete mode 100644 browser/branding/nightly/pencil-rtl.bmp delete mode 100644 browser/branding/nightly/pencil.bmp delete mode 100644 browser/branding/nightly/pref/firefox-branding.js delete mode 100644 browser/branding/nightly/wizHeader.bmp delete mode 100644 browser/branding/nightly/wizHeaderRTL.bmp delete mode 100644 browser/branding/nightly/wizWatermark.bmp diff --git a/browser/branding/aurora/VisualElements_150.png b/browser/branding/aurora/VisualElements_150.png deleted file mode 100644 index 92370ee7a..000000000 Binary files a/browser/branding/aurora/VisualElements_150.png and /dev/null differ diff --git a/browser/branding/aurora/VisualElements_70.png b/browser/branding/aurora/VisualElements_70.png deleted file mode 100644 index aa206c51e..000000000 Binary files a/browser/branding/aurora/VisualElements_70.png and /dev/null differ diff --git a/browser/branding/aurora/appname.bmp b/browser/branding/aurora/appname.bmp deleted file mode 100644 index 904794ddb..000000000 Binary files a/browser/branding/aurora/appname.bmp and /dev/null differ diff --git a/browser/branding/aurora/background.png b/browser/branding/aurora/background.png deleted file mode 100644 index 704d1c2eb..000000000 Binary files a/browser/branding/aurora/background.png and /dev/null differ diff --git a/browser/branding/aurora/bgintro.bmp b/browser/branding/aurora/bgintro.bmp deleted file mode 100644 index 02ef9b336..000000000 Binary files a/browser/branding/aurora/bgintro.bmp and /dev/null differ diff --git a/browser/branding/aurora/branding.nsi b/browser/branding/aurora/branding.nsi deleted file mode 100644 index bb42794d1..000000000 --- a/browser/branding/aurora/branding.nsi +++ /dev/null @@ -1,49 +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/. - -# NSIS branding defines for Aurora builds. -# The official release build branding.nsi is located in other-license/branding/firefox/ -# The unofficial build branding.nsi is located in browser/branding/unofficial/ - -# BrandFullNameInternal is used for some registry and file system values -# instead of BrandFullName and typically should not be modified. -!define BrandFullNameInternal "Firefox Developer Edition" -!define BrandShortName "Firefox Developer Edition" -!define CompanyName "mozilla.org" -!define URLInfoAbout "https://www.mozilla.org" -!define HelpLink "https://support.mozilla.org" - -!define URLStubDownload "http://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-aurora-latest" -!define URLManualDownload "https://www.mozilla.org/${AB_CD}/firefox/installer-help/?channel=aurora&installer_lang=${AB_CD}" -!define URLSystemRequirements "https://www.mozilla.org/firefox/system-requirements/" -!define Channel "aurora" - -# The installer's certificate name and issuer expected by the stub installer -!define CertNameDownload "Mozilla Corporation" -!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA" - -# Dialog units are used so the UI displays correctly with the system's DPI -# settings. -# The dialog units for the bitmap's dimensions should match exactly with the -# bitmap's width and height in pixels. -!define APPNAME_BMP_WIDTH_DU 108u -!define APPNAME_BMP_HEIGHT_DU 48u -!define INTRO_BLURB_WIDTH_DU "232u" -!define INTRO_BLURB_EDGE_DU "196u" -!define INTRO_BLURB_LTR_TOP_DU "16u" -!define INTRO_BLURB_RTL_TOP_DU "11u" - -# UI Colors that can be customized for each channel -!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000 -!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999 -!define FOOTER_BKGRD_COLOR 0xFFFFFF -!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF -!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF -!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF -!define COMMON_TEXT_COLOR_NORMAL 0xFFFFFF -!define COMMON_TEXT_COLOR_FADED 0xA1AAB3 -!define COMMON_BKGRD_COLOR 0x0F1B26 - -# Enable DeveloperEdition-specific behavior -!define DEV_EDITION diff --git a/browser/branding/aurora/clock.bmp b/browser/branding/aurora/clock.bmp deleted file mode 100644 index c74398edb..000000000 Binary files a/browser/branding/aurora/clock.bmp and /dev/null differ diff --git a/browser/branding/aurora/configure.sh b/browser/branding/aurora/configure.sh deleted file mode 100644 index 36feb0828..000000000 --- a/browser/branding/aurora/configure.sh +++ /dev/null @@ -1,7 +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/. - -MOZ_APP_DISPLAYNAME=FirefoxDeveloperEdition -MOZ_APP_REMOTINGNAME=firefox-dev -MOZ_DEV_EDITION=1 diff --git a/browser/branding/aurora/content/about-background.png b/browser/branding/aurora/content/about-background.png deleted file mode 100644 index 1fd5c9c88..000000000 Binary files a/browser/branding/aurora/content/about-background.png and /dev/null differ diff --git a/browser/branding/aurora/content/about-logo.png b/browser/branding/aurora/content/about-logo.png deleted file mode 100644 index e3b7e1c8b..000000000 Binary files a/browser/branding/aurora/content/about-logo.png and /dev/null differ diff --git a/browser/branding/aurora/content/about-logo@2x.png b/browser/branding/aurora/content/about-logo@2x.png deleted file mode 100644 index 08dd73dd6..000000000 Binary files a/browser/branding/aurora/content/about-logo@2x.png and /dev/null differ diff --git a/browser/branding/aurora/content/about-wordmark.svg b/browser/branding/aurora/content/about-wordmark.svg deleted file mode 100644 index b1b435b7a..000000000 --- a/browser/branding/aurora/content/about-wordmark.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - diff --git a/browser/branding/aurora/content/about.png b/browser/branding/aurora/content/about.png deleted file mode 100644 index c7d54ef1c..000000000 Binary files a/browser/branding/aurora/content/about.png and /dev/null differ diff --git a/browser/branding/aurora/content/aboutDialog.css b/browser/branding/aurora/content/aboutDialog.css deleted file mode 100644 index 209c53244..000000000 --- a/browser/branding/aurora/content/aboutDialog.css +++ /dev/null @@ -1,34 +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/. */ - -#aboutDialogContainer { - background-image: url("chrome://branding/content/about-background.png"); - background-repeat: no-repeat; - background-color: rgb(26,58,99); - color: #fff; -} - -.text-link { - color: #fff !important; - text-decoration: underline; -} - -.text-link:-moz-focusring { - border-color: #fff; -} - -#rightBox { - /* this margin prevents text from overlapping the planet image */ - margin-left: 280px; - margin-right: 20px; -} - -#bottomBox { - padding: 15px 10px 15px; - background-color: rgba(0,0,0,.7); -} - -#version { - margin-top: 30px; -} diff --git a/browser/branding/aurora/content/icon48.png b/browser/branding/aurora/content/icon48.png deleted file mode 100644 index 85e3c0d4b..000000000 Binary files a/browser/branding/aurora/content/icon48.png and /dev/null differ diff --git a/browser/branding/aurora/content/icon64.png b/browser/branding/aurora/content/icon64.png deleted file mode 100644 index 4b90768d2..000000000 Binary files a/browser/branding/aurora/content/icon64.png and /dev/null differ diff --git a/browser/branding/aurora/content/identity-icons-brand.svg b/browser/branding/aurora/content/identity-icons-brand.svg deleted file mode 100644 index b284275bf..000000000 --- a/browser/branding/aurora/content/identity-icons-brand.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/browser/branding/aurora/content/jar.mn b/browser/branding/aurora/content/jar.mn deleted file mode 100644 index 140359a19..000000000 --- a/browser/branding/aurora/content/jar.mn +++ /dev/null @@ -1,19 +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/. - -browser.jar: -% content branding %content/branding/ contentaccessible=yes - content/branding/about.png - content/branding/about-background.png - content/branding/about-logo.png - content/branding/about-logo@2x.png - content/branding/about-wordmark.svg - content/branding/icon48.png - content/branding/icon64.png - content/branding/icon16.png (../default16.png) - content/branding/icon32.png (../default32.png) - content/branding/icon128.png (../mozicon128.png) - content/branding/identity-icons-brand.svg - content/branding/silhouette-40.svg - content/branding/aboutDialog.css diff --git a/browser/branding/aurora/content/moz.build b/browser/branding/aurora/content/moz.build deleted file mode 100644 index eb4454d28..000000000 --- a/browser/branding/aurora/content/moz.build +++ /dev/null @@ -1,7 +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/. - -JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/branding/aurora/content/silhouette-40.svg b/browser/branding/aurora/content/silhouette-40.svg deleted file mode 100644 index 5a41a1c3f..000000000 --- a/browser/branding/aurora/content/silhouette-40.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/browser/branding/aurora/default16.png b/browser/branding/aurora/default16.png deleted file mode 100644 index 3b2baaa8d..000000000 Binary files a/browser/branding/aurora/default16.png and /dev/null differ diff --git a/browser/branding/aurora/default32.png b/browser/branding/aurora/default32.png deleted file mode 100644 index 04cfba796..000000000 Binary files a/browser/branding/aurora/default32.png and /dev/null differ diff --git a/browser/branding/aurora/default48.png b/browser/branding/aurora/default48.png deleted file mode 100644 index 85e3c0d4b..000000000 Binary files a/browser/branding/aurora/default48.png and /dev/null differ diff --git a/browser/branding/aurora/disk.icns b/browser/branding/aurora/disk.icns deleted file mode 100644 index d9e0e6b61..000000000 Binary files a/browser/branding/aurora/disk.icns and /dev/null differ diff --git a/browser/branding/aurora/document.icns b/browser/branding/aurora/document.icns deleted file mode 100644 index 7eedd34ee..000000000 Binary files a/browser/branding/aurora/document.icns and /dev/null differ diff --git a/browser/branding/aurora/document.ico b/browser/branding/aurora/document.ico deleted file mode 100644 index 2402ac57f..000000000 Binary files a/browser/branding/aurora/document.ico and /dev/null differ diff --git a/browser/branding/aurora/dsstore b/browser/branding/aurora/dsstore deleted file mode 100644 index 4a5fa3f54..000000000 Binary files a/browser/branding/aurora/dsstore and /dev/null differ diff --git a/browser/branding/aurora/firefox.VisualElementsManifest.xml b/browser/branding/aurora/firefox.VisualElementsManifest.xml deleted file mode 100644 index 7654e0ab7..000000000 --- a/browser/branding/aurora/firefox.VisualElementsManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/browser/branding/aurora/firefox.icns b/browser/branding/aurora/firefox.icns deleted file mode 100644 index 662165bb3..000000000 Binary files a/browser/branding/aurora/firefox.icns and /dev/null differ diff --git a/browser/branding/aurora/firefox.ico b/browser/branding/aurora/firefox.ico deleted file mode 100644 index 4f1856b99..000000000 Binary files a/browser/branding/aurora/firefox.ico and /dev/null differ diff --git a/browser/branding/aurora/locales/browserconfig.properties b/browser/branding/aurora/locales/browserconfig.properties deleted file mode 100644 index 06cefece3..000000000 --- a/browser/branding/aurora/locales/browserconfig.properties +++ /dev/null @@ -1,6 +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/. - -# Do NOT localize or otherwise change these values -browser.startup.homepage=about:home diff --git a/browser/branding/aurora/locales/en-US/brand.dtd b/browser/branding/aurora/locales/en-US/brand.dtd deleted file mode 100644 index 9598f79b0..000000000 --- a/browser/branding/aurora/locales/en-US/brand.dtd +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/browser/branding/aurora/locales/en-US/brand.properties b/browser/branding/aurora/locales/en-US/brand.properties deleted file mode 100644 index e49d0ae86..000000000 --- a/browser/branding/aurora/locales/en-US/brand.properties +++ /dev/null @@ -1,10 +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/. - -brandShorterName=Firefox -brandShortName=Firefox Developer Edition -brandFullName=Firefox Developer Edition -vendorShortName=Mozilla - -syncBrandShortName=Sync diff --git a/browser/branding/aurora/locales/jar.mn b/browser/branding/aurora/locales/jar.mn deleted file mode 100644 index 24880ad7d..000000000 --- a/browser/branding/aurora/locales/jar.mn +++ /dev/null @@ -1,12 +0,0 @@ -#filter substitution -# 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/. - - -@AB_CD@.jar: -% locale branding @AB_CD@ %locale/branding/ -# Aurora branding only exists in en-US - locale/branding/brand.dtd (en-US/brand.dtd) - locale/branding/brand.properties (en-US/brand.properties) - locale/branding/browserconfig.properties diff --git a/browser/branding/aurora/locales/moz.build b/browser/branding/aurora/locales/moz.build deleted file mode 100644 index 8bad13124..000000000 --- a/browser/branding/aurora/locales/moz.build +++ /dev/null @@ -1,9 +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/. - -DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID'] - -JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/branding/aurora/moz.build b/browser/branding/aurora/moz.build deleted file mode 100644 index 9045cee11..000000000 --- a/browser/branding/aurora/moz.build +++ /dev/null @@ -1,13 +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/. - -DIRS += ['content', 'locales'] - -DIST_SUBDIR = 'browser' -export('DIST_SUBDIR') - -include('../branding-common.mozbuild') -FirefoxBranding() diff --git a/browser/branding/aurora/mozicon128.png b/browser/branding/aurora/mozicon128.png deleted file mode 100644 index 2822bf449..000000000 Binary files a/browser/branding/aurora/mozicon128.png and /dev/null differ diff --git a/browser/branding/aurora/newtab.ico b/browser/branding/aurora/newtab.ico deleted file mode 100644 index a9b37c08c..000000000 Binary files a/browser/branding/aurora/newtab.ico and /dev/null differ diff --git a/browser/branding/aurora/newwindow.ico b/browser/branding/aurora/newwindow.ico deleted file mode 100644 index 553720771..000000000 Binary files a/browser/branding/aurora/newwindow.ico and /dev/null differ diff --git a/browser/branding/aurora/particles.bmp b/browser/branding/aurora/particles.bmp deleted file mode 100644 index ab74ce047..000000000 Binary files a/browser/branding/aurora/particles.bmp and /dev/null differ diff --git a/browser/branding/aurora/pbmode.ico b/browser/branding/aurora/pbmode.ico deleted file mode 100644 index 47677c13f..000000000 Binary files a/browser/branding/aurora/pbmode.ico and /dev/null differ diff --git a/browser/branding/aurora/pencil-rtl.bmp b/browser/branding/aurora/pencil-rtl.bmp deleted file mode 100644 index e50d92db7..000000000 Binary files a/browser/branding/aurora/pencil-rtl.bmp and /dev/null differ diff --git a/browser/branding/aurora/pencil.bmp b/browser/branding/aurora/pencil.bmp deleted file mode 100644 index 252c10f41..000000000 Binary files a/browser/branding/aurora/pencil.bmp and /dev/null differ diff --git a/browser/branding/aurora/pref/firefox-branding.js b/browser/branding/aurora/pref/firefox-branding.js deleted file mode 100644 index 9f005b857..000000000 --- a/browser/branding/aurora/pref/firefox-branding.js +++ /dev/null @@ -1,36 +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/. */ - -pref("startup.homepage_override_url", ""); -pref("startup.homepage_welcome_url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/firstrun/"); -pref("startup.homepage_welcome_url.additional", ""); -// The time interval between checks for a new version (in seconds) -pref("app.update.interval", 28800); // 8 hours -// The time interval between the downloading of mar file chunks in the -// background (in seconds) -// 0 means "download everything at once" -pref("app.update.download.backgroundInterval", 0); -// Give the user x seconds to react before showing the big UI. default=192 hours -pref("app.update.promptWaitTime", 691200); -// URL user can browse to manually if for some reason all update installation -// attempts fail. -pref("app.update.url.manual", "https://www.mozilla.org/firefox/aurora/"); -// A default value for the "More information about this update" link -// supplied in the "An update is available" page of the update wizard. -pref("app.update.url.details", "https://www.mozilla.org/firefox/aurora/"); - -// The number of days a binary is permitted to be old -// without checking for an update. This assumes that -// app.update.checkInstallTime is true. -pref("app.update.checkInstallTime.days", 2); - -// Give the user x seconds to reboot before showing a badge on the hamburger -// button. default=4 days -pref("app.update.badgeWaitTime", 345600); - -// Number of usages of the web console or scratchpad. -// If this is less than 5, then pasting code into the web console or scratchpad is disabled -pref("devtools.selfxss.count", 5); diff --git a/browser/branding/aurora/wizHeader.bmp b/browser/branding/aurora/wizHeader.bmp deleted file mode 100644 index 32aefb96e..000000000 Binary files a/browser/branding/aurora/wizHeader.bmp and /dev/null differ diff --git a/browser/branding/aurora/wizHeaderRTL.bmp b/browser/branding/aurora/wizHeaderRTL.bmp deleted file mode 100644 index 5f0ccb1c4..000000000 Binary files a/browser/branding/aurora/wizHeaderRTL.bmp and /dev/null differ diff --git a/browser/branding/aurora/wizWatermark.bmp b/browser/branding/aurora/wizWatermark.bmp deleted file mode 100644 index 56c6c3103..000000000 Binary files a/browser/branding/aurora/wizWatermark.bmp and /dev/null differ diff --git a/browser/branding/nightly/VisualElements_150.png b/browser/branding/nightly/VisualElements_150.png deleted file mode 100644 index 461961e8d..000000000 Binary files a/browser/branding/nightly/VisualElements_150.png and /dev/null differ diff --git a/browser/branding/nightly/VisualElements_70.png b/browser/branding/nightly/VisualElements_70.png deleted file mode 100644 index aad81f40d..000000000 Binary files a/browser/branding/nightly/VisualElements_70.png and /dev/null differ diff --git a/browser/branding/nightly/appname.bmp b/browser/branding/nightly/appname.bmp deleted file mode 100644 index fc1b6343c..000000000 Binary files a/browser/branding/nightly/appname.bmp and /dev/null differ diff --git a/browser/branding/nightly/background.png b/browser/branding/nightly/background.png deleted file mode 100644 index db5576a33..000000000 Binary files a/browser/branding/nightly/background.png and /dev/null differ diff --git a/browser/branding/nightly/bgintro.bmp b/browser/branding/nightly/bgintro.bmp deleted file mode 100644 index 777ab2e84..000000000 Binary files a/browser/branding/nightly/bgintro.bmp and /dev/null differ diff --git a/browser/branding/nightly/branding.nsi b/browser/branding/nightly/branding.nsi deleted file mode 100644 index fa13b32c6..000000000 --- a/browser/branding/nightly/branding.nsi +++ /dev/null @@ -1,45 +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/. - -# NSIS branding defines for nightly builds. -# The official release build branding.nsi is located in other-license/branding/firefox/ -# The unofficial build branding.nsi is located in browser/branding/unofficial/ - -# BrandFullNameInternal is used for some registry and file system values -# instead of BrandFullName and typically should not be modified. -!define BrandFullNameInternal "Nightly" -!define CompanyName "mozilla.org" -!define URLInfoAbout "https://www.mozilla.org" -!define HelpLink "https://support.mozilla.org" - -!define URLStubDownload "http://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-nightly-latest" -!define URLManualDownload "https://www.mozilla.org/${AB_CD}/firefox/installer-help/?channel=nightly&installer_lang=${AB_CD}" -!define URLSystemRequirements "https://www.mozilla.org/firefox/system-requirements/" -!define Channel "nightly" - -# The installer's certificate name and issuer expected by the stub installer -!define CertNameDownload "Mozilla Corporation" -!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA" - -# Dialog units are used so the UI displays correctly with the system's DPI -# settings. -# The dialog units for the bitmap's dimensions should match exactly with the -# bitmap's width and height in pixels. -!define APPNAME_BMP_WIDTH_DU 159u -!define APPNAME_BMP_HEIGHT_DU 28u -!define INTRO_BLURB_WIDTH_DU "230u" -!define INTRO_BLURB_EDGE_DU "198u" -!define INTRO_BLURB_LTR_TOP_DU "16u" -!define INTRO_BLURB_RTL_TOP_DU "11u" - -# UI Colors that can be customized for each channel -!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000 -!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999 -!define FOOTER_BKGRD_COLOR 0xFFFFFF -!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF -!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF -!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF -!define COMMON_TEXT_COLOR_NORMAL 0xFFFFFF -!define COMMON_TEXT_COLOR_FADED 0xA1AAB3 -!define COMMON_BKGRD_COLOR 0x0F1B26 diff --git a/browser/branding/nightly/clock.bmp b/browser/branding/nightly/clock.bmp deleted file mode 100644 index c74398edb..000000000 Binary files a/browser/branding/nightly/clock.bmp and /dev/null differ diff --git a/browser/branding/nightly/configure.sh b/browser/branding/nightly/configure.sh deleted file mode 100644 index edd3bd3e8..000000000 --- a/browser/branding/nightly/configure.sh +++ /dev/null @@ -1,5 +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/. - -MOZ_APP_DISPLAYNAME=Nightly diff --git a/browser/branding/nightly/content/about-background.png b/browser/branding/nightly/content/about-background.png deleted file mode 100644 index b572ab237..000000000 Binary files a/browser/branding/nightly/content/about-background.png and /dev/null differ diff --git a/browser/branding/nightly/content/about-logo.png b/browser/branding/nightly/content/about-logo.png deleted file mode 100644 index cd985a92f..000000000 Binary files a/browser/branding/nightly/content/about-logo.png and /dev/null differ diff --git a/browser/branding/nightly/content/about-logo@2x.png b/browser/branding/nightly/content/about-logo@2x.png deleted file mode 100644 index fb12dfbd7..000000000 Binary files a/browser/branding/nightly/content/about-logo@2x.png and /dev/null differ diff --git a/browser/branding/nightly/content/about-wordmark.svg b/browser/branding/nightly/content/about-wordmark.svg deleted file mode 100644 index 6f71130b4..000000000 --- a/browser/branding/nightly/content/about-wordmark.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - diff --git a/browser/branding/nightly/content/about.png b/browser/branding/nightly/content/about.png deleted file mode 100644 index 5917b1e11..000000000 Binary files a/browser/branding/nightly/content/about.png and /dev/null differ diff --git a/browser/branding/nightly/content/aboutDialog.css b/browser/branding/nightly/content/aboutDialog.css deleted file mode 100644 index f0df8b1aa..000000000 --- a/browser/branding/nightly/content/aboutDialog.css +++ /dev/null @@ -1,29 +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/. */ - -#aboutDialogContainer { - background-image: url("chrome://branding/content/about-background.png"); - background-repeat: no-repeat; - background-color: rgb(10,17,37); - color: #fff; -} - -.text-link { - color: #fff !important; - text-decoration: underline; -} - -.text-link:-moz-focusring { - border-color: #fff; -} - -#rightBox { - /* this margin prevents text from overlapping the planet image */ - margin-left: 280px; - margin-right: 20px; -} - -#bottomBox { - background-color: rgba(0,0,0,.7); -} diff --git a/browser/branding/nightly/content/icon48.png b/browser/branding/nightly/content/icon48.png deleted file mode 100644 index 88a307340..000000000 Binary files a/browser/branding/nightly/content/icon48.png and /dev/null differ diff --git a/browser/branding/nightly/content/icon64.png b/browser/branding/nightly/content/icon64.png deleted file mode 100644 index 2eab258cb..000000000 Binary files a/browser/branding/nightly/content/icon64.png and /dev/null differ diff --git a/browser/branding/nightly/content/identity-icons-brand.svg b/browser/branding/nightly/content/identity-icons-brand.svg deleted file mode 100644 index 6c33113e5..000000000 --- a/browser/branding/nightly/content/identity-icons-brand.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/browser/branding/nightly/content/jar.mn b/browser/branding/nightly/content/jar.mn deleted file mode 100644 index 140359a19..000000000 --- a/browser/branding/nightly/content/jar.mn +++ /dev/null @@ -1,19 +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/. - -browser.jar: -% content branding %content/branding/ contentaccessible=yes - content/branding/about.png - content/branding/about-background.png - content/branding/about-logo.png - content/branding/about-logo@2x.png - content/branding/about-wordmark.svg - content/branding/icon48.png - content/branding/icon64.png - content/branding/icon16.png (../default16.png) - content/branding/icon32.png (../default32.png) - content/branding/icon128.png (../mozicon128.png) - content/branding/identity-icons-brand.svg - content/branding/silhouette-40.svg - content/branding/aboutDialog.css diff --git a/browser/branding/nightly/content/moz.build b/browser/branding/nightly/content/moz.build deleted file mode 100644 index eb4454d28..000000000 --- a/browser/branding/nightly/content/moz.build +++ /dev/null @@ -1,7 +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/. - -JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/branding/nightly/content/silhouette-40.svg b/browser/branding/nightly/content/silhouette-40.svg deleted file mode 100644 index bef723b59..000000000 --- a/browser/branding/nightly/content/silhouette-40.svg +++ /dev/null @@ -1,1360 +0,0 @@ - - - - - diff --git a/browser/branding/nightly/default16.png b/browser/branding/nightly/default16.png deleted file mode 100644 index ace90e53c..000000000 Binary files a/browser/branding/nightly/default16.png and /dev/null differ diff --git a/browser/branding/nightly/default32.png b/browser/branding/nightly/default32.png deleted file mode 100644 index b62d0200f..000000000 Binary files a/browser/branding/nightly/default32.png and /dev/null differ diff --git a/browser/branding/nightly/default48.png b/browser/branding/nightly/default48.png deleted file mode 100644 index 88a307340..000000000 Binary files a/browser/branding/nightly/default48.png and /dev/null differ diff --git a/browser/branding/nightly/disk.icns b/browser/branding/nightly/disk.icns deleted file mode 100644 index c49b7b878..000000000 Binary files a/browser/branding/nightly/disk.icns and /dev/null differ diff --git a/browser/branding/nightly/document.icns b/browser/branding/nightly/document.icns deleted file mode 100644 index 98b461d75..000000000 Binary files a/browser/branding/nightly/document.icns and /dev/null differ diff --git a/browser/branding/nightly/document.ico b/browser/branding/nightly/document.ico deleted file mode 100644 index 796181004..000000000 Binary files a/browser/branding/nightly/document.ico and /dev/null differ diff --git a/browser/branding/nightly/dsstore b/browser/branding/nightly/dsstore deleted file mode 100644 index 657101d6e..000000000 Binary files a/browser/branding/nightly/dsstore and /dev/null differ diff --git a/browser/branding/nightly/firefox.VisualElementsManifest.xml b/browser/branding/nightly/firefox.VisualElementsManifest.xml deleted file mode 100644 index 7654e0ab7..000000000 --- a/browser/branding/nightly/firefox.VisualElementsManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/browser/branding/nightly/firefox.icns b/browser/branding/nightly/firefox.icns deleted file mode 100644 index 858cb2a19..000000000 Binary files a/browser/branding/nightly/firefox.icns and /dev/null differ diff --git a/browser/branding/nightly/firefox.ico b/browser/branding/nightly/firefox.ico deleted file mode 100644 index 12bebb1c2..000000000 Binary files a/browser/branding/nightly/firefox.ico and /dev/null differ diff --git a/browser/branding/nightly/locales/browserconfig.properties b/browser/branding/nightly/locales/browserconfig.properties deleted file mode 100644 index 06cefece3..000000000 --- a/browser/branding/nightly/locales/browserconfig.properties +++ /dev/null @@ -1,6 +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/. - -# Do NOT localize or otherwise change these values -browser.startup.homepage=about:home diff --git a/browser/branding/nightly/locales/en-US/brand.dtd b/browser/branding/nightly/locales/en-US/brand.dtd deleted file mode 100644 index cf4596ae0..000000000 --- a/browser/branding/nightly/locales/en-US/brand.dtd +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/browser/branding/nightly/locales/en-US/brand.properties b/browser/branding/nightly/locales/en-US/brand.properties deleted file mode 100644 index 8cd2c2ec9..000000000 --- a/browser/branding/nightly/locales/en-US/brand.properties +++ /dev/null @@ -1,10 +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/. - -brandShorterName=Nightly -brandShortName=Nightly -brandFullName=Nightly -vendorShortName=Mozilla - -syncBrandShortName=Sync diff --git a/browser/branding/nightly/locales/jar.mn b/browser/branding/nightly/locales/jar.mn deleted file mode 100644 index 63af8f6f9..000000000 --- a/browser/branding/nightly/locales/jar.mn +++ /dev/null @@ -1,12 +0,0 @@ -#filter substitution -# 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/. - - -@AB_CD@.jar: -% locale branding @AB_CD@ %locale/branding/ -# Nightly branding only exists in en-US - locale/branding/brand.dtd (en-US/brand.dtd) - locale/branding/brand.properties (en-US/brand.properties) - locale/branding/browserconfig.properties diff --git a/browser/branding/nightly/locales/moz.build b/browser/branding/nightly/locales/moz.build deleted file mode 100644 index 8bad13124..000000000 --- a/browser/branding/nightly/locales/moz.build +++ /dev/null @@ -1,9 +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/. - -DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID'] - -JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/branding/nightly/moz.build b/browser/branding/nightly/moz.build deleted file mode 100644 index 9045cee11..000000000 --- a/browser/branding/nightly/moz.build +++ /dev/null @@ -1,13 +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/. - -DIRS += ['content', 'locales'] - -DIST_SUBDIR = 'browser' -export('DIST_SUBDIR') - -include('../branding-common.mozbuild') -FirefoxBranding() diff --git a/browser/branding/nightly/mozicon128.png b/browser/branding/nightly/mozicon128.png deleted file mode 100644 index 4222e6814..000000000 Binary files a/browser/branding/nightly/mozicon128.png and /dev/null differ diff --git a/browser/branding/nightly/newtab.ico b/browser/branding/nightly/newtab.ico deleted file mode 100644 index a9b37c08c..000000000 Binary files a/browser/branding/nightly/newtab.ico and /dev/null differ diff --git a/browser/branding/nightly/newwindow.ico b/browser/branding/nightly/newwindow.ico deleted file mode 100644 index 553720771..000000000 Binary files a/browser/branding/nightly/newwindow.ico and /dev/null differ diff --git a/browser/branding/nightly/particles.bmp b/browser/branding/nightly/particles.bmp deleted file mode 100644 index ab74ce047..000000000 Binary files a/browser/branding/nightly/particles.bmp and /dev/null differ diff --git a/browser/branding/nightly/pbmode.ico b/browser/branding/nightly/pbmode.ico deleted file mode 100644 index 47677c13f..000000000 Binary files a/browser/branding/nightly/pbmode.ico and /dev/null differ diff --git a/browser/branding/nightly/pencil-rtl.bmp b/browser/branding/nightly/pencil-rtl.bmp deleted file mode 100644 index e50d92db7..000000000 Binary files a/browser/branding/nightly/pencil-rtl.bmp and /dev/null differ diff --git a/browser/branding/nightly/pencil.bmp b/browser/branding/nightly/pencil.bmp deleted file mode 100644 index 252c10f41..000000000 Binary files a/browser/branding/nightly/pencil.bmp and /dev/null differ diff --git a/browser/branding/nightly/pref/firefox-branding.js b/browser/branding/nightly/pref/firefox-branding.js deleted file mode 100644 index 359d6bb6e..000000000 --- a/browser/branding/nightly/pref/firefox-branding.js +++ /dev/null @@ -1,34 +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/. */ - -pref("startup.homepage_override_url", "https://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/?oldversion=%OLD_VERSION%"); -pref("startup.homepage_welcome_url", "https://www.mozilla.org/projects/firefox/%VERSION%/firstrun/"); -pref("startup.homepage_welcome_url.additional", ""); -// The time interval between checks for a new version (in seconds) -pref("app.update.interval", 7200); // 2 hours -// The time interval between the downloading of mar file chunks in the -// background (in seconds) -// 0 means "download everything at once" -pref("app.update.download.backgroundInterval", 0); -// Give the user x seconds to react before showing the big UI. default=12 hours -pref("app.update.promptWaitTime", 43200); -// URL user can browse to manually if for some reason all update installation -// attempts fail. -pref("app.update.url.manual", "https://nightly.mozilla.org"); -// A default value for the "More information about this update" link -// supplied in the "An update is available" page of the update wizard. -pref("app.update.url.details", "https://nightly.mozilla.org"); - -// The number of days a binary is permitted to be old -// without checking for an update. This assumes that -// app.update.checkInstallTime is true. -pref("app.update.checkInstallTime.days", 2); - -// Give the user x seconds to reboot before showing a badge on the hamburger -// button. default=immediately -pref("app.update.badgeWaitTime", 0); - -// Number of usages of the web console or scratchpad. -// If this is less than 5, then pasting code into the web console or scratchpad is disabled -pref("devtools.selfxss.count", 5); diff --git a/browser/branding/nightly/wizHeader.bmp b/browser/branding/nightly/wizHeader.bmp deleted file mode 100644 index ac96070a8..000000000 Binary files a/browser/branding/nightly/wizHeader.bmp and /dev/null differ diff --git a/browser/branding/nightly/wizHeaderRTL.bmp b/browser/branding/nightly/wizHeaderRTL.bmp deleted file mode 100644 index 710af4a8e..000000000 Binary files a/browser/branding/nightly/wizHeaderRTL.bmp and /dev/null differ diff --git a/browser/branding/nightly/wizWatermark.bmp b/browser/branding/nightly/wizWatermark.bmp deleted file mode 100644 index 86d929cc1..000000000 Binary files a/browser/branding/nightly/wizWatermark.bmp and /dev/null differ -- cgit v1.2.3 From 4809c6de7764673eb401a961e314e72ad31d0dbd Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 5 Feb 2018 02:13:44 -0500 Subject: Use app.releaseNotesURL preference instead of a hardcoded URL in the Basilisk about box --- browser/base/content/aboutDialog.js | 4 ++++ browser/base/content/aboutDialog.xul | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index 569a65adb..b024d2d52 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -62,6 +62,10 @@ function init(aEvent) let arch = bundle.GetStringFromName(archResource); versionField.textContent += ` (${arch})`; + // Get Release Notes URL from Preferences + let releaseNotesURL = Services.prefs.getCharPref("app.releaseNotesURL"); + document.getElementById("releasenotes").setAttribute("href", releaseNotesURL); + if (AppConstants.MOZ_UPDATER) { gAppUpdater = new appUpdater(); diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul index cbb07a5e1..ef2804f31 100644 --- a/browser/base/content/aboutDialog.xul +++ b/browser/base/content/aboutDialog.xul @@ -47,7 +47,7 @@ #expand #ifndef NIGHTLY_BUILD -#expand + #endif -- cgit v1.2.3 From ac7d8a02b874485ec68d1b25e9ebd938f48e976e Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 5 Feb 2018 02:23:23 -0500 Subject: Update branding --- browser/branding/official/VisualElements_150.png | Bin 36640 -> 26980 bytes browser/branding/official/VisualElements_70.png | Bin 12083 -> 8871 bytes .../official/basilisk.VisualElementsManifest.xml | 8 ++ browser/branding/official/branding.nsi | 20 ++--- browser/branding/official/configure.sh | 2 +- browser/branding/official/content/about-logo.png | Bin 30788 -> 14030 bytes .../branding/official/content/about-logo@2x.png | Bin 78972 -> 34550 bytes .../branding/official/content/about-wordmark.png | Bin 5186 -> 2645 bytes browser/branding/official/content/about.png | Bin 33169 -> 21948 bytes browser/branding/official/content/aboutDialog.css | 6 ++ browser/branding/official/content/icon48.png | Bin 4096 -> 2809 bytes browser/branding/official/content/icon64.png | Bin 6081 -> 3900 bytes .../official/content/identity-icons-brand.svg | 76 ++++++++++++++++++- .../branding/official/content/silhouette-40.svg | 84 ++++++++++++++------- browser/branding/official/default16.png | Bin 829 -> 820 bytes browser/branding/official/default22.png | Bin 1319 -> 1202 bytes browser/branding/official/default24.png | Bin 1327 -> 1321 bytes browser/branding/official/default256.png | Bin 44148 -> 20203 bytes browser/branding/official/default32.png | Bin 2472 -> 1786 bytes browser/branding/official/default48.png | Bin 4096 -> 2809 bytes browser/branding/official/default64.png | Bin 0 -> 3900 bytes browser/branding/official/document.ico | Bin 72937 -> 39039 bytes .../official/firefox.VisualElementsManifest.xml | 8 -- browser/branding/official/firefox.ico | Bin 85989 -> 44539 bytes browser/branding/official/locales/en-US/brand.dtd | 10 +-- .../official/locales/en-US/brand.properties | 10 +-- browser/branding/official/moz.build | 52 ++++++++++++- browser/branding/official/mozicon128.png | Bin 17225 -> 8635 bytes browser/branding/official/pref/firefox-branding.js | 36 +++++++-- browser/branding/official/wizHeader.bmp | Bin 25820 -> 25818 bytes browser/branding/official/wizHeaderRTL.bmp | Bin 25820 -> 25818 bytes browser/branding/official/wizWatermark.bmp | Bin 154544 -> 154542 bytes browser/config/version.txt | 2 +- browser/config/version_display.txt | 2 +- browser/confvars.sh | 53 ++++++------- 35 files changed, 271 insertions(+), 98 deletions(-) create mode 100644 browser/branding/official/basilisk.VisualElementsManifest.xml create mode 100644 browser/branding/official/default64.png delete mode 100644 browser/branding/official/firefox.VisualElementsManifest.xml diff --git a/browser/branding/official/VisualElements_150.png b/browser/branding/official/VisualElements_150.png index f46b957c2..70b256398 100644 Binary files a/browser/branding/official/VisualElements_150.png and b/browser/branding/official/VisualElements_150.png differ diff --git a/browser/branding/official/VisualElements_70.png b/browser/branding/official/VisualElements_70.png index b45a3400f..64ce3276d 100644 Binary files a/browser/branding/official/VisualElements_70.png and b/browser/branding/official/VisualElements_70.png differ diff --git a/browser/branding/official/basilisk.VisualElementsManifest.xml b/browser/branding/official/basilisk.VisualElementsManifest.xml new file mode 100644 index 000000000..d675d573f --- /dev/null +++ b/browser/branding/official/basilisk.VisualElementsManifest.xml @@ -0,0 +1,8 @@ + + + diff --git a/browser/branding/official/branding.nsi b/browser/branding/official/branding.nsi index 5960f3107..24b0f4bba 100644 --- a/browser/branding/official/branding.nsi +++ b/browser/branding/official/branding.nsi @@ -8,24 +8,24 @@ # BrandFullNameInternal is used for some registry and file system values # instead of BrandFullName and typically should not be modified. -!define BrandFullNameInternal "Mozilla Firefox" -!define CompanyName "Mozilla Corporation" -!define URLInfoAbout "https://www.mozilla.org" -!define URLUpdateInfo "https://www.mozilla.org/firefox/${AppVersion}/releasenotes" -!define HelpLink "https://support.mozilla.org" +!define BrandFullNameInternal "Basilisk" +!define CompanyName "Moonchild Productions" +!define URLInfoAbout "https://www.basilisk-browser.org" +!define URLUpdateInfo "https://www.basilisk-browser.org/releasenotes.shtml" +!define HelpLink "https://www.basilisk-browser.org" ; The OFFICIAL define is a workaround to support different urls for Release and ; Beta since they share the same branding when building with other branches that ; set the update channel to beta. !define OFFICIAL -!define URLStubDownload "http://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-latest" -!define URLManualDownload "https://www.mozilla.org/${AB_CD}/firefox/installer-help/?channel=release&installer_lang=${AB_CD}" -!define URLSystemRequirements "https://www.mozilla.org/firefox/system-requirements/" +!define URLStubDownload "" +!define URLManualDownload "" +!define URLSystemRequirements "" !define Channel "release" # The installer's certificate name and issuer expected by the stub installer -!define CertNameDownload "Mozilla Corporation" -!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA" +!define CertNameDownload "" +!define CertIssuerDownload "" # Dialog units are used so the UI displays correctly with the system's DPI # settings. diff --git a/browser/branding/official/configure.sh b/browser/branding/official/configure.sh index 92ef14e03..49126c4aa 100644 --- a/browser/branding/official/configure.sh +++ b/browser/branding/official/configure.sh @@ -2,4 +2,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/. -MOZ_APP_DISPLAYNAME=Firefox +MOZ_APP_DISPLAYNAME=Basilisk diff --git a/browser/branding/official/content/about-logo.png b/browser/branding/official/content/about-logo.png index c7c5ac2b8..a6c89cf2c 100644 Binary files a/browser/branding/official/content/about-logo.png and b/browser/branding/official/content/about-logo.png differ diff --git a/browser/branding/official/content/about-logo@2x.png b/browser/branding/official/content/about-logo@2x.png index 624ad150f..761e47f6e 100644 Binary files a/browser/branding/official/content/about-logo@2x.png and b/browser/branding/official/content/about-logo@2x.png differ diff --git a/browser/branding/official/content/about-wordmark.png b/browser/branding/official/content/about-wordmark.png index c9651b520..4ac8d3557 100644 Binary files a/browser/branding/official/content/about-wordmark.png and b/browser/branding/official/content/about-wordmark.png differ diff --git a/browser/branding/official/content/about.png b/browser/branding/official/content/about.png index 7d78057dc..4fc6e5c36 100644 Binary files a/browser/branding/official/content/about.png and b/browser/branding/official/content/about.png differ diff --git a/browser/branding/official/content/aboutDialog.css b/browser/branding/official/content/aboutDialog.css index 46ba1b771..631f06a72 100644 --- a/browser/branding/official/content/aboutDialog.css +++ b/browser/branding/official/content/aboutDialog.css @@ -28,8 +28,14 @@ #rightBox { margin-left: 30px; margin-right: 30px; + background-image: url("chrome://branding/content/about-wordmark.png"); + background-repeat: no-repeat; + /* padding-top creates room for the wordmark */ + padding-top: 38px; + margin-top:20px; } + #updateDeck > hbox > label:not([class="text-link"]) { color: #909090; } diff --git a/browser/branding/official/content/icon48.png b/browser/branding/official/content/icon48.png index 10de89172..e7dcd8ae2 100644 Binary files a/browser/branding/official/content/icon48.png and b/browser/branding/official/content/icon48.png differ diff --git a/browser/branding/official/content/icon64.png b/browser/branding/official/content/icon64.png index ac94fb47d..7bad34f8b 100644 Binary files a/browser/branding/official/content/icon64.png and b/browser/branding/official/content/icon64.png differ diff --git a/browser/branding/official/content/identity-icons-brand.svg b/browser/branding/official/content/identity-icons-brand.svg index 380e4e597..80d2155c2 100644 --- a/browser/branding/official/content/identity-icons-brand.svg +++ b/browser/branding/official/content/identity-icons-brand.svg @@ -1,7 +1,77 @@ - + - - + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/browser/branding/official/content/silhouette-40.svg b/browser/branding/official/content/silhouette-40.svg index 5a41a1c3f..c00a38cb1 100644 --- a/browser/branding/official/content/silhouette-40.svg +++ b/browser/branding/official/content/silhouette-40.svg @@ -1,26 +1,58 @@ - - - - - + + + + + + + + image/svg+xml + + + + + + + + diff --git a/browser/branding/official/default16.png b/browser/branding/official/default16.png index 33ebba13b..6618c0667 100644 Binary files a/browser/branding/official/default16.png and b/browser/branding/official/default16.png differ diff --git a/browser/branding/official/default22.png b/browser/branding/official/default22.png index 2390f0924..d53d5b503 100644 Binary files a/browser/branding/official/default22.png and b/browser/branding/official/default22.png differ diff --git a/browser/branding/official/default24.png b/browser/branding/official/default24.png index 737466b5a..1e86c0cdd 100644 Binary files a/browser/branding/official/default24.png and b/browser/branding/official/default24.png differ diff --git a/browser/branding/official/default256.png b/browser/branding/official/default256.png index eef767dab..96f72ae15 100644 Binary files a/browser/branding/official/default256.png and b/browser/branding/official/default256.png differ diff --git a/browser/branding/official/default32.png b/browser/branding/official/default32.png index e9d5bbb4b..ac39ccf0d 100644 Binary files a/browser/branding/official/default32.png and b/browser/branding/official/default32.png differ diff --git a/browser/branding/official/default48.png b/browser/branding/official/default48.png index 10de89172..e7dcd8ae2 100644 Binary files a/browser/branding/official/default48.png and b/browser/branding/official/default48.png differ diff --git a/browser/branding/official/default64.png b/browser/branding/official/default64.png new file mode 100644 index 000000000..7bad34f8b Binary files /dev/null and b/browser/branding/official/default64.png differ diff --git a/browser/branding/official/document.ico b/browser/branding/official/document.ico index 0957f61e3..525b1a929 100644 Binary files a/browser/branding/official/document.ico and b/browser/branding/official/document.ico differ diff --git a/browser/branding/official/firefox.VisualElementsManifest.xml b/browser/branding/official/firefox.VisualElementsManifest.xml deleted file mode 100644 index d675d573f..000000000 --- a/browser/branding/official/firefox.VisualElementsManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/browser/branding/official/firefox.ico b/browser/branding/official/firefox.ico index 85ffedfe6..320796dd2 100644 Binary files a/browser/branding/official/firefox.ico and b/browser/branding/official/firefox.ico differ diff --git a/browser/branding/official/locales/en-US/brand.dtd b/browser/branding/official/locales/en-US/brand.dtd index bb912cf05..7bfa07f71 100644 --- a/browser/branding/official/locales/en-US/brand.dtd +++ b/browser/branding/official/locales/en-US/brand.dtd @@ -2,8 +2,8 @@ - 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/. --> - - - - - + + + + + diff --git a/browser/branding/official/locales/en-US/brand.properties b/browser/branding/official/locales/en-US/brand.properties index b7b267fb3..9bdb66706 100644 --- a/browser/branding/official/locales/en-US/brand.properties +++ b/browser/branding/official/locales/en-US/brand.properties @@ -2,12 +2,12 @@ # 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/. -brandShorterName=Firefox -brandShortName=Firefox -brandFullName=Mozilla Firefox -vendorShortName=Mozilla +brandShorterName=Basilisk +brandShortName=Basilisk +brandFullName=Basilisk +vendorShortName=Moonchild -homePageSingleStartMain=Firefox Start, a fast home page with built-in search +homePageSingleStartMain=Internal home page with search. homePageImport=Import your home page from %S homePageMigrationPageTitle=Home Page Selection diff --git a/browser/branding/official/moz.build b/browser/branding/official/moz.build index 9045cee11..f1a839c9d 100644 --- a/browser/branding/official/moz.build +++ b/browser/branding/official/moz.build @@ -9,5 +9,53 @@ DIRS += ['content', 'locales'] DIST_SUBDIR = 'browser' export('DIST_SUBDIR') -include('../branding-common.mozbuild') -FirefoxBranding() +JS_PREFERENCE_FILES += [ + 'pref/firefox-branding.js', +] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': + FINAL_TARGET_FILES['..'] += [ + 'basilisk.VisualElementsManifest.xml', + ] + FINAL_TARGET_FILES.VisualElements += [ + 'VisualElements_150.png', + 'VisualElements_70.png', + ] + BRANDING_FILES += [ + 'appname.bmp', + 'bgintro.bmp', + 'branding.nsi', + 'clock.bmp', + 'document.ico', + 'firefox.ico', + 'newtab.ico', + 'newwindow.ico', + 'particles.bmp', + 'pbmode.ico', + 'pencil-rtl.bmp', + 'pencil.bmp', + 'wizHeader.bmp', + 'wizHeaderRTL.bmp', + 'wizWatermark.bmp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + BRANDING_FILES += [ + 'background.png', + 'disk.icns', + 'document.icns', + 'dsstore', + 'firefox.icns', + ] +elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: + BRANDING_FILES += [ + 'default16.png', + 'default32.png', + 'default48.png', + 'mozicon128.png', + ] + FINAL_TARGET_FILES.icons += ['mozicon128.png'] + FINAL_TARGET_FILES.chrome.icons.default += [ + 'default16.png', + 'default32.png', + 'default48.png', + ] diff --git a/browser/branding/official/mozicon128.png b/browser/branding/official/mozicon128.png index 946c31e68..0de78e0ce 100644 Binary files a/browser/branding/official/mozicon128.png and b/browser/branding/official/mozicon128.png differ diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js index 35be87314..a3d6927bb 100644 --- a/browser/branding/official/pref/firefox-branding.js +++ b/browser/branding/official/pref/firefox-branding.js @@ -2,11 +2,13 @@ * 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/. */ -pref("startup.homepage_override_url", ""); -pref("startup.homepage_welcome_url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/firstrun/"); +pref("startup.homepage_override_url", "https://www.basilisk-browser.org/releasenotes.shtml"); +pref("startup.homepage_welcome_url", "http://www.basilisk-browser.org/firstrun/"); pref("startup.homepage_welcome_url.additional", ""); + +pref("app.update.url", "https://aus.basilisk-browser.org/?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%"); // Interval: Time between checks for a new version (in seconds) -pref("app.update.interval", 43200); // 12 hours +pref("app.update.interval", 86400); // 1 day // The time interval between the downloading of mar file chunks in the // background (in seconds) // 0 means "download everything at once" @@ -15,15 +17,23 @@ pref("app.update.download.backgroundInterval", 0); pref("app.update.promptWaitTime", 691200); // URL user can browse to manually if for some reason all update installation // attempts fail. -pref("app.update.url.manual", "https://www.mozilla.org/firefox/"); +pref("app.update.url.manual", "https://www.basilisk-browser.org/"); // A default value for the "More information about this update" link // supplied in the "An update is available" page of the update wizard. -pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/notes"); +pref("app.update.url.details", "https://www.basilisk-browser.org/releasenotes.shtml"); + +// Switch Application Updates off for now +pref("app.update.enabled", false); + +// Version release notes +pref("app.releaseNotesURL", "http://www.basilisk-browser.org/releasenotes.shtml"); +// Vendor home page +pref("app.vendorURL", "http://www.basilisk-browser.org/"); // The number of days a binary is permitted to be old // without checking for an update. This assumes that // app.update.checkInstallTime is true. -pref("app.update.checkInstallTime.days", 63); +pref("app.update.checkInstallTime.days", 14); // Give the user x seconds to reboot before showing a badge on the hamburger // button. default=immediately @@ -31,6 +41,16 @@ pref("app.update.badgeWaitTime", 0); // Number of usages of the web console or scratchpad. // If this is less than 5, then pasting code into the web console or scratchpad is disabled -pref("devtools.selfxss.count", 0); +pref("devtools.selfxss.count", 100); + +// Disable Google Safebrowsing by default. Without an API key, this won't work. +pref("browser.safebrowsing.phishing.enabled", false); +pref("browser.safebrowsing.malware.enabled", false); +pref("browser.safebrowsing.downloads.enabled", false); +pref("browser.safebrowsing.downloads.remote.enabled", false); +// Disable the UI controls for it as well for Basilisk-official. +pref("browser.safebrowsing.UI.enabled", false); + +// FxA override +pref("general.useragent.override.accounts.firefox.com", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:55.0) Gecko/20100101 Goanna/4.0 Basilisk/55.0.0"); -pref("app.update.enabled", false); diff --git a/browser/branding/official/wizHeader.bmp b/browser/branding/official/wizHeader.bmp index 51bec2211..8f1a0598b 100644 Binary files a/browser/branding/official/wizHeader.bmp and b/browser/branding/official/wizHeader.bmp differ diff --git a/browser/branding/official/wizHeaderRTL.bmp b/browser/branding/official/wizHeaderRTL.bmp index 7610fbfd0..8f1a0598b 100644 Binary files a/browser/branding/official/wizHeaderRTL.bmp and b/browser/branding/official/wizHeaderRTL.bmp differ diff --git a/browser/branding/official/wizWatermark.bmp b/browser/branding/official/wizWatermark.bmp index 5326bba93..491f27aa5 100644 Binary files a/browser/branding/official/wizWatermark.bmp and b/browser/branding/official/wizWatermark.bmp differ diff --git a/browser/config/version.txt b/browser/config/version.txt index 4e9247c69..b406fbef6 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -52.6.0 +55.0.0 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index 4e9247c69..b406fbef6 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -52.6.0 +55.0.0 diff --git a/browser/confvars.sh b/browser/confvars.sh index 98fa4cbe9..25692b188 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -3,8 +3,8 @@ # 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/. -MOZ_APP_BASENAME=Firefox -MOZ_APP_VENDOR=Mozilla +MOZ_APP_BASENAME=Basilisk +MOZ_APP_VENDOR=Moonchild MOZ_PHOENIX=1 MC_BASILISK=1 MOZ_UPDATER=1 @@ -15,42 +15,38 @@ if test "$OS_ARCH" = "WINNT" -o \ fi if test "$OS_ARCH" = "WINNT"; then - MOZ_MAINTENANCE_SERVICE=1 - if ! test "$HAVE_64BIT_BUILD"; then - if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \ - "$MOZ_UPDATE_CHANNEL" = "aurora" -o \ - "$MOZ_UPDATE_CHANNEL" = "beta" -o \ - "$MOZ_UPDATE_CHANNEL" = "beta-dev" -o \ - "$MOZ_UPDATE_CHANNEL" = "release" -o \ - "$MOZ_UPDATE_CHANNEL" = "release-dev"; then - if ! test "$MOZ_DEBUG"; then - MOZ_STUB_INSTALLER=1 - fi - fi - fi + MOZ_MAINTENANCE_SERVICE= fi -# Enable building ./signmar and running libmar signature tests -MOZ_ENABLE_SIGNMAR=1 +# For Basilisk we want to use 55.0.YYYY.MM.DD as MOZ_APP_VERSION in release +# builds so add-on developers have something to target while maintaining +# Firefox compatiblity. +# To enable add "export BASILISK_VERSION=1" to the .mozconfig file. +# However, this will cause a full rebuild at 00:00 UTC every day so +# don't export the variable if you are in development or don't care. +# When not exported we fall back the value in the version*.txt file. +if test -n "$BASILISK_VERSION" ; then + MOZ_APP_VERSION=55.0.`date --utc '+%Y.%m.%d'` + MOZ_APP_VERSION_DISPLAY=`date --utc '+%Y.%m.%d'` +else + MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt` + MOZ_APP_VERSION_DISPLAY=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt` +fi -MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt` -MOZ_APP_VERSION_DISPLAY=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt` MOZ_EXTENSIONS_DEFAULT=" gio" + # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh # MOZ_BRANDING_DIRECTORY is the default branding directory used when none is # specified. It should never point to the "official" branding directory. -# For mozilla-beta, mozilla-release, or mozilla-central repositories, use -# "unofficial" branding. -# For the mozilla-aurora repository, use "aurora". -MOZ_BRANDING_DIRECTORY=browser/branding/unofficial -MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official +MOZ_BRANDING_DIRECTORY=$MOZ_BUILD_APP/branding/unofficial +MOZ_OFFICIAL_BRANDING_DIRECTORY=$MOZ_BUILD_APP/branding/official MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384} # This should usually be the same as the value MAR_CHANNEL_ID. # If more than one ID is needed, then you should use a comma separated list # of values. -ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-esr +ACCEPTED_MAR_CHANNEL_IDS=basilisk-release # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t " -MAR_CHANNEL_ID=firefox-mozilla-esr +MAR_CHANNEL_ID=basilisk-release MOZ_PROFILE_MIGRATOR=1 MOZ_APP_STATIC_INI=1 MOZ_WEBGL_CONFORMANT=1 @@ -58,8 +54,9 @@ MOZ_JSDOWNLOADS=1 MOZ_RUST_MP4PARSE=1 MOZ_RUST_URLPARSE=1 -# Enable checking that add-ons are signed by the trusted root -MOZ_ADDON_SIGNING=1 +# Disable checking that add-ons are signed by the trusted root +MOZ_ADDON_SIGNING=0 +MOZ_REQUIRE_SIGNING=0 # Include the DevTools client, not just the server (which is the default) MOZ_DEVTOOLS=all -- cgit v1.2.3 From 2eef10791129874f6e04b446fbdbaa3b4ad61a60 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 5 Feb 2018 05:48:29 -0500 Subject: Official Vendor and Pale Moon special case --- build/application.ini | 8 ++++++++ build/moz.build | 10 ++++++++++ build/moz.configure/old.configure | 1 + old-configure.in | 16 ++++++++++++++++ 4 files changed, 35 insertions(+) diff --git a/build/application.ini b/build/application.ini index 6d27b4097..6b2e43a34 100644 --- a/build/application.ini +++ b/build/application.ini @@ -18,8 +18,16 @@ #include @TOPOBJDIR@/buildid.h #include @TOPOBJDIR@/source-repo.h [App] +#ifdef MC_OFFICIAL +Vendor=Moonchild Productions +#else Vendor=@MOZ_APP_VENDOR@ +#endif +#if defined(MOZ_PHOENIX) && defined(MC_PALEMOON) +Name=Pale Moon +#else Name=@MOZ_APP_BASENAME@ +#endif RemotingName=@MOZ_APP_REMOTINGNAME@ #ifdef MOZ_APP_DISPLAYNAME CodeName=@MOZ_APP_DISPLAYNAME@ diff --git a/build/moz.build b/build/moz.build index 7b414ce12..8d86b52bf 100644 --- a/build/moz.build +++ b/build/moz.build @@ -27,7 +27,17 @@ if CONFIG['MOZ_APP_DISPLAYNAME'] != CONFIG['MOZ_APP_BASENAME']: DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME'] if CONFIG['MOZ_PHOENIX']: + DEFINES['MOZ_PHOENIX'] = CONFIG['MOZ_PHOENIX'] DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True + +if CONFIG['MC_OFFICAL']: + DEFINES['MC_OFFICAL'] = CONFIG['MC_OFFICAL'] + +if CONFIG['MC_BASILISK']: + DEFINES['MC_BASILISK'] = CONFIG['MC_BASILISK'] + +if CONFIG['MC_PALEMOON']: + DEFINES['MC_PALEMOON'] = CONFIG['MC_PALEMOON'] if CONFIG['MOZ_APP_PROFILE']: DEFINES['MOZ_APP_PROFILE'] = CONFIG['MOZ_APP_PROFILE'] diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index b32c3f7b7..581fa9c50 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -201,6 +201,7 @@ def old_configure_options(*options): '--enable-nfc', '--enable-nspr-build', '--enable-official-branding', + '--enable-official-vendor', '--enable-omx-plugin', '--enable-oom-breakpoint', '--enable-optimize', diff --git a/old-configure.in b/old-configure.in index ab15abf69..5942b0139 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2261,6 +2261,7 @@ MOZ_ARG_HEADER(Application) ENABLE_SYSTEM_EXTENSION_DIRS=1 MOZ_BRANDING_DIRECTORY= MOZ_OFFICIAL_BRANDING= +MC_OFFICIAL=1 MOZ_FEEDS=1 MOZ_AUTH_EXTENSION=1 if test "$MOZ_IOS"; then @@ -2343,6 +2344,15 @@ if test -n "$MOZ_ANDROID_DISTRIBUTION_DIRECTORY"; then fi AC_SUBST(MOZ_ANDROID_DISTRIBUTION_DIRECTORY) +dnl ======================================================== +dnl = Vendor override +dnl ======================================================== +MOZ_ARG_DISABLE_BOOL(official-vendor, +[ --disable-official-vendor Disable the use of official vendor.], + MC_OFFICIAL=, + MC_OFFICIAL=1) + + dnl ======================================================== dnl = Trademarked Branding dnl ======================================================== @@ -2587,9 +2597,15 @@ if test -n "$MOZ_OFFICIAL_BRANDING"; then else MOZ_BRANDING_DIRECTORY=${MOZ_OFFICIAL_BRANDING_DIRECTORY} AC_DEFINE(MOZ_OFFICIAL_BRANDING) + MC_OFFICIAL=1 fi fi +AC_SUBST(MC_OFFICIAL) +if test -n "$MC_OFFICIAL"; then + AC_DEFINE(MC_OFFICIAL) +fi + MOZ_ARG_WITH_STRING(branding, [ --with-branding=dir Use branding from the specified directory.], MOZ_BRANDING_DIRECTORY=$withval) -- cgit v1.2.3 From a1aed76b5f709e4139f0165f3614b89fa1d93f0d Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 5 Feb 2018 06:25:10 -0500 Subject: De-firefox many things --- browser/app/basilisk.exe.manifest | 42 ++++++++++++++++ browser/app/firefox.exe.manifest | 42 ---------------- browser/app/module.ver | 6 +-- browser/app/nsBrowserApp.cpp | 6 +-- browser/app/splash.rc | 2 +- browser/components/shell/nsWindowsShellService.cpp | 56 +++++++++++----------- browser/installer/windows/nsis/installer.nsi | 24 +++++----- .../windows/nsis/maintenanceservice_installer.nsi | 2 +- browser/installer/windows/nsis/stub.nsi | 38 +++++++-------- browser/installer/windows/nsis/uninstaller.nsi | 44 ++++++++--------- 10 files changed, 131 insertions(+), 131 deletions(-) create mode 100644 browser/app/basilisk.exe.manifest delete mode 100644 browser/app/firefox.exe.manifest diff --git a/browser/app/basilisk.exe.manifest b/browser/app/basilisk.exe.manifest new file mode 100644 index 000000000..079e15b58 --- /dev/null +++ b/browser/app/basilisk.exe.manifest @@ -0,0 +1,42 @@ + + + +Firefox + + + + + + + + + + + + + + + True/PM + + + + + + + + + + + diff --git a/browser/app/firefox.exe.manifest b/browser/app/firefox.exe.manifest deleted file mode 100644 index 8b8db4b7b..000000000 --- a/browser/app/firefox.exe.manifest +++ /dev/null @@ -1,42 +0,0 @@ - - - -Firefox - - - - - - - - - - - - - - - True/PM - - - - - - - - - - - diff --git a/browser/app/module.ver b/browser/app/module.ver index 5ef8d2a02..0373ff96d 100644 --- a/browser/app/module.ver +++ b/browser/app/module.ver @@ -1,8 +1,8 @@ -WIN32_MODULE_COMPANYNAME=Mozilla Corporation -WIN32_MODULE_COPYRIGHT=©Firefox and Mozilla Developers; available under the MPL 2 license. +WIN32_MODULE_COMPANYNAME=Moonchild Productions +WIN32_MODULE_COPYRIGHT=©Basilisk and Mozilla Developers; available under the MPL 2 license. WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@ WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@ -WIN32_MODULE_TRADEMARKS=Firefox is a Trademark of The Mozilla Foundation. +WIN32_MODULE_TRADEMARKS=Basilisk is a Trademark of Moonchild Productions. WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@ WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@ WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@ diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp index 981e2f14c..ac2e85ea3 100644 --- a/browser/app/nsBrowserApp.cpp +++ b/browser/app/nsBrowserApp.cpp @@ -25,7 +25,7 @@ #ifdef XP_WIN #ifdef MOZ_ASAN -// ASAN requires firefox.exe to be built with -MD, and it's OK if we don't +// ASAN requires basilisk.exe to be built with -MD, and it's OK if we don't // support Windows XP SP2 in ASAN builds. #define XRE_DONT_SUPPORT_XPSP2 #endif @@ -84,7 +84,7 @@ static void Output(const char *fmt, ... ) decltype(MessageBoxW)* messageBoxW = (decltype(MessageBoxW)*) GetProcAddress(user32, "MessageBoxW"); if (messageBoxW) { - messageBoxW(nullptr, wide_msg, L"Firefox", MB_OK + messageBoxW(nullptr, wide_msg, L"Basilisk", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); } @@ -170,7 +170,7 @@ static int do_main(int argc, char* argv[], char* envp[], nsIFile *xreDirectory) nsresult rv; uint32_t mainFlags = 0; - // Allow firefox.exe to launch XULRunner apps via -app + // Allow basilisk.exe to launch XULRunner apps via -app // Note that -app must be the *first* argument. const char *appDataFile = getenv("XUL_APP_FILE"); if (appDataFile && *appDataFile) { diff --git a/browser/app/splash.rc b/browser/app/splash.rc index c406b7985..beccf8706 100644 --- a/browser/app/splash.rc +++ b/browser/app/splash.rc @@ -6,7 +6,7 @@ #include #include "nsNativeAppSupportWin.h" -1 24 "firefox.exe.manifest" +1 24 "basilisk.exe.manifest" IDI_APPICON ICON FIREFOX_ICO IDI_DOCUMENT ICON DOCUMENT_ICO diff --git a/browser/components/shell/nsWindowsShellService.cpp b/browser/components/shell/nsWindowsShellService.cpp index 416e00cbc..53d128cb9 100644 --- a/browser/components/shell/nsWindowsShellService.cpp +++ b/browser/components/shell/nsWindowsShellService.cpp @@ -102,18 +102,18 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey) // .htm .html .shtml .xht .xhtml // are mapped like so: // -// HKCU\SOFTWARE\Classes\.\ (default) REG_SZ FirefoxHTML +// HKCU\SOFTWARE\Classes\.\ (default) REG_SZ BasiliskHTML // // as aliases to the class: // -// HKCU\SOFTWARE\Classes\FirefoxHTML\ +// HKCU\SOFTWARE\Classes\BasiliskHTML\ // DefaultIcon (default) REG_SZ ,1 // shell\open\command (default) REG_SZ -osint -url "%1" // shell\open\ddeexec (default) REG_SZ // // - Windows Vista and above Protocol Handler // -// HKCU\SOFTWARE\Classes\FirefoxURL\ (default) REG_SZ URL +// HKCU\SOFTWARE\Classes\BasiliskURL\ (default) REG_SZ URL // EditFlags REG_DWORD 2 // FriendlyTypeName REG_SZ URL // DefaultIcon (default) REG_SZ ,1 @@ -133,7 +133,7 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey) // // - Windows Start Menu (XP SP1 and newer) // ------------------------------------------------- -// The following keys are set to make Firefox appear in the Start Menu as the +// The following keys are set to make Basilisk appear in the Start Menu as the // browser: // // HKCU\SOFTWARE\Clients\StartMenuInternet\FIREFOX.EXE\ @@ -157,7 +157,7 @@ typedef struct { const char* oldValueData; } SETTING; -#define APP_REG_NAME L"Firefox" +#define APP_REG_NAME L"Basilisk" #define VAL_FILE_ICON "%APPPATH%,1" #define VAL_OPEN "\"%APPPATH%\" -osint -url \"%1\"" #define OLD_VAL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\"" @@ -171,11 +171,11 @@ typedef struct { PREFIX MID // The DefaultIcon registry key value should never be used when checking if -// Firefox is the default browser for file handlers since other applications +// Basilisk is the default browser for file handlers since other applications // (e.g. MS Office) may modify the DefaultIcon registry key value to add Icon // Handlers. see http://msdn2.microsoft.com/en-us/library/aa969357.aspx for // more info. The FTP protocol is not checked so advanced users can set the FTP -// handler to another application and still have Firefox check if it is the +// handler to another application and still have Basilisk check if it is the // default HTTP and HTTPS handler. // *** Do not add additional checks here unless you skip them when aForAllTypes // is false below***. @@ -183,10 +183,10 @@ static SETTING gSettings[] = { // File Handler Class // ***keep this as the first entry because when aForAllTypes is not set below // it will skip over this check.*** - { MAKE_KEY_NAME1("FirefoxHTML", SOC), VAL_OPEN, OLD_VAL_OPEN }, + { MAKE_KEY_NAME1("BasiliskHTML", SOC), VAL_OPEN, OLD_VAL_OPEN }, // Protocol Handler Class - for Vista and above - { MAKE_KEY_NAME1("FirefoxURL", SOC), VAL_OPEN, OLD_VAL_OPEN }, + { MAKE_KEY_NAME1("BasiliskURL", SOC), VAL_OPEN, OLD_VAL_OPEN }, // Protocol Handlers { MAKE_KEY_NAME1("HTTP", DI), VAL_FILE_ICON }, @@ -196,14 +196,14 @@ static SETTING gSettings[] = { }; // The settings to disable DDE are separate from the default browser settings -// since they are only checked when Firefox is the default browser and if they +// since they are only checked when Basilisk is the default browser and if they // are incorrect they are fixed without notifying the user. static SETTING gDDESettings[] = { // File Handler Class - { MAKE_KEY_NAME1("Software\\Classes\\FirefoxHTML", SOD) }, + { MAKE_KEY_NAME1("Software\\Classes\\BasiliskHTML", SOD) }, // Protocol Handler Class - for Vista and above - { MAKE_KEY_NAME1("Software\\Classes\\FirefoxURL", SOD) }, + { MAKE_KEY_NAME1("Software\\Classes\\BasiliskURL", SOD) }, // Protocol Handlers { MAKE_KEY_NAME1("Software\\Classes\\FTP", SOD) }, @@ -340,7 +340,7 @@ IsAARDefault(const RefPtr& pAAR, return false; } - LPCWSTR progID = isProtocol ? L"FirefoxURL" : L"FirefoxHTML"; + LPCWSTR progID = isProtocol ? L"BasiliskURL" : L"BasiliskHTML"; bool isDefault = !wcsicmp(registeredApp, progID); CoTaskMemFree(registeredApp); @@ -372,9 +372,9 @@ IsDefaultBrowserWin8(bool aCheckAllTypes, bool* aIsDefaultBrowser) /* * Query's the AAR for the default status. - * This only checks for FirefoxURL and if aCheckAllTypes is set, then - * it also checks for FirefoxHTML. Note that those ProgIDs are shared - * by all Firefox browsers. + * This only checks for BasiliskURL and if aCheckAllTypes is set, then + * it also checks for BasiliskHTML. Note that those ProgIDs are shared + * by all Basilisk browsers. */ bool nsWindowsShellService::IsDefaultBrowserVista(bool aCheckAllTypes, @@ -417,7 +417,7 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck, return NS_ERROR_FAILURE; // Convert the path to a long path since GetModuleFileNameW returns the path - // that was used to launch Firefox which is not necessarily a long path. + // that was used to launch Basilisk which is not necessarily a long path. if (!::GetLongPathNameW(exePath, exePath, MAX_BUF)) return NS_ERROR_FAILURE; @@ -470,7 +470,7 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck, 0, KEY_SET_VALUE, &theKey); if (REG_FAILED(res)) { // If updating the open command fails try to update it using the helper - // application when setting Firefox as the default browser. + // application when setting Basilisk as the default browser. *aIsDefaultBrowser = false; return NS_OK; } @@ -482,15 +482,15 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck, ::RegCloseKey(theKey); if (REG_FAILED(res)) { // If updating the open command fails try to update it using the helper - // application when setting Firefox as the default browser. + // application when setting Basilisk as the default browser. *aIsDefaultBrowser = false; return NS_OK; } } } - // Only check if Firefox is the default browser on Vista and above if the - // previous checks show that Firefox is the default browser. + // Only check if Basilisk is the default browser on Vista and above if the + // previous checks show that Basilisk is the default browser. if (*aIsDefaultBrowser) { IsDefaultBrowserVista(aForAllTypes, aIsDefaultBrowser); if (IsWin8OrLater()) { @@ -499,9 +499,9 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck, } // To handle the case where DDE isn't disabled due for a user because there - // account didn't perform a Firefox update this will check if Firefox is the + // account didn't perform a Basilisk update this will check if Basilisk is the // default browser and if dde is disabled for each handler - // and if it isn't disable it. When Firefox is not the default browser the + // and if it isn't disable it. When Basilisk is not the default browser the // helper application will disable dde for each handler. if (*aIsDefaultBrowser && aForAllTypes) { // Check ftp settings @@ -515,7 +515,7 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck, if (NS_FAILED(rv)) { ::RegCloseKey(theKey); // If disabling DDE fails try to disable it using the helper - // application when setting Firefox as the default browser. + // application when setting Basilisk as the default browser. *aIsDefaultBrowser = false; return NS_OK; } @@ -535,7 +535,7 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck, nullptr, &theKey, nullptr); if (REG_FAILED(res)) { // If disabling DDE fails try to disable it using the helper - // application when setting Firefox as the default browser. + // application when setting Basilisk as the default browser. *aIsDefaultBrowser = false; return NS_OK; } @@ -546,7 +546,7 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck, ::RegCloseKey(theKey); if (REG_FAILED(res)) { // If disabling DDE fails try to disable it using the helper - // application when setting Firefox as the default browser. + // application when setting Basilisk as the default browser. *aIsDefaultBrowser = false; return NS_OK; } @@ -588,7 +588,7 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck, // Close the key that was created. ::RegCloseKey(theKey); // If updating the FTP protocol handlers shell open command fails try to - // update it using the helper application when setting Firefox as the + // update it using the helper application when setting Basilisk as the // default browser. if (REG_FAILED(res)) { *aIsDefaultBrowser = false; @@ -1005,7 +1005,7 @@ nsWindowsShellService::SetDesktopBackground(nsIDOMElement* aElement, getter_AddRefs(file)); NS_ENSURE_SUCCESS(rv, rv); - // eventually, the path is "%APPDATA%\Mozilla\Firefox\Desktop Background.bmp" + // eventually, the path is "%APPDATA%\Mozilla\Basilisk\Desktop Background.bmp" rv = file->Append(fileLeafName); NS_ENSURE_SUCCESS(rv, rv); diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi index 1f20c01eb..aed5808cd 100755 --- a/browser/installer/windows/nsis/installer.nsi +++ b/browser/installer/windows/nsis/installer.nsi @@ -253,7 +253,7 @@ Section "-InstallStartCleanup" ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs" ; Remove the updates directory for Vista and above - ${CleanUpdateDirectories} "Mozilla\Firefox" "Mozilla\updates" + ${CleanUpdateDirectories} "Mozilla\Basilisk" "Mozilla\updates" ${RemoveDeprecatedFiles} ${RemovePrecompleteEntries} "false" @@ -374,17 +374,17 @@ Section "-Application" APP_IDX ; it doesn't cause problems always add them. ${SetUninstallKeys} - ; On install always add the FirefoxHTML and FirefoxURL keys. - ; An empty string is used for the 5th param because FirefoxHTML is not a + ; On install always add the BasiliskHTML and BasiliskURL keys. + ; An empty string is used for the 5th param because BasiliskHTML is not a ; protocol handler. ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8 StrCpy $2 "$\"$8$\" -osint -url $\"%1$\"" - ; In Win8, the delegate execute handler picks up the value in FirefoxURL and - ; FirefoxHTML to launch the desktop browser when it needs to. - ${AddDisabledDDEHandlerValues} "FirefoxHTML" "$2" "$8,1" \ + ; In Win8, the delegate execute handler picks up the value in BasiliskURL and + ; BasiliskHTML to launch the desktop browser when it needs to. + ${AddDisabledDDEHandlerValues} "BasiliskHTML" "$2" "$8,1" \ "${AppRegName} Document" "" - ${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" "${AppRegName} URL" \ + ${AddDisabledDDEHandlerValues} "BasiliskURL" "$2" "$8,1" "${AppRegName} URL" \ "true" ; For pre win8, the following keys should only be set if we can write to HKLM. @@ -620,7 +620,7 @@ Section "-InstallEndCleanup" ; If we have something other than empty string now, write the value. ${If} "$0" != "" ClearErrors - WriteRegStr HKCU "Software\Mozilla\Firefox" "OldDefaultBrowserCommand" "$0" + WriteRegStr HKCU "Software\Mozilla\Basilisk" "OldDefaultBrowserCommand" "$0" ${EndIf} ${LogHeader} "Setting as the default browser" @@ -636,7 +636,7 @@ Section "-InstallEndCleanup" ${ElseIfNot} ${Errors} ${LogHeader} "Writing default-browser opt-out" ClearErrors - WriteRegStr HKCU "Software\Mozilla\Firefox" "DefaultBrowserOptOut" "True" + WriteRegStr HKCU "Software\Mozilla\Basilisk" "DefaultBrowserOptOut" "True" ${If} ${Errors} ${LogMsg} "Error writing default-browser opt-out" ${EndIf} @@ -1049,14 +1049,14 @@ Function preSummary WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test" ${Unless} ${Errors} DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" - ; Check if Firefox is the http handler for this user. + ; Check if Basilisk is the http handler for this user. SetShellVarContext current ; Set SHCTX to the current user ${IsHandlerForInstallDir} "http" $R9 ${If} $TmpVal == "HKLM" SetShellVarContext all ; Set SHCTX to all users ${EndIf} - ; If Firefox isn't the http handler for this user show the option to set - ; Firefox as the default browser. + ; If Basilisk isn't the http handler for this user show the option to set + ; Basilisk as the default browser. ${If} "$R9" != "true" ${AndIf} ${AtMostWin2008R2} WriteINIStr "$PLUGINSDIR\summary.ini" "Settings" NumFields "4" diff --git a/browser/installer/windows/nsis/maintenanceservice_installer.nsi b/browser/installer/windows/nsis/maintenanceservice_installer.nsi index ef30c1360..4bc9d2bed 100644 --- a/browser/installer/windows/nsis/maintenanceservice_installer.nsi +++ b/browser/installer/windows/nsis/maintenanceservice_installer.nsi @@ -78,7 +78,7 @@ SetOverwrite on "Software\Microsoft\Windows\CurrentVersion\Uninstall\MozillaMaintenanceService" ; Always install into the 32-bit location even if we have a 64-bit build. -; This is because we use only 1 service for all Firefox channels. +; This is because we use only 1 service for all Basilisk channels. ; Allow either x86 and x64 builds to exist at this location, depending on ; what is the latest build. InstallDir "$PROGRAMFILES32\${MaintFullName}\" diff --git a/browser/installer/windows/nsis/stub.nsi b/browser/installer/windows/nsis/stub.nsi index 176f641b3..5c19c10fe 100644 --- a/browser/installer/windows/nsis/stub.nsi +++ b/browser/installer/windows/nsis/stub.nsi @@ -76,7 +76,7 @@ Var ProgressTotal Var TmpVal Var ExitCode -Var FirefoxLaunchCode +Var BasiliskLaunchCode ; The first three tick counts are for the start of a phase and equate equate to ; the display of individual installer pages. @@ -457,7 +457,7 @@ Function .onInit StrCpy $EndInstallPhaseTickCount "0" StrCpy $InitialInstallRequirementsCode "" StrCpy $IsDownloadFinished "" - StrCpy $FirefoxLaunchCode "0" + StrCpy $BasiliskLaunchCode "0" StrCpy $CheckboxShortcutOnBar "1" StrCpy $CheckboxShortcutInStartMenu "1" StrCpy $CheckboxShortcutOnDesktop "1" @@ -674,17 +674,17 @@ Function SendPing ${GetParent} "$R2" $R3 ${GetLongPath} "$R3" $R3 ${If} $R3 == $INSTDIR - StrCpy $R2 "1" ; This Firefox install is set as default. + StrCpy $R2 "1" ; This Basilisk install is set as default. ${Else} StrCpy $R2 "$R2" "" -11 # length of firefox.exe ${If} "$R2" == "${FileMainEXE}" - StrCpy $R2 "2" ; Another Firefox install is set as default. + StrCpy $R2 "2" ; Another Basilisk install is set as default. ${Else} StrCpy $R2 "0" ${EndIf} ${EndIf} ${Else} - StrCpy $R2 "0" ; Firefox is not set as default. + StrCpy $R2 "0" ; Basilisk is not set as default. ${EndIf} ${If} "$R2" == "0" @@ -704,17 +704,17 @@ Function SendPing ${GetParent} "$R2" $R3 ${GetLongPath} "$R3" $R3 ${If} $R3 == $INSTDIR - StrCpy $R2 "1" ; This Firefox install is set as default. + StrCpy $R2 "1" ; This Basilisk install is set as default. ${Else} StrCpy $R2 "$R2" "" -11 # length of firefox.exe ${If} "$R2" == "${FileMainEXE}" - StrCpy $R2 "2" ; Another Firefox install is set as default. + StrCpy $R2 "2" ; Another Basilisk install is set as default. ${Else} StrCpy $R2 "0" ${EndIf} ${EndIf} ${Else} - StrCpy $R2 "0" ; Firefox is not set as default. + StrCpy $R2 "0" ; Basilisk is not set as default. ${EndIf} ${EndIf} ${EndUnless} @@ -740,7 +740,7 @@ Function SendPing $\nBuild Channel = ${Channel} \ $\nUpdate Channel = ${UpdateChannel} \ $\nLocale = ${AB_CD} \ - $\nFirefox x64 = $R0 \ + $\nBasilisk x64 = $R0 \ $\nRunning x64 Windows = $R1 \ $\nMajor = $5 \ $\nMinor = $6 \ @@ -748,7 +748,7 @@ Function SendPing $\nServicePack = $8 \ $\nIsServer = $9 \ $\nExit Code = $ExitCode \ - $\nFirefox Launch Code = $FirefoxLaunchCode \ + $\nBasilisk Launch Code = $BasiliskLaunchCode \ $\nDownload Retry Count = $DownloadRetryCount \ $\nDownloaded Bytes = $DownloadedBytes \ $\nDownload Size Bytes = $DownloadSizeBytes \ @@ -779,7 +779,7 @@ Function SendPing Call RelativeGotoPage !else ${NSD_CreateTimer} OnPing ${DownloadIntervalMS} - InetBgDL::Get "${BaseURLStubPing}/${StubURLVersion}${StubURLVersionAppend}/${Channel}/${UpdateChannel}/${AB_CD}/$R0/$R1/$5/$6/$7/$8/$9/$ExitCode/$FirefoxLaunchCode/$DownloadRetryCount/$DownloadedBytes/$DownloadSizeBytes/$IntroPhaseSeconds/$OptionsPhaseSeconds/$0/$1/$DownloadFirstTransferSeconds/$2/$3/$4/$InitialInstallRequirementsCode/$OpenedDownloadPage/$ExistingProfile/$ExistingVersion/$ExistingBuildID/$R5/$R6/$R7/$R8/$R2/$R3/$DownloadServerIP/$PostSigningData" \ + InetBgDL::Get "${BaseURLStubPing}/${StubURLVersion}${StubURLVersionAppend}/${Channel}/${UpdateChannel}/${AB_CD}/$R0/$R1/$5/$6/$7/$8/$9/$ExitCode/$BasiliskLaunchCode/$DownloadRetryCount/$DownloadedBytes/$DownloadSizeBytes/$IntroPhaseSeconds/$OptionsPhaseSeconds/$0/$1/$DownloadFirstTransferSeconds/$2/$3/$4/$InitialInstallRequirementsCode/$OpenedDownloadPage/$ExistingProfile/$ExistingVersion/$ExistingBuildID/$R5/$R6/$R7/$R8/$R2/$R3/$DownloadServerIP/$PostSigningData" \ "$PLUGINSDIR\_temp" /END !endif ${Else} @@ -805,10 +805,10 @@ Function createIntro nsDialogs::OnBack /NOUNLOAD $0 !ifdef ${AB_CD}_rtl - ; For RTL align the text with the top of the F in the Firefox bitmap + ; For RTL align the text with the top of the F in the Basilisk bitmap StrCpy $0 "${INTRO_BLURB_RTL_TOP_DU}" !else - ; For LTR align the text with the top of the x in the Firefox bitmap + ; For LTR align the text with the top of the x in the Basilisk bitmap StrCpy $0 "${INTRO_BLURB_LTR_TOP_DU}" !endif ${NSD_CreateLabel} ${INTRO_BLURB_EDGE_DU} $0 ${INTRO_BLURB_WIDTH_DU} 76u "${INTRO_BLURB}" @@ -1337,7 +1337,7 @@ Function createInstall StrCpy $ExistingBuildID "0" ${EndIf} - ${If} ${FileExists} "$LOCALAPPDATA\Mozilla\Firefox" + ${If} ${FileExists} "$LOCALAPPDATA\Mozilla\Basilisk" StrCpy $ExistingProfile "1" ${Else} StrCpy $ExistingProfile "0" @@ -1771,7 +1771,7 @@ Function FinishInstall ; If we have something other than empty string now, write the value. ${If} "$0" != "" ClearErrors - WriteRegStr HKCU "Software\Mozilla\Firefox" "OldDefaultBrowserCommand" "$0" + WriteRegStr HKCU "Software\Mozilla\Basilisk" "OldDefaultBrowserCommand" "$0" ${EndIf} ${GetParameters} $0 @@ -2017,13 +2017,13 @@ Function LaunchApp !ifndef DEV_EDITION FindWindow $0 "${WindowClass}" ${If} $0 <> 0 ; integer comparison - StrCpy $FirefoxLaunchCode "1" + StrCpy $BasiliskLaunchCode "1" MessageBox MB_OK|MB_ICONQUESTION "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)" Return ${EndIf} !endif - StrCpy $FirefoxLaunchCode "2" + StrCpy $BasiliskLaunchCode "2" ; Set the current working directory to the installation directory SetOutPath "$INSTDIR" @@ -2056,8 +2056,8 @@ Function CopyPostSigningData ClearErrors StrCpy $PostSigningData "0" ${Else} - CreateDirectory "$LOCALAPPDATA\Mozilla\Firefox" - CopyFiles /SILENT "$EXEDIR\postSigningData" "$LOCALAPPDATA\Mozilla\Firefox" + CreateDirectory "$LOCALAPPDATA\Mozilla\Basilisk" + CopyFiles /SILENT "$EXEDIR\postSigningData" "$LOCALAPPDATA\Mozilla\Basilisk" ${Endif} FunctionEnd diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi index c97728b47..687bcd6eb 100755 --- a/browser/installer/windows/nsis/uninstaller.nsi +++ b/browser/installer/windows/nsis/uninstaller.nsi @@ -258,7 +258,7 @@ Section "Uninstall" ${EndIf} ; Remove the updates directory for Vista and above - ${un.CleanUpdateDirectories} "Mozilla\Firefox" "Mozilla\updates" + ${un.CleanUpdateDirectories} "Mozilla\Basilisk" "Mozilla\updates" ; Remove any app model id's stored in the registry for this install path DeleteRegValue HKCU "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR" @@ -278,27 +278,27 @@ Section "Uninstall" ${un.SetAppLSPCategories} ${EndIf} - ${un.RegCleanAppHandler} "FirefoxURL" - ${un.RegCleanAppHandler} "FirefoxHTML" + ${un.RegCleanAppHandler} "BasiliskURL" + ${un.RegCleanAppHandler} "BasiliskHTML" ${un.RegCleanProtocolHandler} "ftp" ${un.RegCleanProtocolHandler} "http" ${un.RegCleanProtocolHandler} "https" ClearErrors - ReadRegStr $R9 HKCR "FirefoxHTML" "" - ; Don't clean up the file handlers if the FirefoxHTML key still exists since + ReadRegStr $R9 HKCR "BasiliskHTML" "" + ; Don't clean up the file handlers if the BasiliskHTML key still exists since ; there should be a second installation that may be the default file handler ${If} ${Errors} - ${un.RegCleanFileHandler} ".htm" "FirefoxHTML" - ${un.RegCleanFileHandler} ".html" "FirefoxHTML" - ${un.RegCleanFileHandler} ".shtml" "FirefoxHTML" - ${un.RegCleanFileHandler} ".xht" "FirefoxHTML" - ${un.RegCleanFileHandler} ".xhtml" "FirefoxHTML" - ${un.RegCleanFileHandler} ".oga" "FirefoxHTML" - ${un.RegCleanFileHandler} ".ogg" "FirefoxHTML" - ${un.RegCleanFileHandler} ".ogv" "FirefoxHTML" - ${un.RegCleanFileHandler} ".pdf" "FirefoxHTML" - ${un.RegCleanFileHandler} ".webm" "FirefoxHTML" + ${un.RegCleanFileHandler} ".htm" "BasiliskHTML" + ${un.RegCleanFileHandler} ".html" "BasiliskHTML" + ${un.RegCleanFileHandler} ".shtml" "BasiliskHTML" + ${un.RegCleanFileHandler} ".xht" "BasiliskHTML" + ${un.RegCleanFileHandler} ".xhtml" "BasiliskHTML" + ${un.RegCleanFileHandler} ".oga" "BasiliskHTML" + ${un.RegCleanFileHandler} ".ogg" "BasiliskHTML" + ${un.RegCleanFileHandler} ".ogv" "BasiliskHTML" + ${un.RegCleanFileHandler} ".pdf" "BasiliskHTML" + ${un.RegCleanFileHandler} ".webm" "BasiliskHTML" ${EndIf} SetShellVarContext all ; Set SHCTX to HKLM @@ -317,7 +317,7 @@ Section "Uninstall" ; The StartMenuInternet registry key is independent of the default browser ; settings. The XPInstall base un-installer always removes this key if it is ; uninstalling the default browser and it will always replace the keys when - ; installing even if there is another install of Firefox that is set as the + ; installing even if there is another install of Basilisk that is set as the ; default browser. Now the key is always updated on install but it is only ; removed if it refers to this install location. ${If} "$INSTDIR" == "$R1" @@ -333,7 +333,7 @@ Section "Uninstall" ; The StartMenuInternet registry key is independent of the default browser ; settings. The XPInstall base un-installer always removes this key if it is ; uninstalling the default browser and it will always replace the keys when - ; installing even if there is another install of Firefox that is set as the + ; installing even if there is another install of Basilisk that is set as the ; default browser. Now the key is always updated on install but it is only ; removed if it refers to this install location. ${If} "$INSTDIR" == "$R1" @@ -443,12 +443,12 @@ Section "Uninstall" ; clients registry key by the OS under some conditions. System::Call "shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i 0, i 0, i 0)" - ; Users who uninstall then reinstall expecting Firefox to use a clean profile - ; may be surprised during first-run. This key is checked during startup of Firefox and + ; Users who uninstall then reinstall expecting Basilisk to use a clean profile + ; may be surprised during first-run. This key is checked during startup of Basilisk and ; subsequently deleted after checking. If the value is found during startup - ; the browser will offer to Reset Firefox. We use the UpdateChannel to match - ; uninstalls of Firefox-release with reinstalls of Firefox-release, for example. - WriteRegStr HKCU "Software\Mozilla\Firefox" "Uninstalled-${UpdateChannel}" "True" + ; the browser will offer to Reset Basilisk. We use the UpdateChannel to match + ; uninstalls of Basilisk-release with reinstalls of Basilisk-release, for example. + WriteRegStr HKCU "Software\Mozilla\Basilisk" "Uninstalled-${UpdateChannel}" "True" !ifdef MOZ_MAINTENANCE_SERVICE ; Get the path the allowed cert is at and remove it -- cgit v1.2.3 From b7852aab25b8ab06e0463bbe7c5d20cdd6f89750 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 5 Feb 2018 06:26:20 -0500 Subject: Part 2 --- browser/app/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index cbd2ec0fc..d807b4337 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -28,7 +28,7 @@ ifeq ($(OS_ARCH),WINNT) # (this dependency should really be just for firefox.exe, not other targets) # Note the manifest file exists in the tree, so we use the explicit filename # here. -EXTRA_DEPS += firefox.exe.manifest +EXTRA_DEPS += basilisk.exe.manifest endif PROGRAMS_DEST = $(DIST)/bin -- cgit v1.2.3 From e8417003899a4ec9274815be30352c1328fc32e9 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 5 Feb 2018 06:28:51 -0500 Subject: Don't use AppConstants in Services.jsm --- toolkit/modules/Services.jsm | 35 ++++++++++++++++++----------------- toolkit/modules/moz.build | 2 +- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/toolkit/modules/Services.jsm b/toolkit/modules/Services.jsm index 1a6c3ea87..1bf1a89fe 100644 --- a/toolkit/modules/Services.jsm +++ b/toolkit/modules/Services.jsm @@ -39,14 +39,14 @@ XPCOMUtils.defineLazyGetter(Services, "dirsvc", function () { .QueryInterface(Ci.nsIProperties); }); -if (AppConstants.MOZ_CRASHREPORTER) { - XPCOMUtils.defineLazyGetter(Services, "crashmanager", () => { - let ns = {}; - Components.utils.import("resource://gre/modules/CrashManager.jsm", ns); +#ifdef MOZ_CRASHREPORTER +XPCOMUtils.defineLazyGetter(Services, "crashmanager", () => { + let ns = {}; + Components.utils.import("resource://gre/modules/CrashManager.jsm", ns); - return ns.CrashManager.Singleton; - }); -} + return ns.CrashManager.Singleton; +}); +#endif XPCOMUtils.defineLazyGetter(Services, "mm", () => { return Cc["@mozilla.org/globalmessagemanager;1"] @@ -61,8 +61,9 @@ XPCOMUtils.defineLazyGetter(Services, "ppmm", () => { }); var initTable = [ - ["androidBridge", "@mozilla.org/android/bridge;1", "nsIAndroidBridge", - AppConstants.platform == "android"], +#ifdef MOZ_WIDGET_ANDROID + ["androidBridge", "@mozilla.org/android/bridge;1", "nsIAndroidBridge"], +#endif ["appShell", "@mozilla.org/appshell/appShellService;1", "nsIAppShellService"], ["cache", "@mozilla.org/network/cache-service;1", "nsICacheService"], ["cache2", "@mozilla.org/netwerk/cache-storage-service;1", "nsICacheStorageService"], @@ -80,12 +81,14 @@ var initTable = [ ["obs", "@mozilla.org/observer-service;1", "nsIObserverService"], ["perms", "@mozilla.org/permissionmanager;1", "nsIPermissionManager"], ["prompt", "@mozilla.org/embedcomp/prompt-service;1", "nsIPromptService"], - ["profiler", "@mozilla.org/tools/profiler;1", "nsIProfiler", - AppConstants.MOZ_ENABLE_PROFILER_SPS], +#ifdef MOZ_ENABLE_PROFILER_SPS + ["profiler", "@mozilla.org/tools/profiler;1", "nsIProfiler"], +#endif ["scriptloader", "@mozilla.org/moz/jssubscript-loader;1", "mozIJSSubScriptLoader"], ["scriptSecurityManager", "@mozilla.org/scriptsecuritymanager;1", "nsIScriptSecurityManager"], - ["search", "@mozilla.org/browser/search-service;1", "nsIBrowserSearchService", - AppConstants.MOZ_TOOLKIT_SEARCH], +#ifdef MOZ_TOOLKIT_SEARCH + ["search", "@mozilla.org/browser/search-service;1", "nsIBrowserSearchService"], +#endif ["storage", "@mozilla.org/storage/service;1", "mozIStorageService"], ["domStorageManager", "@mozilla.org/dom/localStorage-manager;1", "nsIDOMStorageManager"], ["strings", "@mozilla.org/intl/stringbundle;1", "nsIStringBundleService"], @@ -107,10 +110,8 @@ var initTable = [ ["qms", "@mozilla.org/dom/quota-manager-service;1", "nsIQuotaManagerService"], ]; -initTable.forEach(([name, contract, intf, enabled = true]) => { - if (enabled) { - XPCOMUtils.defineLazyServiceGetter(Services, name, contract, intf); - } +initTable.forEach(([name, contract, intf]) => { + XPCOMUtils.defineLazyServiceGetter(Services, name, contract, intf); }); diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 9e08fe9f0..271c9b8f7 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -85,7 +85,6 @@ EXTRA_JS_MODULES += [ 'SelectContentHelper.jsm', 'SelectParentHelper.jsm', 'ServiceRequest.jsm', - 'Services.jsm', 'SessionRecorder.jsm', 'sessionstore/FormData.jsm', 'sessionstore/ScrollPosition.jsm', @@ -116,6 +115,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'): EXTRA_PP_JS_MODULES += [ 'AppConstants.jsm', + 'Services.jsm', ] if 'Android' != CONFIG['OS_TARGET']: -- cgit v1.2.3