1.1 --- a/make/build.xml Fri Feb 22 08:57:22 2013 +0100
1.2 +++ b/make/build.xml Fri Feb 22 11:27:40 2013 +0100
1.3 @@ -24,8 +24,13 @@
1.4 <project name="nashorn" default="all" basedir="..">
1.5 <import file="build-nasgen.xml"/>
1.6 <import file="build-benchmark.xml"/>
1.7 + <import file="code_coverage.xml"/>
1.8
1.9 - <target name="init">
1.10 +
1.11 + <target name="init-conditions">
1.12 + <!-- loading locally defined resources and properties. NB they owerwrite default ones defined later -->
1.13 + <property file="${user.home}/.nashorn.project.local.properties"/>
1.14 +
1.15 <loadproperties srcFile="make/project.properties"/>
1.16 <path id="nashorn.ext.path">
1.17 <pathelement location="${dist.dir}"/>
1.18 @@ -41,6 +46,22 @@
1.19 <available property="asm.available" classname="jdk.internal.org.objectweb.asm.Type"/>
1.20 <!-- check if testng.jar is avaiable -->
1.21 <available property="testng.available" file="${file.reference.testng.jar}"/>
1.22 +
1.23 + <!-- enable/disable make code coverage -->
1.24 + <condition property="cc.enabled">
1.25 + <istrue value="${make.code.coverage}" />
1.26 + </condition>
1.27 + </target>
1.28 +
1.29 + <target name="init" depends="init-conditions, init-cc">
1.30 +
1.31 + <!-- extends jvm args -->
1.32 + <property name="run.test.jvmargs">${run.test.jvmargs.main} ${run.test.cc.jvmargs}</property>
1.33 + <property name="run.test.jvmargs.octane" value="${run.test.jvmargs.octane.main} ${run.test.cc.jvmargs}" />
1.34 +
1.35 + <echo message="run.test.jvmargs=${run.test.jvmargs}"/>
1.36 + <echo message="run.test.jvmargs.octane=${run.test.jvmargs.octane}"/>
1.37 +
1.38 </target>
1.39
1.40 <target name="prepare" depends="init">
1.41 @@ -52,7 +73,7 @@
1.42 <mkdir dir="${dist.javadoc.dir}"/>
1.43 </target>
1.44
1.45 - <target name="clean" depends="init, clean-nasgen">
1.46 + <target name="clean" depends="init, clean-nasgen, init-cc-cleanup">
1.47 <delete includeemptydirs="true">
1.48 <fileset dir="${build.dir}" erroronmissingdir="false"/>
1.49 </delete>
