Backed out 6 changesets (bug 1502457) for build bustages. CLOSED TREE

Backed out changeset febdb867785a (bug 1502457)
Backed out changeset 7ea52c602445 (bug 1502457)
Backed out changeset 73bb6a74cad0 (bug 1502457)
Backed out changeset b172bda6e983 (bug 1502457)
Backed out changeset 0e283ddc6c3b (bug 1502457)
Backed out changeset 638fa0251123 (bug 1502457)

browser/confvars.sh

@@ -31,6 +31,9 @@ fi
 # Enable building ./signmar and running libmar signature tests
 MOZ_ENABLE_SIGNMAR=1
 
+MOZ_APP_VERSION=$FIREFOX_VERSION
+MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY
+
 if [ "${MOZ_BROWSER_XHTML}" = "1" ]; then
   BROWSER_CHROME_URL=chrome://browser/content/browser.xhtml
 else

browser/installer/windows/moz.build

@@ -4,7 +4,7 @@
 # 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/.
 
-DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
+DEFINES['APP_VERSION'] = CONFIG['FIREFOX_VERSION']
 
 DEFINES['MOZ_APP_NAME'] = CONFIG['MOZ_APP_NAME']
 DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME']

build/moz.configure/init.configure

@@ -1036,74 +1036,20 @@ set_define('MOZ_BUILD_APP', build_project)
 add_old_configure_assignment('MOZ_BUILD_APP', build_project)
 
 
-# This is temporary until js/src/configure and configure are merged.
-# Use instead of option() in js/moz.configure and more generally, for
-# options that are shared between configure and js/src/configure.
-@template
-def js_option(*args, **kwargs):
-    opt = option(*args, **kwargs)
-
-    @depends(opt.option, build_project, when=kwargs.get('when'))
-    def js_option(value, build_project):
-        if build_project != 'js':
-            return value.format(opt.option)
-
-    add_old_configure_arg(js_option)
-
-
-js_option(env='MOZILLA_OFFICIAL',
-          help='Build an official release')
-
-
-@depends('MOZILLA_OFFICIAL')
-def mozilla_official(official):
-    if official:
-        return True
-
-
-set_config('MOZILLA_OFFICIAL', mozilla_official)
-set_define('MOZILLA_OFFICIAL', mozilla_official)
-add_old_configure_assignment('MOZILLA_OFFICIAL', mozilla_official)
-
-
 # set RELEASE_OR_BETA and NIGHTLY_BUILD variables depending on the cycle we're in
 # The logic works like this:
 # - if we have "a1" in GRE_MILESTONE, we're building Nightly (define NIGHTLY_BUILD)
 # - otherwise, if we have "a" in GRE_MILESTONE, we're building Nightly or Aurora
 # - otherwise, we're building Release/Beta (define RELEASE_OR_BETA)
-@depends(check_build_environment, build_project, '--help')
+@depends(check_build_environment, '--help')
 @imports(_from='__builtin__', _import='open')
-@imports('os')
 @imports('re')
-def milestone(build_env, build_project, _):
-    versions = []
-    paths = [
-        'config/milestone.txt',
-        'browser/config/version.txt',
-        'browser/config/version_display.txt',
-    ]
-    for f in ('version.txt', 'version_display.txt'):
-        f = os.path.join(build_project, f)
-        if not os.path.exists(os.path.join(build_env.topsrcdir, f)):
-            break
-        paths.append(f)
-
-    for p in paths:
-        with open(os.path.join(build_env.topsrcdir, p), 'r') as fh:
-            content = fh.read().splitlines()
-            if not content:
-                die('Could not find a version number in {}'.format(p))
-            versions.append(content[-1])
-
-    milestone, firefox_version, firefox_version_display = versions[:3]
-
-    # version.txt content from the project directory if there is one, otherwise
-    # the firefox version.
-    app_version = versions[3] if len(versions) > 3 else firefox_version
-    # version_display.txt content from the project directory if there is one,
-    # otherwise version.txt content from the project directory, otherwise the
-    # firefox version for display.
-    app_version_display = versions[-1] if len(versions) > 3 else firefox_version_display
+def milestone(build_env, _):
+    milestone_path = os.path.join(build_env.topsrcdir,
+                                  'config',
+                                  'milestone.txt')
+    with open(milestone_path, 'r') as fh:
+        milestone = fh.read().splitlines()[-1]
 
     is_nightly = is_release_or_beta = None
 
@@ -1125,9 +1071,7 @@ def milestone(build_env, build_project, _):
                      uaversion='%s.0' % major_version,
                      symbolversion='%s%s' % (major_version, ab_patch),
                      is_nightly=is_nightly,
