Backed out changeset 7dcc2fa474a8 (bug 1448349) for causing win2012 bustages CLOSED TREE
authorCiure Andrei <aciure@mozilla.com>
Wed, 20 Nov 2019 03:39:39 +0200
changeset 502733 0f73b8cd0915bab32ed09d7c4c79477141e71469
parent 502732 edb87ed43383c03cc6dd9644c785e3990854081e
child 502734 8f66f73bb335cbf15d125c8e434c403bb399f875
push id101019
push useraciure@mozilla.com
push dateWed, 20 Nov 2019 01:41:18 +0000
treeherderautoland@8f66f73bb335 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1448349
milestone72.0a1
backs out7dcc2fa474a86bc2064b8ffa13e35f3ee7259344
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
Backed out changeset 7dcc2fa474a8 (bug 1448349) for causing win2012 bustages CLOSED TREE
build/moz.configure/old.configure
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -64,35 +64,33 @@ def prepare_mozconfig(mozconfig):
         for key, (old, value) in mozconfig['vars']['modified'].items():
             items[key] = (value, 'modified')
         for t in ('env', 'vars'):
             for key in mozconfig[t]['removed'].keys():
                 items[key] = (None, 'removed ' + t)
         return items
 
 
-@depends('OLD_CONFIGURE', 'MOZILLABUILD', prepare_mozconfig, autoconf, check_build_environment,
+@depends('OLD_CONFIGURE', prepare_mozconfig, autoconf, check_build_environment,
          shell, old_configure_assignments, build_project)
 @imports(_from='__builtin__', _import='open')
 @imports(_from='__builtin__', _import='print')
 @imports(_from='__builtin__', _import='sorted')
 @imports('glob')
 @imports('itertools')
-@imports('os')
 @imports('subprocess')
 # Import getmtime without overwriting the sandbox os.path.
 @imports(_from='os.path', _import='getmtime')
 @imports(_from='os.path', _import='exists')
 @imports(_from='mozbuild.shellutil', _import='quote')
 @imports(_from='tempfile', _import='NamedTemporaryFile')
 @imports(_from='os', _import='remove')
 @imports(_from='os', _import='rename')
-@imports(_from='subprocess', _import='CalledProcessError')
 @imports(_from='__builtin__', _import='OSError')
-def prepare_configure(old_configure, mozillabuild, mozconfig, autoconf, build_env, shell,
+def prepare_configure(old_configure, mozconfig, autoconf, build_env, shell,
                       old_configure_assignments, build_project):
     # os.path.abspath in the sandbox will ensure forward slashes on Windows,
     # which is actually necessary because this path actually ends up literally
     # as $0, and backslashes there breaks autoconf's detection of the source
     # directory.
     old_configure = os.path.abspath(old_configure[0])
     if build_project == 'js':
         old_configure_dir = os.path.dirname(old_configure)
@@ -112,35 +110,20 @@ def prepare_configure(old_configure, moz
         ):
             if getmtime(input) > mtime:
                 break
         else:
             refresh = False
 
     if refresh:
         log.info('Refreshing %s with %s', old_configure, autoconf)
-
-        try:
-            script = subprocess.check_output([
-                shell, autoconf,
-                '--localdir=%s' % os.path.dirname(old_configure),
-                old_configure + '.in'])
-        except CalledProcessError as exc:
-            # Autoconf on win32 may break due to a bad $PATH.  Let the user know
-            # their $PATH is suspect.
-            if mozillabuild:
-                mozillabuild_path = normsep(mozillabuild[0])
-                sh_path = normsep(find_program('sh'))
-                if mozillabuild_path not in sh_path:
-                    log.warning("The '{}msys/bin' directory is not first in $PATH. "
-                                "This may cause autoconf to fail. ($PATH is currently "
-                                "set to: {})".format(mozillabuild_path, os.environ[
-                        'PATH']))
-            die('autoconf exited with return code {}'.format(exc.returncode))
-
+        script = subprocess.check_output([
+            shell, autoconf,
+            '--localdir=%s' % os.path.dirname(old_configure),
+            old_configure + '.in'])
         if not script:
             die('Generated old-configure is empty! Check that your autoconf 2.13 program works!')
 
         # Make old-configure append to config.log, where we put our own log.
         # This could be done with a m4 macro, but it's way easier this way
         script = script.replace('>./config.log', '>>${CONFIG_LOG=./config.log}')
 
         with NamedTemporaryFile(mode='wb', prefix=os.path.basename(old_configure),