/hg/icedtea-web: Jacoco boot class loading moved from custom bui...

[jvanek at icedtea.classpath.org]

changeset 89e1a72ca8ac in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=89e1a72ca8ac
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Oct 17 13:28:00 2014 +0200

	Jacoco boot class loading moved from custom built to upstreamed form


diffstat:

 ChangeLog   |  7 +++++++
 Makefile.am |  4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r ab6adc052d71 -r 89e1a72ca8ac ChangeLog
--- a/ChangeLog	Fri Oct 17 12:38:50 2014 +0200
+++ b/ChangeLog	Fri Oct 17 13:28:00 2014 +0200
@@ -1,3 +1,10 @@
+2014-10-17  Jiri Vanek  <jvanek at redhat.com>
+
+	Jacoco boot class loading moved from custom built to upstreamed form
+	* Makefile.am: (JACOCO_AGENT_JAVAWS_SWITCH) and (JACOCO_AGENT_PLUGIN_SWITCH)
+	moved from xboot=true to inclbootstrapclasses=true which is now supported
+	by upstream.
+
 2014-10-17  Jiri Vanek  <jvanek at redhat.com>
 
 	Plain and main text formatters have more human readable urls
diff -r ab6adc052d71 -r 89e1a72ca8ac Makefile.am
--- a/Makefile.am	Fri Oct 17 12:38:50 2014 +0200
+++ b/Makefile.am	Fri Oct 17 13:28:00 2014 +0200
@@ -70,8 +70,8 @@
 export JACOCO_BASE_EXCLUDE=org.junit.*:junit.*
 export JACOCO_ADVANCED_EXCLUDE=:*jacoco*:java.lang.*:java.reflect.*:java.util.*:sun.reflect.*
 export JACOCO_AGENT_SWITCH="$(JACOCO_AGENT_SWITCH_BODY)=excludes=$(JACOCO_BASE_EXCLUDE)"
-export JACOCO_AGENT_JAVAWS_SWITCH=\"$(JACOCO_AGENT_SWITCH_BODY)=excludes=$(JACOCO_BASE_EXCLUDE)$(JACOCO_ADVANCED_EXCLUDE),xboot=true,destfile=$(JACOCO_JAVAWS_RESULTS)\"
-export JACOCO_AGENT_PLUGIN_SWITCH=\"$(JACOCO_AGENT_SWITCH_BODY)=excludes=$(JACOCO_BASE_EXCLUDE)$(JACOCO_ADVANCED_EXCLUDE),xboot=true,destfile=$(JACOCO_PLUGIN_RESULTS)\"
+export JACOCO_AGENT_JAVAWS_SWITCH=\"$(JACOCO_AGENT_SWITCH_BODY)=excludes=$(JACOCO_BASE_EXCLUDE)$(JACOCO_ADVANCED_EXCLUDE),inclbootstrapclasses=true,destfile=$(JACOCO_JAVAWS_RESULTS)\"
+export JACOCO_AGENT_PLUGIN_SWITCH=\"$(JACOCO_AGENT_SWITCH_BODY)=excludes=$(JACOCO_BASE_EXCLUDE)$(JACOCO_ADVANCED_EXCLUDE),inclbootstrapclasses=true,destfile=$(JACOCO_PLUGIN_RESULTS)\"
 export JACOCO_OPERATOR_EXEC=$(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(JACOCO_OPERATOR_DIR):$(JACOCO_CLASSPATH):. org.jacoco.operator.Main
 
 # linking variables