/hg/icedtea-web: 2 new changesets

[jvanek at icedtea.classpath.org]

changeset 120ed7532028 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=120ed7532028
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Feb 27 17:47:29 2019 +0100

	shell launcher got support for JAVA_HOME
	* shell-launcher/launchers.sh.in: if JAVA_HOME is detected, is used as most pre


changeset fa34c7141af5 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=fa34c7141af5
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Feb 27 17:52:20 2019 +0100

	jar command used to pack reproducers is called windows friendly

	* Makefile.am: (stamps/netx-dist-tests-prepare-reproducers.stamp) TMP_MANIFEST is now exported so it can reach  subshell of cygpath. If cygpath is in on PATH, TMP_MANIFEST path is cygpathed


diffstat:

 ChangeLog                      |  11 +++++++++++
 Makefile.am                    |   5 ++++-
 shell-launcher/launchers.sh.in |   7 ++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diffs (65 lines):

diff -r a2a8f9a1d946 -r fa34c7141af5 ChangeLog
--- a/ChangeLog	Mon Feb 25 11:58:32 2019 +0100
+++ b/ChangeLog	Wed Feb 27 17:52:20 2019 +0100
@@ -1,3 +1,14 @@
+2019-02-27  Jiri Vanek <jvanek at redhat.com>
+
+	jar command used to pack reproducers is called windows friendly
+	* Makefile.am: (stamps/netx-dist-tests-prepare-reproducers.stamp) TMP_MANIFEST is now exported so it can reach 
+	subshell of cygpath. If cygpath is in on PATH, TMP_MANIFEST path is cygpathed
+
+2019-02-27  Jiri Vanek <jvanek at redhat.com>
+
+	shell launcher got support for JAVA_HOME
+	* shell-launcher/launchers.sh.in: if JAVA_HOME is detected, is used as most preferred
+
 2019-02-25  Olesya Gerasimenko <gammaray at basealt.ru>
 
 	Updated Russian translation
diff -r a2a8f9a1d946 -r fa34c7141af5 Makefile.am
--- a/Makefile.am	Mon Feb 25 11:58:32 2019 +0100
+++ b/Makefile.am	Wed Feb 27 17:52:20 2019 +0100
@@ -1272,8 +1272,11 @@
 	      GREP_R=$$?; \
 	      if [ ! -f $(META_MANIFEST) -o  $$GREP_R -ne 0  ]; \
 	      then \
-	       TMP_MANIFEST=`mktemp` ; \
+	       export TMP_MANIFEST=`mktemp` ; \
 	       echo "$$AN $$dir" > $$TMP_MANIFEST ; \
+	       if [ which cygpath ] ; then \
+	         export TMP_MANIFEST=$(shell cygpath -p -m "$$TMP_MANIFEST") ; \
+	       fi ; \
 	       $(SYSTEM_JDK_DIR)/bin/jar ufm "$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)/$$dir.jar"  $$TMP_MANIFEST ; \
 	       rm -f $$TMP_MANIFEST ; \
 	      fi ; \
diff -r a2a8f9a1d946 -r fa34c7141af5 shell-launcher/launchers.sh.in
--- a/shell-launcher/launchers.sh.in	Mon Feb 25 11:58:32 2019 +0100
+++ b/shell-launcher/launchers.sh.in	Wed Feb 27 17:52:20 2019 +0100
@@ -2,6 +2,7 @@
 
 NASHORN=lib/ext/nashorn.jar
 JRE=@JRE@
+#unused
 JAVA=$JRE/bin/java
 LAUNCHER_BOOTCLASSPATH='@LAUNCHER_BOOTCLASSPATH@'
 LAUNCHER_FLAGS=-Xms8m
@@ -51,6 +52,10 @@
 if [ "x$CUSTOM_JRE" = "x" ] ; then
   CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" /etc/.java/.deploy/deployment.properties 2>/dev/null |  sed "s/$CUSTOM_JRE_REGEX//g"`
 fi;
+if [ ! "x$JAVA_HOME" = "x" ] ; then
+  echo "Warning! JAVA_HOME of $JAVA_HOME in play!"
+  CUSTOM_JRE=$JAVA_HOME
+fi
 
 
 # Support portable ITW:
@@ -82,7 +87,7 @@
     CP=$CUSTOM_JRE/lib/rt.jar:$CUSTOM_JRE/lib/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 ($JAVA, $CP) in attempt to start. Please fix this."
+    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."
   fi
 else
   LAUNCHER_BOOTCLASSPATH="$LAUNCHER_BOOTCLASSPATH:$JRE/$NASHORN"