wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1145175 - Include the beta version in 'About Firefox' r=glandium

Browse Source 
This should not have any effect on nightly or aurora.
Also fix browser/installer/windows/Makefile.in
webapprt/win/Makefile.in to use the variable instead
of the file
This commit is contained in:
Sylvestre Ledru 2015-06-12 11:54:28 +02:00
parent bf64a8192d
commit 730c8097b4
9 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/aboutDialog.xul
View File

@ -42,7 +42,7 @@
<hbox id="clientBox">
<vbox id="leftBox" flex="1"/>
<vbox id="rightBox" flex="1">
#expand <label id="version">__MOZ_APP_VERSION__</label>
#expand <label id="version">__MOZ_APP_VERSION_ABOUT__</label>
<label id="distribution" class="text-blurb"/>
<label id="distributionId" class="text-blurb"/>

1
browser/base/moz.build
View File

@ -25,6 +25,7 @@ BROWSER_CHROME_MANIFESTS += [
]
DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
DEFINES['MOZ_APP_VERSION_ABOUT'] = CONFIG['MOZ_APP_VERSION_ABOUT']
DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR

3
browser/config/version.txt
View File

@ -1 +1,4 @@
41.0a1
# Version to display in the about box:
41.0a1

1
browser/confvars.sh
View File

@ -38,6 +38,7 @@ MOZ_SERVICES_METRICS=1
MOZ_SERVICES_SYNC=1
MOZ_SERVICES_CLOUDSYNC=1
MOZ_APP_VERSION=$FIREFOX_VERSION
MOZ_APP_VERSION_ABOUT=$FIREFOX_VERSION_ABOUT
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

2
browser/installer/windows/Makefile.in
View File

@ -6,7 +6,7 @@ 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)
APP_VERSION := $(FIREFOX_VERSION)
DEFINES += -DAPP_VERSION=$(APP_VERSION)
INSTALLER_FILES = \

8
configure.in
View File

@ -1947,12 +1947,17 @@ MOZILLA_UAVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsr
MOZILLA_SYMBOLVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --symbolversion`
dnl Get version of various core apps from the version files.
FIREFOX_VERSION=`cat $_topsrcdir/browser/config/version.txt`
FIREFOX_VERSION=`cat $_topsrcdir/browser/config/version.txt|head -1`
FIREFOX_VERSION_ABOUT=`cat $_topsrcdir/browser/config/version.txt|tail -1`
if test -z "$FIREFOX_VERSION"; then
AC_MSG_ERROR([FIREFOX_VERSION is unexpectedly blank.])
fi
if test -z "$FIREFOX_VERSION_ABOUT"; then
AC_MSG_ERROR([FIREFOX_VERSION_ABOUT is unexpectedly blank.])
fi
AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)
AC_DEFINE_UNQUOTED(MOZILLA_UAVERSION,"$MOZILLA_UAVERSION")
@ -8692,6 +8697,7 @@ AC_DEFINE_UNQUOTED(MOZ_APP_UA_NAME, "$MOZ_APP_UA_NAME")
AC_SUBST(MOZ_APP_UA_NAME)
AC_DEFINE_UNQUOTED(MOZ_APP_UA_VERSION, "$MOZ_APP_VERSION")
AC_SUBST(MOZ_APP_VERSION)
AC_SUBST(MOZ_APP_VERSION_ABOUT)
AC_SUBST(MOZ_APP_MAXVERSION)
AC_DEFINE_UNQUOTED(FIREFOX_VERSION,$FIREFOX_VERSION)
AC_SUBST(FIREFOX_VERSION)

2
mobile/android/chrome/content/about.js
View File

@ -9,7 +9,7 @@ Cu.import("resource://gre/modules/Services.jsm");
function init() {
// Include the build date and a warning about Telemetry
// if this is an "a#" (nightly or aurora) build
#expand const version = "__MOZ_APP_VERSION__";
#expand const version = "__MOZ_APP_VERSION_ABOUT__";
if (/a\d+$/.test(version)) {
let buildID = Services.appinfo.appBuildID;
let buildDate = buildID.slice(0, 4) + "-" + buildID.slice(4, 6) + "-" + buildID.slice(6, 8);

2
mobile/android/chrome/content/about.xhtml
View File

@ -24,7 +24,7 @@
<body dir="&locale.dir;">
<div id="header">
<div id="wordmark"></div>
#expand <p id="version">__MOZ_APP_VERSION__</p>
#expand <p id="version">__MOZ_APP_VERSION_ABOUT__</p>
</div>
<div id="banner">

2
webapprt/win/Makefile.in
View File

@ -15,7 +15,7 @@ include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
CONFIG_DIR = instgen
SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx
APP_VERSION := $(shell cat $(topsrcdir)/browser/config/version.txt)
APP_VERSION := $(FIREFOX_VERSION)
DEFINES += -DAPP_VERSION=$(APP_VERSION)
# Uninstaller