Mercurial > hg > release > icedtea-web-1.8
changeset 1561:1447647acb3a
Implemented forgotten support for mslinks.jar library in rust launchers
* Makefile.am: MSLINKS_JAR are now eported in rust launchers build
* rust-launcher/src/hardcoded_paths.rs: MSLINKS_JAR is being captured here and exported as optional
* rust-launcher/src/jars_helper.rs: (get_bootcp_members) now append_if_exists also get_mslin
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Mon, 18 Feb 2019 17:34:46 +0100 |
| parents | 775337c8f049 |
| children | 79a273bcbf4a |
| files | Makefile.am rust-launcher/src/hardcoded_paths.rs rust-launcher/src/jars_helper.rs |
| diffstat | 3 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Mon Feb 18 17:14:24 2019 +0100 +++ b/Makefile.am Mon Feb 18 17:34:46 2019 +0100 @@ -962,6 +962,7 @@ export JSOBJECT_JAR=$(JSOBJECT_JAR) ; \ export TAGSOUP_JAR=$(TAGSOUP_JAR) ; \ export RHINO_JAR=$(RHINO_JAR) ; \ + export MSLINKS_JAR=$(MSLINKS_JAR) ; \ export MODULARJDK_ARGS_LOCATION=$(MODULARJDK_ARGS_LOCATION) ; \ unset MAIN_CLASS ; \ unset BIN_LOCATION ; \
--- a/rust-launcher/src/hardcoded_paths.rs Mon Feb 18 17:14:24 2019 +0100 +++ b/rust-launcher/src/hardcoded_paths.rs Mon Feb 18 17:34:46 2019 +0100 @@ -19,6 +19,7 @@ const RHINO_JAR: Option<&'static str> = option_env!("RHINO_JAR"); const ITW_LIBS: Option<&'static str> = option_env!("ITW_LIBS"); const MODULARJDK_ARGS_LOCATION: Option<&'static str> = option_env!("MODULARJDK_ARGS_LOCATION"); +const MSLINKS_JAR: Option<&'static str> = option_env!("MSLINKS_JAR"); pub fn get_jre() -> &'static str { @@ -62,6 +63,8 @@ pub fn get_rhino() -> Option<&'static str> { sanitize(RHINO_JAR) } +pub fn get_mslinks() -> Option<&'static str> { sanitize(MSLINKS_JAR) } + pub fn get_argsfile() -> &'static str { MODULARJDK_ARGS_LOCATION.unwrap_or("MODULARJDK_ARGS_LOCATION-dev-unspecified") } @@ -80,7 +83,6 @@ return None; } } - return None; }
--- a/rust-launcher/src/jars_helper.rs Mon Feb 18 17:14:24 2019 +0100 +++ b/rust-launcher/src/jars_helper.rs Mon Feb 18 17:34:46 2019 +0100 @@ -136,6 +136,7 @@ append_if_exists(hardcoded_paths::get_jsobject(), os, &mut cp_parts); append_if_exists(hardcoded_paths::get_rhino(), os, &mut cp_parts); append_if_exists(hardcoded_paths::get_tagsoup(), os, &mut cp_parts); + append_if_exists(hardcoded_paths::get_mslinks(), os, &mut cp_parts); let mut nashorn_jar = jre_path.clone(); nashorn_jar.push("lib"); nashorn_jar.push("ext");