/hg/icedtea-web: 2 new changesets

[jvanek at icedtea.classpath.org]

changeset 775337c8f049 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=775337c8f049
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Feb 18 17:14:24 2019 +0100

	Fixed bug when Option conained "" insted of being None in case of hardcoded paths.


changeset 1447647acb3a in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=1447647acb3a
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Feb 18 17:34:46 2019 +0100

	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


diffstat:

 Makefile.am                          |   1 +
 rust-launcher/src/hardcoded_paths.rs |  29 +++++++++++++++++++++++------
 rust-launcher/src/jars_helper.rs     |   1 +
 3 files changed, 25 insertions(+), 6 deletions(-)

diffs (76 lines):

diff -r f3b0e27f23a9 -r 1447647acb3a Makefile.am
--- a/Makefile.am	Mon Feb 18 15:37:19 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 ; \
diff -r f3b0e27f23a9 -r 1447647acb3a rust-launcher/src/hardcoded_paths.rs
--- a/rust-launcher/src/hardcoded_paths.rs	Mon Feb 18 15:37:19 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 {
@@ -54,20 +55,36 @@
 pub fn get_bootcp() -> &'static str {LAUNCHER_BOOTCLASSPATH.unwrap_or("LAUNCHER_BOOTCLASSPATH-dev-unspecified") }
 
 // optional deps
-pub fn get_plugin() -> Option<&'static str> {
-    PLUGIN_JAR
-}
+pub fn get_plugin() -> Option<&'static str> { sanitize(PLUGIN_JAR) }
+
+pub fn get_jsobject() -> Option<&'static str> { sanitize(JSOBJECT_JAR) }
 
-pub fn get_jsobject() -> Option<&'static str> { JSOBJECT_JAR }
+pub fn get_tagsoup() -> Option<&'static str> { sanitize(TAGSOUP_JAR) }
 
-pub fn get_tagsoup() -> Option<&'static str> { TAGSOUP_JAR }
+pub fn get_rhino() -> Option<&'static str> { sanitize(RHINO_JAR) }
 
-pub fn get_rhino() -> Option<&'static str> { 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")
 }
 
+//unluckily, option_env can go wild and retunr Some("") isntead of None. Fixing here.
+fn sanitize(candidate: Option<&'static str>)  -> Option<&'static str> {
+    match candidate {
+        Some(s) => {
+                if !String::from(String::from(s).trim()).is_empty() {
+                    return candidate;
+                } else {
+                    return None;
+                }
+            }
+        _none => {
+            return None;
+            }
+        }
+}
+
 
 #[derive(PartialEq)]
 pub enum ItwLibSearch {
diff -r f3b0e27f23a9 -r 1447647acb3a rust-launcher/src/jars_helper.rs
--- a/rust-launcher/src/jars_helper.rs	Mon Feb 18 15:37:19 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");