Bug 1437593 - Move initial virtual environment to _virtualenvs/init; r=ted
☠☠ backed out by f28612f1c310 ☠ ☠
authorDave Hunt <dhunt@mozilla.com>
Wed, 28 Mar 2018 12:55:04 +0100
changeset 472195 36c66615886f20ba37c87dc0e565150b8c563f04
parent 472194 dfafbe7770ad4b720eedc326dd80894a31380ba0
child 472196 64c84cf90e8b2ef57d0d7e161813b2383e908e5d
push id1728
push userjlund@mozilla.com
push dateMon, 18 Jun 2018 21:12:27 +0000
treeherdermozilla-release@c296fde26f5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1437593
milestone61.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 1437593 - Move initial virtual environment to _virtualenvs/init; r=ted MozReview-Commit-ID: LP8NVz3tZZg
build/moz.configure/init.configure
js/src/devtools/automation/autospider.py
python/mozbuild/mozbuild/base.py
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -228,17 +228,17 @@ def virtualenv_python(env_python, build_
         verify_python_version(out)
     topsrcdir, topobjdir = build_env.topsrcdir, build_env.topobjdir
     if topobjdir.endswith('/js/src'):
         topobjdir = topobjdir[:-7]
 
     with LineIO(lambda l: log.info(l), 'replace') as out:
         manager = VirtualenvManager(
             topsrcdir, topobjdir,
-            os.path.join(topobjdir, '_virtualenv'), out,
+            os.path.join(topobjdir, '_virtualenvs', 'init'), out,
             os.path.join(topsrcdir, 'build', 'virtualenv_packages.txt'))
 
     if python:
         # If we're not in the virtualenv, we need the which module for
         # find_program.
         if normsep(sys.executable) != normsep(manager.python_path):
             sys.path.append(os.path.join(
                 topsrcdir, 'third_party', 'python', 'which'))
--- a/js/src/devtools/automation/autospider.py
+++ b/js/src/devtools/automation/autospider.py
@@ -576,17 +576,17 @@ if args.variant in ('tsan', 'msan'):
     # these files will be lost due to being overwritten.
     command = ['tar', '-C', OUTDIR, '-zcf',
                os.path.join(env['MOZ_UPLOAD_DIR'], '%s.tar.gz' % args.variant)]
     command += files
     subprocess.call(command)
 
 # Generate stacks from minidumps.
 if use_minidump:
-    venv_python = os.path.join(OBJDIR, "_virtualenv", "bin", "python")
+    venv_python = os.path.join(OBJDIR, "_virtualenvs", "init", "bin", "python")
     run_command([
         venv_python,
         os.path.join(DIR.source, "testing/mozbase/mozcrash/mozcrash/mozcrash.py"),
         os.getenv("TMPDIR", "/tmp"),
         os.path.join(OBJDIR, "dist/crashreporter-symbols"),
     ])
 
 for st in results:
--- a/python/mozbuild/mozbuild/base.py
+++ b/python/mozbuild/mozbuild/base.py
@@ -146,17 +146,17 @@ class MozbuildObject(ProcessExecutionMix
             # We choose an arbitrary file as an indicator that this is a
             # srcdir. We go with ourself because why not!
             our_path = os.path.join(dir_path, 'python', 'mozbuild', 'mozbuild', 'base.py')
             if os.path.isfile(our_path):
                 topsrcdir = dir_path
                 break
 
         # See if we're running from a Python virtualenv that's inside an objdir.
-        mozinfo_path = os.path.join(os.path.dirname(sys.prefix), "mozinfo.json")
+        mozinfo_path = os.path.join(os.path.dirname(sys.prefix), "../mozinfo.json")
         if detect_virtualenv_mozinfo and os.path.isfile(mozinfo_path):
             topsrcdir, topobjdir, mozconfig = load_mozinfo(mozinfo_path)
 
         # If we were successful, we're only guaranteed to find a topsrcdir. If
         # we couldn't find that, there's nothing we can do.
         if not topsrcdir:
             raise BuildEnvironmentNotFoundException(
                 'Could not find Mozilla source tree or build environment.')
@@ -196,17 +196,17 @@ class MozbuildObject(ProcessExecutionMix
                 default='obj-@CONFIG_GUESS@')
 
         return self._topobjdir
 
     @property
     def virtualenv_manager(self):
         if self._virtualenv_manager is None:
             self._virtualenv_manager = VirtualenvManager(self.topsrcdir,
-                self.topobjdir, os.path.join(self.topobjdir, '_virtualenv'),
+                self.topobjdir, os.path.join(self.topobjdir, '_virtualenvs', 'init'),
                 sys.stdout, os.path.join(self.topsrcdir, 'build',
                 'virtualenv_packages.txt'))
 
         return self._virtualenv_manager
 
     @property
     def mozconfig(self):
         """Returns information about the current mozconfig file.