Mercurial > hg > release > icedtea-web-1.7

changeset 1411:f818fa4dc188

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile.am: removed quoting about UNIFIED_BOOTCLASSPATH in LAUNCHER_BOOTCLASSPATH to get more freedom, launcher/launchers.in: in consequence, added quotes about @LAUNCHER_BOOTCLASSPATH@ Intentionallynot added quoting about LAUNCHER_BOOTCLASSPATH in run-reproducers-test-code-coverage-jacoco.stamp, as imho their sed was error passing just by luck
author Jiri Vanek <jvanek@redhat.com>
date Fri, 28 Apr 2017 13:28:47 +0200
parents 97feb0a3999a
children a0ef81d5add1
files ChangeLog Makefile.am launcher/launchers.in
diffstat 3 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Apr 28 13:21:49 2017 +0200
+++ b/ChangeLog	Fri Apr 28 13:28:47 2017 +0200
@@ -1,3 +1,11 @@
+2017-04-28  Jiri Vanek <jvanek@redhat.com>
+
+	* Makefile.am: removed quoting about UNIFIED_BOOTCLASSPATH in LAUNCHER_BOOTCLASSPATH
+	to get more freedom. Intentionallynot added quoting about LAUNCHER_BOOTCLASSPATH 
+	in run-reproducers-test-code-coverage-jacoco.stamp, as imho their sed was error
+	passing just by luck
+	* launcher/launchers.in: in consequence, added quotes about @LAUNCHER_BOOTCLASSPATH@
+
 2017-04-28  Jiri Vanek <jvanek@redhat.com>
 
 	Hopefully fixed codecoverage, which failed with 8u131 update
--- a/Makefile.am	Fri Apr 28 13:21:49 2017 +0200
+++ b/Makefile.am	Fri Apr 28 13:28:47 2017 +0200
@@ -161,7 +161,7 @@
 export UNIFIED_JACOCO_CLASSPATH=$(call joinsegments, $(UNIFIED_JACOCO_CLASSPATH_SEGMENTS))
 export UNIFIED_BOOTCLASSPATH=-Xbootclasspath/a:$(UNIFIED_CLASSPATH)
 # note javaws, itwebsettings and policyeditor (== LAUNCHER_BOOTCLASSPATH) must be always able to compile and run *without* plugin
-export LAUNCHER_BOOTCLASSPATH='$(UNIFIED_BOOTCLASSPATH)'
+export LAUNCHER_BOOTCLASSPATH=$(UNIFIED_BOOTCLASSPATH)
 export PLUGIN_BOOTCLASSPATH='"$(UNIFIED_BOOTCLASSPATH)"'
 export PLUGIN_COVERAGE_BOOTCLASSPATH='"-Xbootclasspath/a:$(UNIFIED_JACOCO_CLASSPATH)"'
 
--- a/launcher/launchers.in	Fri Apr 28 13:21:49 2017 +0200
+++ b/launcher/launchers.in	Fri Apr 28 13:28:47 2017 +0200
@@ -2,7 +2,7 @@
 
 NASHORN=lib/ext/nashorn.jar
 JAVA=@JAVA@
-LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@
+LAUNCHER_BOOTCLASSPATH='@LAUNCHER_BOOTCLASSPATH@'
 LAUNCHER_FLAGS=-Xms8m
 CLASSNAME=@MAIN_CLASS@
 BINARY_LOCATION=@BIN_LOCATION@