mirror of
https://github.com/jht5945/buildj.git
synced 2025-12-29 18:30:05 +08:00
add +BUILDJ_JAVA_NAME
This commit is contained in:
@@ -28,6 +28,10 @@ const MACOS_LIBEXEC_JAVAHOME: &str = "/usr/libexec/java_home";
|
|||||||
|
|
||||||
pub const LOCAL_JAVA_HOME_BASE_DIR: &str = ".jssp/jdks";
|
pub const LOCAL_JAVA_HOME_BASE_DIR: &str = ".jssp/jdks";
|
||||||
|
|
||||||
|
lazy_static! {
|
||||||
|
pub static ref BUILDJ_JAVA_NAME: Option<String> = env::var("BUILDJ_JAVA_NAME").ok();
|
||||||
|
}
|
||||||
|
|
||||||
pub fn get_java_home(version: &str) -> Option<String> {
|
pub fn get_java_home(version: &str) -> Option<String> {
|
||||||
match get_macos_java_home(version) {
|
match get_macos_java_home(version) {
|
||||||
Some(j) => Some(j),
|
Some(j) => Some(j),
|
||||||
@@ -46,12 +50,15 @@ pub fn get_cloud_java(version: &str) -> bool {
|
|||||||
if ! is_macos_or_linux() {
|
if ! is_macos_or_linux() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
let cloud_java_names = if is_macos() {
|
let cloud_java_names = match &*BUILDJ_JAVA_NAME {
|
||||||
|
None => if is_macos() {
|
||||||
vec![OPENJDK_MACOS]
|
vec![OPENJDK_MACOS]
|
||||||
} else if is_linux() {
|
} else if is_linux() {
|
||||||
vec![JDK_LINUX, OPENJDK_LINUX]
|
vec![JDK_LINUX, OPENJDK_LINUX]
|
||||||
} else {
|
} else {
|
||||||
vec![]
|
vec![]
|
||||||
|
},
|
||||||
|
Some(buildj_java_name) => vec![buildj_java_name.as_str()],
|
||||||
};
|
};
|
||||||
let local_java_home_base_dir = match local_util::get_user_home_dir(LOCAL_JAVA_HOME_BASE_DIR) {
|
let local_java_home_base_dir = match local_util::get_user_home_dir(LOCAL_JAVA_HOME_BASE_DIR) {
|
||||||
Err(_) => return false,
|
Err(_) => return false,
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ pub fn calc_sha256(d: &[u8]) -> String {
|
|||||||
sha256.result_str()
|
sha256.result_str()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn calc_file_digest(digest: &mut Digest, digest_alg: &str, file_name: &str) -> XResult<String> {
|
pub fn calc_file_digest(digest: &mut dyn Digest, digest_alg: &str, file_name: &str) -> XResult<String> {
|
||||||
let mut buf: [u8; DEFAULT_BUF_SIZE] = [0u8; DEFAULT_BUF_SIZE];
|
let mut buf: [u8; DEFAULT_BUF_SIZE] = [0u8; DEFAULT_BUF_SIZE];
|
||||||
let mut f = File::open(file_name)?;
|
let mut f = File::open(file_name)?;
|
||||||
let file_len = match f.metadata() {
|
let file_len = match f.metadata() {
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ buildj :::gradle<version> [--java<version>] - run gradle with assigned v
|
|||||||
e.g. buildj :::gradle3.5.1 --java1.8 ARGS
|
e.g. buildj :::gradle3.5.1 --java1.8 ARGS
|
||||||
buildj - run build, run assigned version builder tool
|
buildj - run build, run assigned version builder tool
|
||||||
BUILDJ_VERBOSE=1 buildj - run buildj in verbose mode
|
BUILDJ_VERBOSE=1 buildj - run buildj in verbose mode
|
||||||
|
BUILDJ_JAVA_NAME=jdk-name buildj - assgin java name, e.g. adoptjdk-linux
|
||||||
"#);
|
"#);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user