Mercurial > hg > release > icedtea-web-1.8
changeset 1583:c65cc4a88808
Fixed path to jfxrt.jar from lib/jfxrt.jar to ext/lib
* rust-launcher/src/jars_helper.rs: in (get_cp_members)
* shell-launcher/launchers.bat.in: in both CP and CUSTOM_JRE
* shell-launcher/launchers.sh.in: in both CP and CUSTOM_JRE
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Tue, 05 Mar 2019 16:18:51 +0100 |
| parents | 31a2bdd10d05 |
| children | b60023d6a3a5 |
| files | ChangeLog rust-launcher/src/jars_helper.rs shell-launcher/launchers.bat.in shell-launcher/launchers.sh.in |
| diffstat | 4 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Mar 05 14:22:45 2019 +0100 +++ b/ChangeLog Tue Mar 05 16:18:51 2019 +0100 @@ -1,3 +1,11 @@ +2019-03-05 Jiri Vanek <jvanek@redhat.com> + Lars Herschke <lhersch@dssgmbh.de> + + Fixed path to jfxrt.jar from lib/jfxrt.jar to ext/lib + * rust-launcher/src/jars_helper.rs: in (get_cp_members) + * shell-launcher/launchers.bat.in: in both CP and CUSTOM_JRE + * shell-launcher/launchers.sh.in: in both CP and CUSTOM_JRE + 2019-03-05 Lars Herschke <lhersch@dssgmbh.de> * acinclude.m4: Moved windows specific check for JDK on the begging of SYSTEM_JDK part of IT_CHECK_FOR_JDK macro
--- a/rust-launcher/src/jars_helper.rs Tue Mar 05 14:22:45 2019 +0100 +++ b/rust-launcher/src/jars_helper.rs Tue Mar 05 16:18:51 2019 +0100 @@ -191,6 +191,7 @@ cp_parts.push(rt_jar); let mut jfxrt_jar = jre_path.clone(); jfxrt_jar.push("lib"); + jfxrt_jar.push("ext"); jfxrt_jar.push("jfxrt.jar"); cp_parts.push(jfxrt_jar); filter_out_key("deployment.launcher.rust.cp.remove", os, &mut cp_parts, );
--- a/shell-launcher/launchers.bat.in Tue Mar 05 14:22:45 2019 +0100 +++ b/shell-launcher/launchers.bat.in Tue Mar 05 16:18:51 2019 +0100 @@ -24,7 +24,7 @@ set "SPLASH_LOCATION=@JAVAWS_SPLASH_LOCATION@" set "RUN_ARGS_LOCATION=@MODULARJDK_ARGS_LOCATION@" set "PROGRAM_NAME=@PROGRAM_NAME@" -set "CP=%JRE%/lib/rt.jar;%JRE%/lib/jfxrt.jar" +set "CP=%JRE%/lib/rt.jar;%JRE%/lib/ext/jfxrt.jar" rem individual parts of bootclasspath for more easy processing set "NETX_JAR=@NETX_JAR@" @@ -99,7 +99,7 @@ rem Fix classpaths for custom JRE: if not "%CUSTOM_JRE%" == "" ( set "JAVA=%CUSTOM_JRE%/bin/java" - set "CP=%CUSTOM_JRE%/lib/rt.jar;%CUSTOM_JRE%/lib/jfxrt.jar" + set "CP=%CUSTOM_JRE%/lib/rt.jar;%CUSTOM_JRE%/lib/ext/jfxrt.jar" set "LAUNCHER_BOOTCLASSPATH=%LAUNCHER_BOOTCLASSPATH%;%CUSTOM_JRE%/%NASHORN%" ) else ( set "LAUNCHER_BOOTCLASSPATH=%LAUNCHER_BOOTCLASSPATH%;%JRE%/%NASHORN%"
--- a/shell-launcher/launchers.sh.in Tue Mar 05 14:22:45 2019 +0100 +++ b/shell-launcher/launchers.sh.in Tue Mar 05 16:18:51 2019 +0100 @@ -11,7 +11,7 @@ SPLASH_LOCATION=@JAVAWS_SPLASH_LOCATION@ RUN_ARGS_LOCATION=@MODULARJDK_ARGS_LOCATION@ PROGRAM_NAME=@PROGRAM_NAME@ -CP=$JRE/lib/rt.jar:$JRE/lib/jfxrt.jar +CP=$JRE/lib/rt.jar:$JRE/lib/ext/jfxrt.jar # individual parts of bootclasspath for more easy processing NETX_JAR=@NETX_JAR@ @@ -84,7 +84,7 @@ if [ "x$CUSTOM_JRE" != "x" ] ; then if [ -e "$CUSTOM_JRE" -a -e "$CUSTOM_JRE/bin/java" ] ; then JAVA=$CUSTOM_JRE/bin/java - CP=$CUSTOM_JRE/lib/rt.jar:$CUSTOM_JRE/lib/jfxrt.jar + CP=$CUSTOM_JRE/lib/rt.jar:$CUSTOM_JRE/lib/ext/jfxrt.jar LAUNCHER_BOOTCLASSPATH=$LAUNCHER_BOOTCLASSPATH:$CUSTOM_JRE/$NASHORN else echo "Your custom JRE $CUSTOM_JRE read from deployment.properties under key $PROPERTY_NAME as $CUSTOM_JRE is not valid. Using default ($JRE, $CP) in attempt to start. Please fix this."