diff options
| author | Ahmed Charles <acharles@outlook.com> | 2016-08-12 23:38:17 -0700 |
|---|---|---|
| committer | Ahmed Charles <acharles@outlook.com> | 2016-10-05 22:42:40 -0700 |
| commit | e6985b2a6daa5acb84f364f6e6ddfdf170c28f2b (patch) | |
| tree | 3c5cf03b61417c8dddb214a3faf6a2a0c0af5c15 | |
| parent | 46957f05771a427545c792f69b37f8e05dcbb15d (diff) | |
| download | rust-e6985b2a6daa5acb84f364f6e6ddfdf170c28f2b.tar.gz rust-e6985b2a6daa5acb84f364f6e6ddfdf170c28f2b.zip | |
rustbuild: Add install target. #34675
It just prints to the screen currently.
| -rw-r--r-- | src/bootstrap/install.rs | 22 | ||||
| -rw-r--r-- | src/bootstrap/lib.rs | 3 | ||||
| -rw-r--r-- | src/bootstrap/mk/Makefile.in | 2 | ||||
| -rw-r--r-- | src/bootstrap/step.rs | 14 |
4 files changed, 37 insertions, 4 deletions
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs new file mode 100644 index 00000000000..8bad3dfb41e --- /dev/null +++ b/src/bootstrap/install.rs @@ -0,0 +1,22 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +//! Implementation of the install aspects of the compiler. +//! +//! This module is responsible for installing the standard library, +//! compiler, and documentation. + +use Build; + +/// Installs everything. +pub fn install(_: &Build, stage: u32, host: &str) { + println!("Install everything stage{} ({})", stage, host); + println!("Note: install currently does nothing."); +} diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index b4f61605d47..9ffc433cd78 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -62,6 +62,7 @@ mod config; mod dist; mod doc; mod flags; +mod install; mod native; mod sanity; mod step; @@ -453,6 +454,8 @@ impl Build { DistStd { compiler } => dist::std(self, &compiler, target.target), DistSrc { _dummy } => dist::rust_src(self), + Install { stage } => install::install(self, stage, target.target), + DebuggerScripts { stage } => { let compiler = Compiler::new(stage, target.target); dist::debugger_scripts(self, diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in index cc44d45c2cc..61d0e254074 100644 --- a/src/bootstrap/mk/Makefile.in +++ b/src/bootstrap/mk/Makefile.in @@ -51,6 +51,8 @@ check-cargotest: $(Q)$(BOOTSTRAP) --step check-cargotest dist: $(Q)$(BOOTSTRAP) --step dist +install: + $(Q)$(BOOTSTRAP) --step install tidy: $(Q)$(BOOTSTRAP) --step check-tidy --stage 0 diff --git a/src/bootstrap/step.rs b/src/bootstrap/step.rs index e3567107884..22539b31ef2 100644 --- a/src/bootstrap/step.rs +++ b/src/bootstrap/step.rs @@ -140,6 +140,9 @@ macro_rules! targets { (dist_std, DistStd { compiler: Compiler<'a> }), (dist_src, DistSrc { _dummy: () }), + // install target + (install, Install { stage: u32 }), + // Misc targets (android_copy_libs, AndroidCopyLibs { compiler: Compiler<'a> }), } @@ -249,8 +252,7 @@ fn top_level(build: &Build) -> Vec<Step> { } } - return targets - + targets } fn add_steps<'a>(build: &'a Build, @@ -467,7 +469,7 @@ impl<'a> Step<'a> { self.dist(stage), ]); } - return base + base } Source::CheckLinkcheck { stage } => { vec![self.tool_linkchecker(stage), self.doc(stage)] @@ -590,7 +592,11 @@ impl<'a> Step<'a> { base.push(target.dist_std(compiler)); } } - return base + base + } + + Source::Install { stage } => { + vec![self.dist(stage)] } Source::AndroidCopyLibs { compiler } => { |