-                     is_release_or_beta=is_release_or_beta,
-                     app_version=app_version,
-                     app_version_display=app_version_display)
+                     is_release_or_beta=is_release_or_beta)
 
 
 set_config('GRE_MILESTONE', milestone.version)
@@ -1147,39 +1091,19 @@ set_config('MOZILLA_SYMBOLVERSION', milestone.symbolversion)
 add_old_configure_assignment('MOZILLA_VERSION', milestone.version)
 add_old_configure_assignment('MOZILLA_SYMBOLVERSION', milestone.symbolversion)
 
-set_config('MOZ_APP_VERSION', milestone.app_version)
-set_config('MOZ_APP_VERSION_DISPLAY', milestone.app_version_display)
-add_old_configure_assignment('MOZ_APP_VERSION', milestone.app_version)
-
-
-# The app update channel is 'default' when not supplied, and MOZILLA_OFFICIAL
-# is not set. When MOZILLA_OFFICIAL is set, the default is derived from
-# the application display version.
-@depends(milestone, mozilla_official)
-def default_update_channel(milestone, mozilla_official):
-    if not mozilla_official:
-        return 'default'
-    if milestone.is_release_or_beta:
-        if 'esr' in milestone.app_version_display:
-            return 'esr'
-        if 'b' in milestone.app_version_display:
-            return 'beta'
-        return 'release'
-    if milestone.is_nightly:
-        return 'nightly'
-    return 'default'
-
-
+# The app update channel is 'default' when not supplied. The value is used in
+# the application's confvars.sh (and is made available to a project specific
+# moz.configure).
 option('--enable-update-channel',
        nargs=1,
        help='Select application update channel',
-       default=default_update_channel)
+       default='default')
 
 
-@depends('--enable-update-channel', default_update_channel)
-def update_channel(channel, default_update_channel):
+@depends('--enable-update-channel')
+def update_channel(channel):
     if channel[0] == '':
-        return default_update_channel
+        return 'default'
     return channel[0].lower()
 
 
@@ -1263,3 +1187,18 @@ def all_configure_options():
 
 
 set_config('MOZ_CONFIGURE_OPTIONS', all_configure_options)
+
+
+# This is temporary until js/src/configure and configure are merged.
+# Use instead of option() in js/moz.configure and more generally, for
+# options that are shared between configure and js/src/configure.
+@template
+def js_option(*args, **kwargs):
+    opt = option(*args, **kwargs)
+
+    @depends(opt.option, build_project, when=kwargs.get('when'))
+    def js_option(value, build_project):
+        if build_project != 'js':
+            return value.format(opt.option)
+
+    add_old_configure_arg(js_option)

embedding/ios/confvars.sh

@@ -6,3 +6,4 @@
 MOZ_APP_NAME=geckoembed
 MOZ_APP_DISPLAYNAME=GeckoEmbed
 MOZ_UPDATER=
+MOZ_APP_VERSION=$MOZILLA_VERSION

extensions/confvars.sh

@@ -5,3 +5,4 @@
 
 MOZ_APP_NAME=mozilla
 MOZ_APP_DISPLAYNAME=Mozilla
+MOZ_APP_VERSION=$MOZILLA_VERSION

js/src/old-configure.in

@@ -1705,6 +1705,7 @@ AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 
 AC_SUBST(MOZ_APP_NAME)
 AC_SUBST(MOZ_APP_DISPLAYNAME)
+AC_SUBST(MOZ_APP_VERSION)
 
 AC_SUBST(MOZ_PKG_SPECIAL)
 
@@ -1824,6 +1825,7 @@ AC_SUBST(ac_configure_args)
 
 if test -n "$JS_STANDALONE"; then
 MOZ_APP_NAME="mozjs"
+MOZ_APP_VERSION="$MOZILLA_SYMBOLVERSION"
 JS_LIBRARY_NAME="mozjs-$MOZILLA_SYMBOLVERSION"
 else
 JS_LIBRARY_NAME="mozjs"

mobile/android/confvars.sh

@@ -5,6 +5,8 @@
 MOZ_APP_BASENAME=Fennec
 MOZ_APP_VENDOR=Mozilla
 
+MOZ_APP_VERSION=$FIREFOX_VERSION
+MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY
 MOZ_APP_UA_NAME=Firefox
 
 BROWSER_CHROME_URL=chrome://browser/content/browser.xul

moz.configure

@@ -69,6 +69,18 @@ def enable_tests(value):
 set_config('ENABLE_TESTS', enable_tests)
 set_define('ENABLE_TESTS', enable_tests)
 
