# HG changeset patch # User Jiri Vanek # Date 1413545322 -7200 # Node ID 406f306e3380a1f6df3ae4a0066ff9b6ea1a7a81 # Parent 249435147a0bbf7cb108c321fc5f3866908c4619 Jacoco boot class loading moved from custom built to upstreamed form diff -r 249435147a0b -r 406f306e3380 ChangeLog --- a/ChangeLog Mon Sep 22 17:13:19 2014 +0200 +++ b/ChangeLog Fri Oct 17 13:28:42 2014 +0200 @@ -1,3 +1,10 @@ +2014-10-17 Jiri Vanek + + 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-09-22 Jiri Vanek Preventing rare class cast exception in erroneous detached applets diff -r 249435147a0b -r 406f306e3380 Makefile.am --- a/Makefile.am Mon Sep 22 17:13:19 2014 +0200 +++ b/Makefile.am Fri Oct 17 13:28:42 2014 +0200 @@ -69,8 +69,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