Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 5 changesets (bug 1423856, bug 1404796, bug 1378834, bug 1404823) for build bustages on compare-mozconfigs-wrapper.py r=backout on a CLOSED TREE

Browse Source 
Backed out changeset 8d8bb8542b3d (bug 1423856)
Backed out changeset 42339ef2360c (bug 1404796)
Backed out changeset 75fd371db04b (bug 1404823)
Backed out changeset 3011254797d5 (bug 1378834)
Backed out changeset c76ad732c275 (bug 1378834)
This commit is contained in:
Cosmin Sabou 2017-12-21 00:52:28 +02:00
parent 97773bdfd8
commit 1204c668a2
18 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/branding/aurora/branding.nsi
View File

@ -10,7 +10,6 @@
# instead of BrandFullName and typically should not be modified.
!define BrandFullNameInternal "Firefox Developer Edition"
!define BrandShortName "Firefox Developer Edition"
!define BrandFullName "Firefox Developer Edition"
!define CompanyName "mozilla.org"
!define URLInfoAbout "https://www.mozilla.org"
!define HelpLink "https://support.mozilla.org"

2
browser/branding/aurora/configure.sh
View File

@ -2,6 +2,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
MOZ_APP_DISPLAYNAME="Firefox Developer Edition"
MOZ_APP_DISPLAYNAME=FirefoxDeveloperEdition
MOZ_APP_REMOTINGNAME=firefox-dev
MOZ_DEV_EDITION=1

1
browser/branding/nightly/branding.nsi
View File

@ -9,7 +9,6 @@
# BrandFullNameInternal is used for some registry and file system values
# instead of BrandFullName and typically should not be modified.
!define BrandFullNameInternal "Nightly"
!define BrandFullName "Firefox Nightly"
!define CompanyName "mozilla.org"
!define URLInfoAbout "https://www.mozilla.org"
!define HelpLink "https://support.mozilla.org"

2
browser/branding/nightly/configure.sh
View File

@ -2,6 +2,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
MOZ_APP_DISPLAYNAME="Firefox Nightly"
MOZ_APP_DISPLAYNAME=Nightly
MOZ_MACBUNDLE_ID=nightly

2
browser/branding/nightly/locales/en-US/brand.dtd
View File

@ -4,6 +4,6 @@
<!ENTITY brandShorterName "Nightly">
<!ENTITY brandShortName "Nightly">
<!ENTITY brandFullName "Firefox Nightly">
<!ENTITY brandFullName "Nightly">
<!ENTITY vendorShortName "Mozilla">
<!ENTITY trademarkInfo.part1 " ">

2
browser/branding/nightly/locales/en-US/brand.properties
View File

@ -4,7 +4,7 @@
brandShorterName=Nightly
brandShortName=Nightly
brandFullName=Firefox Nightly
brandFullName=Nightly
vendorShortName=Mozilla
syncBrandShortName=Sync

1
browser/branding/official/branding.nsi
View File

@ -9,7 +9,6 @@
# BrandFullNameInternal is used for some registry and file system values
# instead of BrandFullName and typically should not be modified.
!define BrandFullNameInternal "Mozilla Firefox"
!define BrandFullName "Mozilla Firefox"
!define CompanyName "Mozilla Corporation"
!define URLInfoAbout "https://www.mozilla.org"
!define URLUpdateInfo "https://www.mozilla.org/firefox/${AppVersion}/releasenotes"

1
browser/branding/unofficial/branding.nsi
View File

@ -9,7 +9,6 @@
# BrandFullNameInternal is used for some registry and file system values
# instead of BrandFullName and typically should not be modified.
!define BrandFullNameInternal "Mozilla Developer Preview"
!define BrandFullName "Mozilla Developer Preview"
!define CompanyName "mozilla.org"
!define URLInfoAbout "https://www.mozilla.org"
!define HelpLink "https://support.mozilla.org"

4
browser/config/mozconfigs/macosx64/debug
View File

@ -10,6 +10,10 @@ export MOZILLA_OFFICIAL=1
# Enable Telemetry
export MOZ_TELEMETRY_REPORTING=1
if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
ac_add_options --with-macbundlename-prefix=Firefox
fi
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1