+js_option(env='MOZILLA_OFFICIAL',
+          help='Build an official release')
+
+@depends('MOZILLA_OFFICIAL')
+def mozilla_official(official):
+    if official:
+        return True
+
+set_config('MOZILLA_OFFICIAL', mozilla_official)
+set_define('MOZILLA_OFFICIAL', mozilla_official)
+add_old_configure_assignment('MOZILLA_OFFICIAL', mozilla_official)
+
 @depends(enable_tests)
 def gtest_has_rtti(value):
     if value:

old-configure.in

@@ -689,6 +689,18 @@ case "$host" in
     ;;
 esac
 
+dnl Get version of various core apps from the version files.
+FIREFOX_VERSION=`cat $_topsrcdir/browser/config/version.txt`
+FIREFOX_VERSION_DISPLAY=`cat $_topsrcdir/browser/config/version_display.txt`
+
+if test -z "$FIREFOX_VERSION"; then
+    AC_MSG_ERROR([FIREFOX_VERSION is unexpectedly blank.])
+fi
+
+if test -z "$FIREFOX_VERSION_DISPLAY"; then
+    AC_MSG_ERROR([FIREFOX_VERSION_DISPLAY is unexpectedly blank.])
+fi
+
 MOZ_DOING_LTO(lto_is_enabled)
 
 dnl ========================================================
@@ -3959,6 +3971,9 @@ AC_SUBST(MOZ_CHILD_PROCESS_BUNDLENAME)
 # - MOZ_APP_DISPLAYNAME: Used in user-visible fields (DLL properties,
 # Mac Bundle name, Updater, Installer), it is typically used for nightly
 # builds (e.g. Aurora for Firefox).
+# - MOZ_APP_VERSION: Defines the application version number.
+# - MOZ_APP_VERSION_DISPLAY: Defines the application version number. Used
+# in the "About" window. If not set, defaults to MOZ_APP_VERSION.
 # - MOZ_APP_NAME: Used for e.g. the binary program file name. If not set,
 # defaults to a lowercase form of MOZ_APP_BASENAME.
 # - MOZ_APP_REMOTINGNAME: Used for the internal program name, which affects
@@ -3978,15 +3993,6 @@ AC_SUBST(MOZ_CHILD_PROCESS_BUNDLENAME)
 # - MOZ_MMA_GCM_SENDERID: This GCM Sender ID is used for MMA integration.
 # - MOZ_PROFILE_MIGRATOR: When set, enables profile migrator.
 
-# The following environment variables used to have an effect, but don't anymore:
-# - MOZ_APP_VERSION: Defines the application version number. This was replaced with
-# the contents from the version.txt file in the application directory, or
-# browser/config/version.txt if there isn't one.
-# - MOZ_APP_VERSION_DISPLAY: Defines the application version number. Used
-# in the "About" window. This was replaced with the contents from the
-# version_display.txt or version.txt in the application directory, or
-# browser/config/version_display.txt.
-
 if test -z "$MOZ_APP_NAME"; then
    MOZ_APP_NAME=`echo $MOZ_APP_BASENAME | tr A-Z a-z`
 fi
@@ -3995,6 +4001,10 @@ if test -z "$MOZ_APP_REMOTINGNAME"; then
    MOZ_APP_REMOTINGNAME=$MOZ_APP_NAME
 fi
 
+if test -z "$MOZ_APP_VERSION_DISPLAY"; then
+   MOZ_APP_VERSION_DISPLAY=$MOZ_APP_VERSION
+fi
+
 if test -z "$ANDROID_PACKAGE_NAME" ; then
    # When we got rid of the Aurora channel we decided to replace the old
    # Nightly ANDROID_PACKAGE_NAME with Aurora. To make sure this is inherited
@@ -4055,10 +4065,14 @@ AC_SUBST(MOZ_PROFILE_MIGRATOR)
 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_DISPLAY)
 AC_DEFINE_UNQUOTED(BROWSER_CHROME_URL, $BROWSER_CHROME_URL)
 AC_DEFINE_UNQUOTED(BROWSER_CHROME_URL_QUOTED, "$BROWSER_CHROME_URL")
 
 AC_SUBST(MOZ_APP_MAXVERSION)
+AC_DEFINE_UNQUOTED(FIREFOX_VERSION,$FIREFOX_VERSION)
+AC_SUBST(FIREFOX_VERSION)
 AC_SUBST(MOZ_UA_OS_AGNOSTIC)
 if test -n "$MOZ_UA_OS_AGNOSTIC"; then
   AC_DEFINE(MOZ_UA_OS_AGNOSTIC)