Bug 1437593 - Move initial virtual environment to _virtualenvs/init; r=ted

MozReview-Commit-ID: LP8NVz3tZZg

--HG--
extra : rebase_source : 0ddf9cd58d7258c17ffbed01b435fb58142df7c5

build/moz.configure/init.configure

@@ -233,7 +233,7 @@ def virtualenv_python(env_python, build_env, mozconfig, help):
     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:

js/src/devtools/automation/autospider.py

@@ -581,7 +581,7 @@ if args.variant in ('tsan', 'msan'):
 
 # 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"),

python/mozbuild/mozbuild/base.py

@@ -151,7 +151,7 @@ class MozbuildObject(ProcessExecutionMixin):
                 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)
 
@@ -201,7 +201,7 @@ class MozbuildObject(ProcessExecutionMixin):
     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'))