mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 05:41:12 +00:00
Bug 468197 - Simplify / automate the addition of the pre-release suffix string (e.g. Alpha 1, Beta 2, etc.). r=mconnor
This commit is contained in:
Robert Strong
parent
549c70f22a
commit
9ec371c5b5
@ -20,6 +20,7 @@
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Robert Strong <robert.bugzilla@gmail.com>
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
@ -54,9 +55,14 @@ endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
PRE_RELEASE_SUFFIX = $(shell cat $(srcdir)/../config/version.txt | \
|
||||
sed -e '/pre/s/.*//g' -e '/[ab][0-9]/!s/.*//g' \
|
||||
-e 's/.*[0-9]a\([0-9]\+\)/ Alpha \1/g' -e 's/.*[0-9]b\([0-9]\+\)/ Beta \1/g')
|
||||
|
||||
DEFINES += \
|
||||
-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
|
||||
-DAPP_LICENSE_BLOCK=$(abs_srcdir)/content/overrides/app-license.html \
|
||||
-DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)" \
|
||||
$(NULL)
|
||||
|
||||
ifndef MOZ_BRANDING_DIRECTORY
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
#filter substitution
|
||||
<?xml version="1.0"?>
|
||||
# -*- Mode: HTML -*-
|
||||
#
|
||||
@ -31,6 +32,7 @@
|
||||
# Johnathan Nightingale <johnath@mozilla.com>
|
||||
# Dão Gottwald <dao@mozilla.com>
|
||||
# Ehsan Akhgari <ehsan.akhgari@gmail.com>
|
||||
# Robert Strong <robert.bugzilla@gmail.com>
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
@ -68,19 +70,19 @@
|
||||
onload="BrowserStartup()" onunload="BrowserShutdown()" onclose="return WindowIsClosing();"
|
||||
ondragleave="gBrowser.browserWindowOnDragLeave(event);"
|
||||
ondragenter="gBrowser.browserWindowOnDragEnter(event);"
|
||||
title="&mainWindow.title;"
|
||||
title_normal="&mainWindow.title;"
|
||||
title="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
|
||||
title_normal="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
|
||||
#ifdef XP_MACOSX
|
||||
title_privatebrowsing="&mainWindow.title;&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;"
|
||||
titledefault="&mainWindow.title;"
|
||||
title_privatebrowsing="&mainWindow.title;@PRE_RELEASE_SUFFIX@&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;"
|
||||
titledefault="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
|
||||
titlemodifier=""
|
||||
titlemodifier_normal=""
|
||||
titlemodifier_privatebrowsing="&mainWindow.titlePrivateBrowsingSuffix;"
|
||||
#else
|
||||
title_privatebrowsing="&mainWindow.titlemodifierPrivateBrowsing;"
|
||||
titlemodifier="&mainWindow.titlemodifier;"
|
||||
titlemodifier_normal="&mainWindow.titlemodifier;"
|
||||
titlemodifier_privatebrowsing="&mainWindow.titlemodifierPrivateBrowsing;"
|
||||
title_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
|
||||
titlemodifier="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
|
||||
titlemodifier_normal="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
|
||||
titlemodifier_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
|
||||
#endif
|
||||
titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
|
||||
windowtype="navigator:browser"
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
# NSIS branding defines for unofficial builds.
|
||||
# The official release build branding.nsi is located in other-license/branding/firefox/
|
||||
# The nightly build branding.nsi is located in browser/installer/windows/nsis/
|
||||
!define BrandShortName "Shiretoko"
|
||||
|
||||
# BrandFullNameInternal is used for some registry and file system values
|
||||
# instead of BrandFullName and typically should not be modified.
|
||||
!define BrandFullNameInternal "Shiretoko"
|
||||
@ -45,11 +45,3 @@
|
||||
!define URLInfoAbout "http://www.mozilla.org"
|
||||
!define URLUpdateInfo "http://www.mozilla.org/projects/firefox"
|
||||
!define SurveyURL "https://survey.mozilla.com/1/Mozilla%20Firefox/${AppVersion}/${AB_CD}/exit.html"
|
||||
|
||||
# Everything below this line may be modified for Alpha / Beta releases.
|
||||
!define BrandFullName "Shiretoko"
|
||||
|
||||
# Add !define NO_INSTDIR_FROM_REG to prevent finding a non-default installation
|
||||
# directory in the registry and using that as the default. This prevents
|
||||
# Beta releases built with official branding from finding an existing install
|
||||
# of an official release and defaulting to its installation directory.
|
||||
|
||||
@ -22,6 +22,7 @@
|
||||
# Brian Ryner <bryner@brianryner.com>
|
||||
# Chase Phillips <cmp@mozilla.org>
|
||||
# Ehsan Akhgari <ehsan.akhgari@gmail.com>
|
||||
# Robert Strong <robert.bugzilla@gmail.com>
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
@ -48,6 +49,12 @@ include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
|
||||
|
||||
CONFIG_DIR = instgen
|
||||
SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx
|
||||
APP_VERSION = $(shell cat $(srcdir)/../../config/version.txt)
|
||||
DEFINES += -DAPP_VERSION=$(APP_VERSION)
|
||||
PRE_RELEASE_SUFFIX = $(shell echo $(APP_VERSION) | \
|
||||
sed -e '/pre/s/.*//g' -e '/[ab][0-9]/!s/.*//g' \
|
||||
-e 's/.*[0-9]a\([0-9]\+\)/ Alpha \1/g' -e 's/.*[0-9]b\([0-9]\+\)/ Beta \1/g')
|
||||
DEFINES += -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
|
||||
|
||||
PP_LOCALIZED_FILES = \
|
||||
packages-static \
|
||||
@ -79,9 +86,6 @@ BRANDING_FILES = \
|
||||
|
||||
DEFINES += \
|
||||
-DAB_CD=$(AB_CD) \
|
||||
-DPKG_BASENAME="$(PKG_BASENAME)" \
|
||||
-DPKG_INST_BASENAME="$(PKG_INST_BASENAME)" \
|
||||
-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
|
||||
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
|
||||
-DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME} \
|
||||
-DMOZILLA_VERSION=${MOZILLA_VERSION} \
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
# 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/
|
||||
!define BrandShortName "Minefield"
|
||||
|
||||
# BrandFullNameInternal is used for some registry and file system values
|
||||
# instead of BrandFullName and typically should not be modified.
|
||||
!define BrandFullNameInternal "Minefield"
|
||||
@ -45,11 +45,3 @@
|
||||
!define URLInfoAbout "http://www.mozilla.org"
|
||||
!define URLUpdateInfo "http://www.mozilla.org/projects/firefox"
|
||||
!define SurveyURL "https://survey.mozilla.com/1/Mozilla%20Firefox/${AppVersion}/${AB_CD}/exit.html"
|
||||
|
||||
# Everything below this line may be modified for Alpha / Beta releases.
|
||||
!define BrandFullName "Minefield"
|
||||
|
||||
# Add !define NO_INSTDIR_FROM_REG to prevent finding a non-default installation
|
||||
# directory in the registry and using that as the default. This prevents
|
||||
# Beta releases built with official branding from finding an existing install
|
||||
# of an official release and defaulting to its installation directory.
|
||||
|
||||
@ -1,13 +1,23 @@
|
||||
#filter substitution
|
||||
!define AppVersion "@MOZ_APP_VERSION@"
|
||||
!define AppVersion "@APP_VERSION@"
|
||||
!define GREVersion @MOZILLA_VERSION@
|
||||
!define AB_CD "@AB_CD@"
|
||||
!define FileInstallerEXE "@PKG_INST_BASENAME@.exe"
|
||||
!define FileInstallerMSI "@PKG_INST_BASENAME@.msi"
|
||||
!define FileInstallerNETRoot "@PKG_BASENAME@.net-installer"
|
||||
|
||||
!define FileMainEXE "@MOZ_APP_NAME@.exe"
|
||||
!define WindowClass "FirefoxMessageWindow"
|
||||
!define DDEApplication "Firefox"
|
||||
!define AppRegName "Firefox"
|
||||
!define MinSupportedVer "Microsoft Windows 2000"
|
||||
|
||||
!define BrandShortName "@MOZ_APP_DISPLAYNAME@"
|
||||
!define PreReleaseSuffix "@PRE_RELEASE_SUFFIX@"
|
||||
!define BrandFullName "${BrandFullNameInternal}${PreReleaseSuffix}"
|
||||
|
||||
# NO_INSTDIR_FROM_REG is defined for pre-releases which have a PreReleaseSuffix
|
||||
# (e.g. Alpha X, Beta X, etc.) to prevent finding a non-default installation
|
||||
# directory in the registry and using that as the default. This prevents
|
||||
# Beta releases built with official branding from finding an existing install
|
||||
# of an official release and defaulting to its installation directory.
|
||||
!if "@PRE_RELEASE_SUFFIX@" != ""
|
||||
!define NO_INSTDIR_FROM_REG
|
||||
!endif
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
# NSIS branding defines for official release builds.
|
||||
# The nightly build branding.nsi is located in browser/installer/windows/nsis/
|
||||
# The unofficial build branding.nsi is located in browser/branding/unofficial/
|
||||
!define BrandShortName "Firefox"
|
||||
|
||||
# BrandFullNameInternal is used for some registry and file system values
|
||||
# instead of BrandFullName and typically should not be modified.
|
||||
!define BrandFullNameInternal "Mozilla Firefox"
|
||||
@ -45,11 +45,3 @@
|
||||
!define URLInfoAbout "http://${AB_CD}.www.mozilla.com/${AB_CD}/"
|
||||
!define URLUpdateInfo "http://${AB_CD}.www.mozilla.com/${AB_CD}/firefox/"
|
||||
!define SurveyURL "https://survey.mozilla.com/1/Mozilla%20Firefox/${AppVersion}/${AB_CD}/exit.html"
|
||||
|
||||
# Everything below this line may be modified for Alpha / Beta releases.
|
||||
!define BrandFullName "Mozilla Firefox"
|
||||
|
||||
# Add !define NO_INSTDIR_FROM_REG to prevent finding a non-default installation
|
||||
# directory in the registry and using that as the default. This prevents
|
||||
# Beta releases built with official branding from finding an existing install
|
||||
# of an official release and defaulting to its installation directory.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user