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

add build.json#envs

Browse Source
This commit is contained in:
Hatter Jiang
2019-08-09 22:35:42 +08:00
parent 2b80bcf4ae
commit c3e01bc908
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.rs
View File

@@ -180,6 +180,10 @@ fn main() {
let java_version_j = &build_json_object["java"]; let java_version_j = &build_json_object["java"];
let builder_name_j = &build_json_object["builder"]["name"]; let builder_name_j = &build_json_object["builder"]["name"];
let builder_version_j = &build_json_object["builder"]["version"]; let builder_version_j = &build_json_object["builder"]["version"];
let envs_j = &build_json_object["envs"];
// envs: [
// ["A", "a"]
//]
if java_version_j.is_null() { if java_version_j.is_null() {
print_message(MessageType::ERROR, "Java version is not assigned!"); print_message(MessageType::ERROR, "Java version is not assigned!");
return; return;
@@ -218,6 +222,20 @@ fn main() {
let builder_home_env = match builder_desc.name { BuilderName::Maven => "MAVEN_HOME", BuilderName::Gradle => "GRADLE_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_home_env.to_string(), builder_desc.home.clone());
if ! envs_j.is_null() {
for env in envs_j.members() {
if *VERBOSE {
print_message(MessageType::DEBUG, &format!("Env: {}", env));
}
let env_k = &env[0];
let env_v = &env[1];
if env_k.is_null() || env_v.is_null() {
continue;
}
new_env.insert(env_k.as_str().unwrap().to_string(), env_v.as_str().unwrap().to_string());
}
}
let cmd_bin = match builder_desc.name { let cmd_bin = match builder_desc.name {
BuilderName::Maven => builder_desc.bin.unwrap_or(format!("{}/bin/mvn", builder_desc.home.clone())), 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())), BuilderName::Gradle => builder_desc.bin.unwrap_or(format!("{}/bin/gradle", builder_desc.home.clone())),