You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ss...@apache.org on 2014/06/06 16:21:57 UTC
svn commit: r1600897 -
/xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
Author: ssteiner
Date: Fri Jun 6 14:21:57 2014
New Revision: 1600897
URL: http://svn.apache.org/r1600897
Log:
Add emma
Modified:
xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
Modified: xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml?rev=1600897&r1=1600896&r2=1600897&view=diff
==============================================================================
--- xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml (original)
+++ xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml Fri Jun 6 14:21:57 2014
@@ -112,15 +112,62 @@
</javac>
</target>
- <target name="junit" depends="junit-compile-java" description="Runs PDF Plugin's JUnit basic tests">
+ <property name="emma.dir" value="${basedir}/lib" />
+ <property name="coverage.dir" value="${basedir}/build/coverage" />
+ <path id="emma.lib">
+ <pathelement location="${emma.dir}/emma.jar" />
+ <pathelement location="${emma.dir}/emma_ant.jar" />
+ </path>
+ <available file="${emma.dir}/emma.jar" property="emma.present"/>
+
+ <target name="emma" if="emma.present">
+ <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
+ <emma>
+ <instr instrpath="${build.classes.dir}"
+ destdir="${coverage.dir}"
+ metadatafile="${coverage.dir}/metadata.em"
+ merge="true"
+ mode="copy">
+ </instr>
+ </emma>
+ </target>
+
+ <target name="emma-report" if="emma.present">
+ <emma>
+ <report>
+ <sourcepath>
+ <dirset dir="${basedir}">
+ <include name="src/java"/>
+ <include name="test/java"/>
+ </dirset>
+ </sourcepath>
+ <fileset dir="${coverage.dir}">
+ <include name="*.em"/>
+ <include name="*.ec"/>
+ </fileset>
+ <xml outfile="${coverage.dir}/report.xml" />
+ <txt outfile="${coverage.dir}/report.txt" />
+ <html outfile="${coverage.dir}/report.html" />
+ </report>
+ </emma>
+ <taskdef name="emmacheck" classname="org.emmacheck.EmmaCheckTask" classpath="${emma.dir}/emmacheck-0.2.jar"/>
+ <emmacheck coveragefile="${coverage.dir}/coverage.ec"
+ metadatafile="${coverage.dir}/metadata.em"
+ output="${coverage.dir}/requiredcoverage.out"
+ overallcoverage="L76" />
+ </target>
+
+ <target name="junit" depends="junit-compile-java,emma" description="Runs PDF Plugin's JUnit basic tests">
<property name="junit.reports.dir" value="${build.dir}/test-reports"/>
<mkdir dir="${junit.reports.dir}"/>
- <junit dir="${basedir}" haltonfailure="yes">
+ <junit dir="${basedir}" haltonfailure="yes" fork="true" forkmode="once">
<sysproperty key="jawa.awt.headless" value="true"/>
<formatter type="brief" usefile="false"/>
<formatter type="plain" usefile="true"/>
<formatter type="xml" usefile="true"/>
<classpath>
+ <pathelement location="${coverage.dir}" />
+ <path refid="emma.lib"/>
<path refid="standard-junit-classpath"/>
</classpath>
<assertions>
@@ -129,7 +176,9 @@
<batchtest todir="${junit.reports.dir}">
<fileset dir="${build.unit.tests.dir}" includes="**/*TestCase.class"/>
</batchtest>
+ <jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.ec" />
</junit>
+ <antcall target="emma-report"/>
</target>
<!-- =================================================================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org
Re: svn commit: r1600897 - /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
Posted by Chris Bowditch <bo...@hotmail.com>.
Thank you Simon
On 20/06/2014 12:20, Simon Steiner wrote:
> Hi,
>
> I updated the branch to use jacoco instead of emma.
>
> Thanks
>
> -----Original Message-----
> From: Chris Bowditch [mailto:bowditch_chris@hotmail.com]
> Sent: 18 June 2014 09:02
> To: fop-dev@xmlgraphics.apache.org
> Subject: Re: svn commit: r1600897 - /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
>
> +1
>
> We should try to be consistent in which tools we use across the sub projects
>
> Thanks,
>
> Chris
>
> On 16/06/2014 18:35, Vincent Hennebert wrote:
>> On 16/06/14 17:50, Simon Steiner wrote:
>>> Hi,
>>>
>>> Its there in fop, its not in pdfplugin which is where I added it.
>> Ah, sorry, I didn’t realise the modification was made in the PDF
>> Images plug-in. I guess it’s ok then, although it would be better to
>> use the same tool in every sub-project.
>>
>> Vincent
>>
>>
>>> Thanks
>>>
>>> -----Original Message-----
>>> From: Vincent Hennebert [mailto:vhennebert@gmail.com]
>>> Sent: 16 June 2014 16:32
>>> To: fop-dev@xmlgraphics.apache.org
>>> Subject: Re: svn commit: r1600897 -
>>> /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
>>>
>>> Hi Simon,
>>>
>>> On 16/06/14 17:13, Simon Steiner wrote:
>>>> Hi,
>>>>
>>>> Seems we have JaCoCo on trunk, I forgot about that. I added emma to
>>>> pdfplugin since i have used that tool in the past. I can revert this
>>>> change if emma is not allowed.
>>> It’s not so much that Emma is not allowed, it’s that JaCoCo is
>>> already there that provides the same functionality, plus it’s meant
>>> to be the successor of Emma. So we might as well use it.
>>>
>>> Thanks,
>>> Vincent
>>>
>>>
>>>> Thanks
>>>>
>>>> -----Original Message-----
>>>> From: Vincent Hennebert [mailto:vhennebert@gmail.com]
>>>> Sent: 06 June 2014 18:50
>>>> To: fop-dev@xmlgraphics.apache.org
>>>> Subject: Re: svn commit: r1600897 -
>>>> /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
>>>>
>>>> On 06/06/14 16:21, ssteiner wrote:
>>>>> Author: ssteiner
>>>>> Date: Fri Jun 6 14:21:57 2014
>>>>> New Revision: 1600897
>>>>>
>>>>> URL: http://svn.apache.org/r1600897
>>>>> Log:
>>>>> Add emma
>>>> Why, when we already have JaCoCo?
>>>> https://issues.apache.org/jira/browse/FOP-1991
>>>>
>>>> Vincent
>>>>
>>
>
>
>
RE: svn commit: r1600897 - /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
Posted by Simon Steiner <si...@gmail.com>.
Hi,
I updated the branch to use jacoco instead of emma.
Thanks
-----Original Message-----
From: Chris Bowditch [mailto:bowditch_chris@hotmail.com]
Sent: 18 June 2014 09:02
To: fop-dev@xmlgraphics.apache.org
Subject: Re: svn commit: r1600897 - /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
+1
We should try to be consistent in which tools we use across the sub projects
Thanks,
Chris
On 16/06/2014 18:35, Vincent Hennebert wrote:
> On 16/06/14 17:50, Simon Steiner wrote:
>> Hi,
>>
>> Its there in fop, its not in pdfplugin which is where I added it.
>
> Ah, sorry, I didn’t realise the modification was made in the PDF
> Images plug-in. I guess it’s ok then, although it would be better to
> use the same tool in every sub-project.
>
> Vincent
>
>
>> Thanks
>>
>> -----Original Message-----
>> From: Vincent Hennebert [mailto:vhennebert@gmail.com]
>> Sent: 16 June 2014 16:32
>> To: fop-dev@xmlgraphics.apache.org
>> Subject: Re: svn commit: r1600897 -
>> /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
>>
>> Hi Simon,
>>
>> On 16/06/14 17:13, Simon Steiner wrote:
>>> Hi,
>>>
>>> Seems we have JaCoCo on trunk, I forgot about that. I added emma to
>>> pdfplugin since i have used that tool in the past. I can revert this
>>> change if emma is not allowed.
>>
>> It’s not so much that Emma is not allowed, it’s that JaCoCo is
>> already there that provides the same functionality, plus it’s meant
>> to be the successor of Emma. So we might as well use it.
>>
>> Thanks,
>> Vincent
>>
>>
>>> Thanks
>>>
>>> -----Original Message-----
>>> From: Vincent Hennebert [mailto:vhennebert@gmail.com]
>>> Sent: 06 June 2014 18:50
>>> To: fop-dev@xmlgraphics.apache.org
>>> Subject: Re: svn commit: r1600897 -
>>> /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
>>>
>>> On 06/06/14 16:21, ssteiner wrote:
>>>> Author: ssteiner
>>>> Date: Fri Jun 6 14:21:57 2014
>>>> New Revision: 1600897
>>>>
>>>> URL: http://svn.apache.org/r1600897
>>>> Log:
>>>> Add emma
>>>
>>> Why, when we already have JaCoCo?
>>> https://issues.apache.org/jira/browse/FOP-1991
>>>
>>> Vincent
>>>
>>
>
>
Re: svn commit: r1600897 - /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
Posted by Chris Bowditch <bo...@hotmail.com>.
+1
We should try to be consistent in which tools we use across the sub projects
Thanks,
Chris
On 16/06/2014 18:35, Vincent Hennebert wrote:
> On 16/06/14 17:50, Simon Steiner wrote:
>> Hi,
>>
>> Its there in fop, its not in pdfplugin which is where I added it.
>
> Ah, sorry, I didn’t realise the modification was made in the PDF Images
> plug-in. I guess it’s ok then, although it would be better to use the
> same tool in every sub-project.
>
> Vincent
>
>
>> Thanks
>>
>> -----Original Message-----
>> From: Vincent Hennebert [mailto:vhennebert@gmail.com]
>> Sent: 16 June 2014 16:32
>> To: fop-dev@xmlgraphics.apache.org
>> Subject: Re: svn commit: r1600897 -
>> /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
>>
>> Hi Simon,
>>
>> On 16/06/14 17:13, Simon Steiner wrote:
>>> Hi,
>>>
>>> Seems we have JaCoCo on trunk, I forgot about that. I added emma to
>>> pdfplugin since i have used that tool in the past. I can revert this
>>> change if emma is not allowed.
>>
>> It’s not so much that Emma is not allowed, it’s that JaCoCo is
>> already there that provides the same functionality, plus it’s meant
>> to be the successor of Emma. So we might as well use it.
>>
>> Thanks,
>> Vincent
>>
>>
>>> Thanks
>>>
>>> -----Original Message-----
>>> From: Vincent Hennebert [mailto:vhennebert@gmail.com]
>>> Sent: 06 June 2014 18:50
>>> To: fop-dev@xmlgraphics.apache.org
>>> Subject: Re: svn commit: r1600897 -
>>> /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
>>>
>>> On 06/06/14 16:21, ssteiner wrote:
>>>> Author: ssteiner
>>>> Date: Fri Jun 6 14:21:57 2014
>>>> New Revision: 1600897
>>>>
>>>> URL: http://svn.apache.org/r1600897
>>>> Log:
>>>> Add emma
>>>
>>> Why, when we already have JaCoCo?
>>> https://issues.apache.org/jira/browse/FOP-1991
>>>
>>> Vincent
>>>
>>
>
>
Re: svn commit: r1600897 - /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
Posted by Vincent Hennebert <vh...@gmail.com>.
On 16/06/14 17:50, Simon Steiner wrote:
> Hi,
>
> Its there in fop, its not in pdfplugin which is where I added it.
Ah, sorry, I didn’t realise the modification was made in the PDF Images
plug-in. I guess it’s ok then, although it would be better to use the
same tool in every sub-project.
Vincent
> Thanks
>
> -----Original Message-----
> From: Vincent Hennebert [mailto:vhennebert@gmail.com]
> Sent: 16 June 2014 16:32
> To: fop-dev@xmlgraphics.apache.org
> Subject: Re: svn commit: r1600897 - /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
>
> Hi Simon,
>
> On 16/06/14 17:13, Simon Steiner wrote:
>> Hi,
>>
>> Seems we have JaCoCo on trunk, I forgot about that. I added emma to pdfplugin since i have used that tool in the past. I can revert this change if emma is not allowed.
>
> It’s not so much that Emma is not allowed, it’s that JaCoCo is already there that provides the same functionality, plus it’s meant to be the successor of Emma. So we might as well use it.
>
> Thanks,
> Vincent
>
>
>> Thanks
>>
>> -----Original Message-----
>> From: Vincent Hennebert [mailto:vhennebert@gmail.com]
>> Sent: 06 June 2014 18:50
>> To: fop-dev@xmlgraphics.apache.org
>> Subject: Re: svn commit: r1600897 -
>> /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
>>
>> On 06/06/14 16:21, ssteiner wrote:
>>> Author: ssteiner
>>> Date: Fri Jun 6 14:21:57 2014
>>> New Revision: 1600897
>>>
>>> URL: http://svn.apache.org/r1600897
>>> Log:
>>> Add emma
>>
>> Why, when we already have JaCoCo?
>> https://issues.apache.org/jira/browse/FOP-1991
>>
>> Vincent
>>
>
RE: svn commit: r1600897 - /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
Posted by Simon Steiner <si...@gmail.com>.
Hi,
Its there in fop, its not in pdfplugin which is where I added it.
Thanks
-----Original Message-----
From: Vincent Hennebert [mailto:vhennebert@gmail.com]
Sent: 16 June 2014 16:32
To: fop-dev@xmlgraphics.apache.org
Subject: Re: svn commit: r1600897 - /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
Hi Simon,
On 16/06/14 17:13, Simon Steiner wrote:
> Hi,
>
> Seems we have JaCoCo on trunk, I forgot about that. I added emma to pdfplugin since i have used that tool in the past. I can revert this change if emma is not allowed.
It’s not so much that Emma is not allowed, it’s that JaCoCo is already there that provides the same functionality, plus it’s meant to be the successor of Emma. So we might as well use it.
Thanks,
Vincent
> Thanks
>
> -----Original Message-----
> From: Vincent Hennebert [mailto:vhennebert@gmail.com]
> Sent: 06 June 2014 18:50
> To: fop-dev@xmlgraphics.apache.org
> Subject: Re: svn commit: r1600897 -
> /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
>
> On 06/06/14 16:21, ssteiner wrote:
>> Author: ssteiner
>> Date: Fri Jun 6 14:21:57 2014
>> New Revision: 1600897
>>
>> URL: http://svn.apache.org/r1600897
>> Log:
>> Add emma
>
> Why, when we already have JaCoCo?
> https://issues.apache.org/jira/browse/FOP-1991
>
> Vincent
>
Re: svn commit: r1600897 - /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
Posted by Vincent Hennebert <vh...@gmail.com>.
Hi Simon,
On 16/06/14 17:13, Simon Steiner wrote:
> Hi,
>
> Seems we have JaCoCo on trunk, I forgot about that. I added emma to pdfplugin since i have used that tool in the past. I can revert this change if emma is not allowed.
It’s not so much that Emma is not allowed, it’s that JaCoCo is already
there that provides the same functionality, plus it’s meant to be the
successor of Emma. So we might as well use it.
Thanks,
Vincent
> Thanks
>
> -----Original Message-----
> From: Vincent Hennebert [mailto:vhennebert@gmail.com]
> Sent: 06 June 2014 18:50
> To: fop-dev@xmlgraphics.apache.org
> Subject: Re: svn commit: r1600897 - /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
>
> On 06/06/14 16:21, ssteiner wrote:
>> Author: ssteiner
>> Date: Fri Jun 6 14:21:57 2014
>> New Revision: 1600897
>>
>> URL: http://svn.apache.org/r1600897
>> Log:
>> Add emma
>
> Why, when we already have JaCoCo?
> https://issues.apache.org/jira/browse/FOP-1991
>
> Vincent
>
RE: svn commit: r1600897 - /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
Posted by Simon Steiner <si...@gmail.com>.
Hi,
Seems we have JaCoCo on trunk, I forgot about that. I added emma to pdfplugin since i have used that tool in the past. I can revert this change if emma is not allowed.
Thanks
-----Original Message-----
From: Vincent Hennebert [mailto:vhennebert@gmail.com]
Sent: 06 June 2014 18:50
To: fop-dev@xmlgraphics.apache.org
Subject: Re: svn commit: r1600897 - /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
On 06/06/14 16:21, ssteiner wrote:
> Author: ssteiner
> Date: Fri Jun 6 14:21:57 2014
> New Revision: 1600897
>
> URL: http://svn.apache.org/r1600897
> Log:
> Add emma
Why, when we already have JaCoCo?
https://issues.apache.org/jira/browse/FOP-1991
Vincent
Re: svn commit: r1600897 - /xmlgraphics/fop-pdf-images/branches/Temp_FontMerging/build.xml
Posted by Vincent Hennebert <vh...@gmail.com>.
On 06/06/14 16:21, ssteiner wrote:
> Author: ssteiner
> Date: Fri Jun 6 14:21:57 2014
> New Revision: 1600897
>
> URL: http://svn.apache.org/r1600897
> Log:
> Add emma
Why, when we already have JaCoCo?
https://issues.apache.org/jira/browse/FOP-1991
Vincent