/hg/icedtea-web: Added support for jdk7 and javafx

[jvanek at icedtea.classpath.org]

changeset 200af1c71bb2 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=200af1c71bb2
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Apr 20 15:00:33 2015 +0200

	Added support for jdk7 and javafx
	* launcher/launchers.in: noted lib/jfxrt.jar


diffstat:

 ChangeLog             |  5 +++++
 launcher/launchers.in |  4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r 5837261a12aa -r 200af1c71bb2 ChangeLog
--- a/ChangeLog	Thu Apr 16 19:34:18 2015 +0200
+++ b/ChangeLog	Mon Apr 20 15:00:33 2015 +0200
@@ -1,3 +1,8 @@
+2015-04-20  Jiri Vanek  <jvanek at redhat.com>
+
+	Added support for jdk7 and javafx
+	* launcher/launchers.in: noted lib/jfxrt.jar
+
 2015-04-15  Jiri Vanek  <jvanek at redhat.com>
 
 	Fixed javadoc warnings and errors to pass doclint
diff -r 5837261a12aa -r 200af1c71bb2 launcher/launchers.in
--- a/launcher/launchers.in	Thu Apr 16 19:34:18 2015 +0200
+++ b/launcher/launchers.in	Mon Apr 20 15:00:33 2015 +0200
@@ -7,7 +7,7 @@
 BINARY_LOCATION=@BIN_LOCATION@
 SPLASH_LOCATION=@JAVAWS_SPLASH_LOCATION@
 PROGRAM_NAME=@PROGRAM_NAME@
-CP=@JRE@/lib/rt.jar:@JRE@/lib/ext/jfxrt.jar
+CP=@JRE@/lib/rt.jar:@JRE@/lib/jfxrt.jar
 
 CONFIG_HOME=$XDG_CONFIG_HOME
 if [ "x$CONFIG_HOME" = "x" ] ; then
@@ -27,7 +27,7 @@
 if [ "x$CUSTOM_JRE" != "x" ] ; then
   if [ -e  "$CUSTOM_JRE" -a -e "$CUSTOM_JRE/bin/java" -a -e "$CUSTOM_JRE/lib/rt.jar" ] ; then
     JAVA=$CUSTOM_JRE/bin/java
-    CP=$CUSTOM_JRE/lib/rt.jar:$CUSTOM_JRE/lib/ext/jfxrt.jar
+    CP=$CUSTOM_JRE/lib/rt.jar:$CUSTOM_JRE/lib/jfxrt.jar
   else
     echo "Your custom JRE $CUSTOM_JRE read from deployment.properties under key $PROPERTY_NAME as $CUSTOM_JRE is not valid. Using default ($JAVA, $CP) in attempt to start. Please fix this."
   fi