Bug 1385241 - Remove mozilla-build specific rust install. r?ted.mielczarek draft
authorSingingTree <bvandyk@mozilla.com>
Thu, 07 Sep 2017 17:37:53 +1200
changeset 664993 76b9751d51a1aca0a7607f6ca27f274eddd148a2
parent 664985 593158cd491002031b4527a95d9bfac79c0cdcef
child 731623 e99372bfd2faf68c27832d48a3b9a37a8ace3cec
push id79894
push userbvandyk@mozilla.com
push dateThu, 14 Sep 2017 19:59:08 +0000
reviewersted.mielczarek
bugs1385241
milestone57.0a1
Bug 1385241 - Remove mozilla-build specific rust install. r?ted.mielczarek The MozillaBuildBootstrapper specific rust install code in not needed as mozbase already includes genertic code to achieve the same outcome. The mozilla-build specific code also leads to issues where it tries to add already existing targets and fails the bootstrap. This changeset removes the mozilla-build specific step. MozReview-Commit-ID: G0BqKZrF40A
python/mozboot/mozboot/mozillabuild.py
--- a/python/mozboot/mozboot/mozillabuild.py
+++ b/python/mozboot/mozboot/mozillabuild.py
@@ -15,47 +15,17 @@ class MozillaBuildBootstrapper(BaseBoots
     def __init__(self, no_interactive=False):
         BaseBootstrapper.__init__(self, no_interactive=no_interactive)
         print("mach bootstrap is not fully implemented in MozillaBuild")
 
     def which(self, name):
         return BaseBootstrapper.which(self, name + '.exe')
 
     def install_system_packages(self):
-        self.install_rustup()
-
-    def install_rustup(self):
-        try:
-            rustup_init = tempfile.gettempdir() + '/rustup-init.exe'
-            self.http_download_and_save(
-                    'https://static.rust-lang.org/rustup/archive/1.6.0/i686-pc-windows-msvc/rustup-init.exe',
-                    rustup_init,
-                    '9855b9f0b19fd83c056185e083b6b345982becc2f8c608aac14998a73bcc2937')
-            self.run([rustup_init, '--no-modify-path', '--default-host',
-                'x86_64-pc-windows-msvc', '--default-toolchain', 'stable', '-y'])
-            mozillabuild_dir = os.environ['MOZILLABUILD']
-
-            with open(mozillabuild_dir + 'msys/etc/profile.d/profile-rustup.sh', 'wb') as f:
-                f.write('#!/bash/sh\n')
-                f.write('if test -n "$MOZILLABUILD"; then\n')
-                f.write('    WIN_HOME=$(command cd "$HOME" && pwd)\n')
-                f.write('    PATH="$WIN_HOME/.cargo/bin:$PATH"\n')
-                f.write('    export PATH\n')
-                f.write('fi')
-            _, cargo_bin = self.cargo_home()
-            rustup = os.path.join(cargo_bin, 'rustup')
-            self.run([rustup, 'target', 'add', 'i686-pc-windows-msvc'])
-        finally:
-            try:
-                os.remove(rustup_init)
-            except OSError as e:
-                if e.errno == errno.ENOENT:
-                    pass
-                else:
-                    raise
+        pass
 
     def ensure_mercurial_modern(self):
         # Overrides default implementation to always run pip because.
         print('Running pip to ensure Mercurial is up-to-date...')
         self.run([self.which('pip'), 'install', '--upgrade', 'Mercurial'])
         return True, True
 
     def upgrade_python(self, current):