From 1eb9a856352181351e6c94af87135cfbbfb1ad2f Mon Sep 17 00:00:00 2001 From: Steve Fink Date: Tue, 29 Sep 2015 13:39:37 -0700 Subject: [PATCH] Bug 1205887 - Verify that MOZILLA_VERSION was set correctly, r=glandium --HG-- extra : commitid : 3g91k2r7xzC extra : rebase_source : 2e49c764882e7234dddcdaea3273b7057ba12543 --- configure.in | 3 +++ js/src/configure.in | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configure.in b/configure.in index 6ab4b7205986..36e438cf10d3 100644 --- a/configure.in +++ b/configure.in @@ -1862,6 +1862,9 @@ 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` +if test -z "$MOZILLA_VERSION"; then + AC_MSG_ERROR([failed to read version info from milestone file]) +fi dnl Get version of various core apps from the version files. FIREFOX_VERSION=`cat $_topsrcdir/browser/config/version.txt` diff --git a/js/src/configure.in b/js/src/configure.in index 99c6ada69b9c..15b2a1c73755 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -707,6 +707,9 @@ 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` +if test -z "$MOZILLA_VERSION"; then + AC_MSG_ERROR([failed to read version info from milestone file]) +fi AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION") AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)