Bug 1174558 - Use separate file for the about window version r=glandium
authorSylvestre Ledru <sylvestre@debian.org>
Mon, 15 Jun 2015 11:50:40 +0200
changeset 249052 68c24c8bf174712eeb201186e22b2bad2ae10ce1
parent 249051 fd6c99f92485b60209f8043e9f91ffb7707806af
child 249053 efd38e59dbc8b9342d085d829cf820a4a432e38b
push id28914
push usercbook@mozilla.com
push dateTue, 16 Jun 2015 14:11:13 +0000
treeherdermozilla-central@abaec2f7ed2c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1174558, 100644
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1174558 - Use separate file for the about window version r=glandium A single file with two lines was breaking too much things --- browser/config/version.txt | 2 -- browser/config/version_about.txt | 1 + configure.in | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 browser/config/version_about.txt
browser/config/version.txt
browser/config/version_about.txt
configure.in
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1,3 +1,1 @@
 41.0a1
-# Version to display in the about box:
-41.0a1
new file mode 100644
--- /dev/null
+++ b/browser/config/version_about.txt
@@ -0,0 +1,1 @@
+41.0a1
--- a/configure.in
+++ b/configure.in
@@ -1953,18 +1953,18 @@ esac
 dnl ==============================================================
 dnl Get mozilla version from central milestone file
 dnl ==============================================================
 MOZILLA_VERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir`
 MOZILLA_UAVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --uaversion`
 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|head -1`
-FIREFOX_VERSION_ABOUT=`cat $_topsrcdir/browser/config/version.txt|tail -1`
+FIREFOX_VERSION=`cat $_topsrcdir/browser/config/version.txt`
+FIREFOX_VERSION_ABOUT=`cat $_topsrcdir/browser/config/version_about.txt`
 
 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