| 1 |
ercpe 14/07/08 08:12:42 |
| 2 |
|
| 3 |
Added: 1.0.5-build.xml.patch |
| 4 |
Log: |
| 5 |
Fixed bug #514618, bumped 1.0 to EAPI=5 |
| 6 |
Version bump to 1.0.5 |
| 7 |
|
| 8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-java/ical4j/files/1.0.5-build.xml.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ical4j/files/1.0.5-build.xml.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ical4j/files/1.0.5-build.xml.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: 1.0.5-build.xml.patch |
| 17 |
=================================================================== |
| 18 |
diff --git a/ical4j-1.0.5/build.xml b/ical4j-1.0.5/build.xml |
| 19 |
index 512738c..be5aac9 100644 |
| 20 |
--- a/ical4j-1.0.5/build.xml |
| 21 |
+++ b/ical4j-1.0.5/build.xml |
| 22 |
@@ -14,7 +14,7 @@ |
| 23 |
<property file="build.properties" /> |
| 24 |
|
| 25 |
<!-- Project paths --> |
| 26 |
- <property name="source.dir" location="source" /> |
| 27 |
+ <property name="source.dir" location="src" /> |
| 28 |
<property name="test.source.dir" location="test" /> |
| 29 |
<property name="output.dir" location="bin" /> |
| 30 |
<property name="package.dir" location="build" /> |
| 31 |
@@ -99,7 +99,7 @@ |
| 32 |
<echo message="Compiling source from classpath: ${project.classpath}" /> |
| 33 |
<mkdir dir="${output.dir}" /> |
| 34 |
|
| 35 |
- <copy file="${source.dir}/net/fortuna/ical4j/model/tz.alias" todir="${output.dir}/net/fortuna/ical4j/model" /> |
| 36 |
+ <copy file="src/main/resources/net/fortuna/ical4j/model/tz.alias" todir="${output.dir}/net/fortuna/ical4j/model" /> |
| 37 |
|
| 38 |
<javac source="1.4" target="1.4" srcdir="${source.dir}" destdir="${output.dir}" debug="true" debuglevel="lines,source,vars" deprecation="true" classpathref="project.classpath" /> |
| 39 |
</target> |
| 40 |
@@ -123,7 +123,7 @@ |
| 41 |
<attribute name="Class-Path" value="commons-logging.jar,commons-codec.jar,commons-lang.jar" /> |
| 42 |
</manifest> |
| 43 |
<jar basedir="${output.dir}" compress="true" jarfile="${package.dir}/${package.file}" manifest="etc/manifest.mf"> |
| 44 |
- <zipfileset dir="etc/zoneinfo" prefix="zoneinfo" excludes="zones.h,zones.tab" /> |
| 45 |
+ <zipfileset dir="/usr/share/zoneinfo" prefix="zoneinfo" excludes="zones.h,zones.tab" /> |
| 46 |
</jar> |
| 47 |
</target> |
| 48 |
|
| 49 |
@@ -187,10 +187,8 @@ |
| 50 |
<instr instrpathref="coverage.classpath" destdir="${out.instr.dir}" metadatafile="${coverage.dir}/metadata.emma" merge="true" /> |
| 51 |
</emma> |
| 52 |
|
| 53 |
- <junit printsummary="withOutAndErr" showoutput="yes" fork="yes"> |
| 54 |
- <!-- |
| 55 |
- <classpath path="${project.classpath}"/> |
| 56 |
- --> |
| 57 |
+ <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> |
| 58 |
+ |
| 59 |
<classpath> |
| 60 |
<pathelement location="${out.instr.dir}" /> |
| 61 |
<path refid="coverage.classpath" /> |
| 62 |
@@ -198,22 +196,19 @@ |
| 63 |
</classpath> |
| 64 |
<jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" /> |
| 65 |
<jvmarg value="-Demma.coverage.out.merge=false" /> |
| 66 |
- <test name="net.fortuna.ical4j.AllTests" /> |
| 67 |
- <!-- |
| 68 |
- <batchtest> |
| 69 |
- <fileset dir="${test.source.dir}"> |
| 70 |
- <include name="**/*Test.java"/> |
| 71 |
- </fileset> |
| 72 |
- </batchtest> |
| 73 |
- --> |
| 74 |
- |
| 75 |
- <!-- |
| 76 |
- <test name="net.fortuna.ical4j.data.CalendarOutputterTest"/> |
| 77 |
- <test name="net.fortuna.ical4j.model.component.VTimeZoneTest"/> |
| 78 |
- <test name="net.fortuna.ical4j.model.component.VEventTest"/> |
| 79 |
- <test name="net.fortuna.ical4j.data.CalendarBuilderTest"/> |
| 80 |
- --> |
| 81 |
- </junit> |
| 82 |
+ |
| 83 |
+ |
| 84 |
+ <sysproperty key="basedir" value="."/> |
| 85 |
+ <formatter type="xml"/> |
| 86 |
+ <formatter type="plain" usefile="false"/> |
| 87 |
+ |
| 88 |
+ <batchtest> |
| 89 |
+ <fileset dir="${test.source.dir}"> |
| 90 |
+ <include name="**/*Test.java"/> |
| 91 |
+ <exclude name="**/*Abstract*Test.java"/> |
| 92 |
+ </fileset> |
| 93 |
+ </batchtest> |
| 94 |
+ </junit> |
| 95 |
|
| 96 |
<emma enabled="${emma.enabled}"> |
| 97 |
<report sourcepath="${src.dir}"> |
Archives