hatter/buildj
1
0
Fork 0
mirror of https://github.com/jht5945/buildj.git synced 2025-12-28 09:40:04 +08:00
Code Issues Releases Wiki Activity

add impl BuilderDesc

Browse Source
This commit is contained in:
Hatter Jiang
2019-08-10 17:35:43 +08:00
parent 10f9a88e1b
commit d6caa137e3
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.rs
View File

@@ -282,17 +282,10 @@ fn main() {
print_message(MessageType::OK, &format!("BUILDER_HOME = {}", &builder_desc.home));
let mut new_env = get_env_with_java_home(&java_home);
let builder_home_env = match builder_desc.name { BuilderName::Maven => "MAVEN_HOME", BuilderName::Gradle => "GRADLE_HOME", };
new_env.insert(builder_home_env.to_string(), builder_desc.home.clone());
new_env.insert(builder_desc.get_builder_home_name(), builder_desc.home.clone());
process_envs(&mut new_env, &build_json_object);
let cmd_bin = match builder_desc.name {
BuilderName::Maven => builder_desc.bin.unwrap_or(format!("{}/bin/mvn", builder_desc.home.clone())),
BuilderName::Gradle => builder_desc.bin.unwrap_or(format!("{}/bin/gradle", builder_desc.home.clone())),
};
let mut cmd = Command::new(cmd_bin);
let mut cmd = Command::new(builder_desc.get_builder_bin());
cmd.envs(&new_env);
let final_args = match get_final_args(&args, &build_json_object) {