Skip to content

Commit

Permalink
rustbuild: Add install target. #34675
Browse files Browse the repository at this point in the history
It just prints to the screen currently.
  • Loading branch information
ahmedcharles committed Oct 6, 2016
1 parent 46957f0 commit e6985b2
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 4 deletions.
22 changes: 22 additions & 0 deletions 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.");
}
3 changes: 3 additions & 0 deletions src/bootstrap/lib.rs
Expand Up @@ -62,6 +62,7 @@ mod config;
mod dist;
mod doc;
mod flags;
mod install;
mod native;
mod sanity;
mod step;
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions src/bootstrap/mk/Makefile.in
Expand Up @@ -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

Expand Down
14 changes: 10 additions & 4 deletions src/bootstrap/step.rs
Expand Up @@ -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> }),
}
Expand Down Expand Up @@ -249,8 +252,7 @@ fn top_level(build: &Build) -> Vec<Step> {
}
}

return targets

targets
}

fn add_steps<'a>(build: &'a Build,
Expand Down Expand Up @@ -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)]
Expand Down Expand Up @@ -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 } => {
Expand Down

0 comments on commit e6985b2

Please sign in to comment.