development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-10-13 19:22:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Have cargo-compile automatically find the root

Browse source 
TODO: Deal with Paths vs. Strings (which come from serialized forms like
flags and manifests)
This commit is contained in:
Yehuda Katz 2014-05-07 16:46:43 -07:00
parent d28ce72351
commit 0bec82d6ea
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/bin/cargo-compile.rs
View file

@ -7,12 +7,14 @@ extern crate serialize;
use cargo::ops::cargo_compile::compile;
use cargo::core::errors::{CLIResult,CLIError,ToResult};
use cargo::util::important_paths::find_project;
use hammer::{FlagDecoder,FlagConfig,HammerError};
use serialize::Decodable;
use std::os;
#[deriving(Eq,Clone,Decodable,Encodable)]
pub struct Options {
manifest_path: ~str
manifest_path: Option<~str>
}
impl FlagConfig for Options {}
@ -23,7 +25,17 @@ fn flags<T: FlagConfig + Decodable<FlagDecoder, HammerError>>() -> CLIResult<T>
}
fn execute() -> CLIResult<()> {
compile(try!(flags::<Options>()).manifest_path.as_slice()).to_result(|err|
let options = try!(flags::<Options>());
let root = match options.manifest_path {
Some(path) => Path::new(path),
None => try!(find_project(os::getcwd(), "Cargo.toml".to_owned())
.map(|path| path.join("Cargo.toml"))
.to_result(|err|
CLIError::new("Could not find Cargo.toml in this directory or any parent directory", Some(err.to_str()), 1)))
};
compile(root.as_str().unwrap().as_slice()).to_result(|err|
CLIError::new(format!("Compilation failed: {}", err), None, 1))
}