4
browser/config/mozconfigs/macosx64/debug-asan
View File

@ -9,6 +9,10 @@ ac_add_options --enable-optimize="-O1"
# Enable Telemetry
export MOZ_TELEMETRY_REPORTING=1
if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
ac_add_options --with-macbundlename-prefix=Firefox
fi
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1

4
browser/config/mozconfigs/macosx64/l10n-mozconfig
View File

@ -13,6 +13,10 @@ ac_add_options --with-l10n-base=../../l10n
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --with-branding=browser/branding/nightly
if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
ac_add_options --with-macbundlename-prefix=Firefox
fi
export MOZILLA_OFFICIAL=1
# Enable Telemetry

7
browser/config/mozconfigs/macosx64/nightly
View File

@ -10,6 +10,13 @@ if test `uname -s` != Linux; then
ac_add_options --enable-dtrace
fi
if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
ac_add_options --with-macbundlename-prefix=Firefox
fi
if test "${MOZ_UPDATE_CHANNEL}" = "nightly-try"; then
ac_add_options --with-macbundlename-prefix=Firefox
fi
ac_add_options --with-branding=browser/branding/nightly
. "$topsrcdir/build/mozconfig.common.override"

4
browser/config/mozconfigs/macosx64/nightly-asan
View File

@ -8,6 +8,10 @@ ac_add_options --enable-optimize="-O2"
# Enable Telemetry
export MOZ_TELEMETRY_REPORTING=1
if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
ac_add_options --with-macbundlename-prefix=Firefox
fi
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1

3
browser/config/mozconfigs/whitelist
View File

@ -23,6 +23,9 @@ whitelist['nightly']['linux64'] += [
whitelist['nightly']['macosx64'] += [
'if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then',
'if test "${MOZ_UPDATE_CHANNEL}" = "nightly-try"; then',
'ac_add_options --with-macbundlename-prefix=Firefox',
'fi',
'ac_add_options --disable-install-strip',
'ac_add_options --enable-instruments',
'ac_add_options --enable-dtrace',

2
browser/installer/windows/nsis/defines.nsi.in
View File

@ -36,9 +36,7 @@
!ifndef DEV_EDITION
!define BrandShortName "@MOZ_APP_DISPLAYNAME@"
!endif
!ifndef BrandFullName
!define BrandFullName "${BrandFullNameInternal}"
!endif
!define CERTIFICATE_NAME "Mozilla Corporation"
!define CERTIFICATE_ISSUER "DigiCert SHA2 Assured ID Code Signing CA"

2
browser/installer/windows/nsis/maintenanceservice_installer.nsi
View File

@ -51,9 +51,7 @@ Var BrandFullName
; We keep defines.nsi defined so that we get other things like
; the version number, but we redefine BrandFullName
!define MaintFullName "Mozilla Maintenance Service"
!ifdef BrandFullName
!undef BrandFullName
!endif
!define BrandFullName "${MaintFullName}"
!include common.nsh

4
old-configure.in
View File

@ -4413,11 +4413,11 @@ MOZ_ARG_WITH_STRING(macbundlename-prefix,
MOZ_MACBUNDLE_NAME=$MOZ_APP_DISPLAYNAME
if test "$MOZ_MACBUNDLE_NAME_PREFIX"; then
MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME_PREFIX} ${MOZ_MACBUNDLE_NAME}"
MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME_PREFIX}${MOZ_MACBUNDLE_NAME}"
fi
if test "$MOZ_DEBUG"; then
MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME} Debug.app"
MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME}Debug.app"
else
MOZ_MACBUNDLE_NAME=${MOZ_MACBUNDLE_NAME}.app
fi

2
toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi
View File

@ -51,9 +51,7 @@ Var BrandFullName
; We keep defines.nsi defined so that we get other things like
; the version number, but we redefine BrandFullName
!define MaintFullName "Mozilla Maintenance Service"
!ifdef BrandFullName
!undef BrandFullName
!endif
!define BrandFullName "${MaintFullName}"
!include common.nsh