# HG changeset patch # User Jiri Vanek # Date 1413545361 -7200 # Node ID c4a622149b5c1f4e5358e0f98895866e31c5408b # Parent 9eadfcabb570a6c267e8e0b1ba1391bde7a0cb19 Jacoco boot class loading moved from custom built to upstreamed form diff -r 9eadfcabb570 -r c4a622149b5c ChangeLog --- a/ChangeLog Fri Feb 21 15:48:43 2014 +0100 +++ b/ChangeLog Fri Oct 17 13:29:21 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-02-21 Jiri Vanek * acinclude.m4: Added (IT_CHECK_XULRUNNER_API_VERSION_C11) macro diff -r 9eadfcabb570 -r c4a622149b5c Makefile.am --- a/Makefile.am Fri Feb 21 15:48:43 2014 +0100 +++ b/Makefile.am Fri Oct 17 13:29:21 2014 +0200 @@ -72,8 +72,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