bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

cargo: Install blobs to $sysroot/(bin|lib) on system-mode

Browse source 
Issue #1795
This commit is contained in:
Tycho Sci 2012-02-20 17:33:50 +09:00
parent ff0ab6b7ee
commit b06cb0df5a
1 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/cargo/cargo.rs
View file

@ -6,7 +6,7 @@ use std;
import rustc::syntax::{ast, codemap}; import rustc::syntax::{ast, codemap};
import rustc::syntax::parse::parser; import rustc::syntax::parse::parser;
import rustc::util::filesearch::{get_cargo_root, get_cargo_root_nearest, import rustc::util::filesearch::{get_cargo_root, get_cargo_root_nearest,
get_cargo_sysroot}; get_cargo_sysroot, libdir};
import rustc::driver::diagnostic; import rustc::driver::diagnostic;
import std::fs; import std::fs;
@ -467,13 +467,34 @@ fn install_one_crate(c: cargo, _path: str, cf: str, _p: pkg) {
#debug(" bin: %s", ct); #debug(" bin: %s", ct);
// FIXME: need libstd fs::copy or something // FIXME: need libstd fs::copy or something
run::run_program("cp", [ct, c.bindir]); run::run_program("cp", [ct, c.bindir]);
if c.opts.mode == system_mode {
install_one_crate_to_sysroot(ct, "bin");
}
} else { } else {
#debug(" lib: %s", ct); #debug(" lib: %s", ct);
run::run_program("cp", [ct, c.libdir]); run::run_program("cp", [ct, c.libdir]);
if c.opts.mode == system_mode {
install_one_crate_to_sysroot(ct, libdir());
}
} }
} }
} }
fn install_one_crate_to_sysroot(ct: str, target: str) {
alt os::get_exe_path() {
some(_path) {
let path = [_path, "..", target];
check vec::is_not_empty(path);
let target_dir = fs::normalize(fs::connect_many(path));
let p = run::program_output("cp", [ct, target_dir]);
if p.status != 0 {
warn(#fmt["Copying %s to %s is failed", ct, target_dir]);
}
}
none { }
}
}
fn rustc_sysroot() -> str { fn rustc_sysroot() -> str {
alt os::get_exe_path() { alt os::get_exe_path() {
some(_path) { some(_path) {
@ -827,8 +848,8 @@ fn cmd_usage() {
" "
init Set up .cargo init Set up .cargo
install [--test] [source/]package-name Install by name install [options] [source/]package-name Install by name
install [--test] uuid:[source/]package-uuid Install by uuid install [options] uuid:[source/]package-uuid Install by uuid
list [source] List packages list [source] List packages
search <name | '*'> [tags...] Search packages search <name | '*'> [tags...] Search packages
sync Sync all sources sync Sync all sources
@ -836,14 +857,16 @@ fn cmd_usage() {
Options: Options:
cargo install
--mode=[system,user,local] change mode as (system/user/local) --mode=[system,user,local] change mode as (system/user/local)
-g equivalent to --mode=user -g equivalent to --mode=user
-G equivalent to --mode=system -G equivalent to --mode=system
NOTE: NOTE:
This command creates/uses local-level .cargo by default. \"cargo install\" installs bin/libs to local-level .cargo by default.
To create/use user-level .cargo, use option -g/--mode=user. To install them into user-level .cargo, use option -g/--mode=user.
To create/use system-level .cargo, use option -G/--mode=system. To install them into bin/lib on sysroot, use option -G/--mode=system.
"); ");
} }