| 1 |
serkan 09/01/31 18:30:09 |
| 2 |
|
| 3 |
Added: xmlc-2.3.1-build.xml.patch |
| 4 |
Log: |
| 5 |
Version bump and add missing dependency to ant-core. |
| 6 |
(Portage version: 2.2_rc23/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: xmlc-2.3.1-build.xml.patch |
| 15 |
=================================================================== |
| 16 |
diff -Nur xmlc-src-2.3.1/xmlc/modules/taskdef/build-default.properties xmlc-src-2.3.1_patched/xmlc/modules/taskdef/build-default.properties |
| 17 |
--- xmlc-src-2.3.1/xmlc/modules/taskdef/build-default.properties 2007-04-22 00:40:58.000000000 +0300 |
| 18 |
+++ xmlc-src-2.3.1_patched/xmlc/modules/taskdef/build-default.properties 2009-01-31 20:00:27.000000000 +0200 |
| 19 |
@@ -37,7 +37,7 @@ |
| 20 |
# Comma seperated list of libraries (or more exactly, include patterns) this |
| 21 |
# module depends on for building. |
| 22 |
# They are searched relative to ${lib.dir} |
| 23 |
-module.depends=xmlc.jar |
| 24 |
+module.depends=xmlc.jar,ant.jar |
| 25 |
|
| 26 |
# Javadoc settings |
| 27 |
javadoc.packages=org.enhydra.* |
| 28 |
diff -Nur xmlc-src-2.3.1/xmlc/modules/xmlc/build.xml xmlc-src-2.3.1_patched/xmlc/modules/xmlc/build.xml |
| 29 |
--- xmlc-src-2.3.1/xmlc/modules/xmlc/build.xml 2007-11-04 01:07:36.000000000 +0200 |
| 30 |
+++ xmlc-src-2.3.1_patched/xmlc/modules/xmlc/build.xml 2009-01-31 20:13:12.000000000 +0200 |
| 31 |
@@ -148,15 +148,12 @@ |
| 32 |
description="Build the module .jar file"> |
| 33 |
<tstamp/> |
| 34 |
<delete file="${module.jar}"/> |
| 35 |
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar.jar"/> |
| 36 |
- <jarjar jarfile="${module.jar}"><!-- index="true"--> |
| 37 |
+ <jar jarfile="${module.jar}"><!-- index="true"--> |
| 38 |
<fileset file="${dist.root}/../LICENSE-xmlc"/> |
| 39 |
<fileset dir="${build.classes}" /> |
| 40 |
<fileset dir="${src.dir}" |
| 41 |
includes="${module.lib.extra.includes}" |
| 42 |
excludes="${module.lib.extra.excludes}" /> |
| 43 |
- <zipfileset src="${build.lib.dir}/asm.jar"/> |
| 44 |
- <rule pattern="org.objectweb.asm.**" result="org.enhydra.xml.xmlc.deferredparsing.asm.@1"/> |
| 45 |
<manifest> |
| 46 |
<attribute name="Built-By" value="${user.name}"/> |
| 47 |
<attribute name="Built-On" value="${TODAY}"/> |
| 48 |
@@ -171,18 +168,13 @@ |
| 49 |
<attribute name="Implementation-Vendor" value="OW2 Consortium"/> |
| 50 |
<attribute name="Implementation-Vendor-Id" value="org.ow2"/> |
| 51 |
<attribute name="Implementation-URL" value="http://www.enhydra.org/tech/xmlc/"/> |
| 52 |
- </section> |
| 53 |
- <section name="org/enhydra/xml/xmlc/deferredparsing/asm/"> |
| 54 |
- <attribute name="Implementation-Title" value="ASM"/> |
| 55 |
- <attribute name="Implementation-Version" value="3.1"/> |
| 56 |
- <attribute name="Implementation-Vendor" value="France Telecom R&D"/> |
| 57 |
- </section> |
| 58 |
+ </section> |
| 59 |
|
| 60 |
</manifest> |
| 61 |
<!--indexjars> |
| 62 |
<fileset dir="${dist.root}/lib" includes="*.jar"/> |
| 63 |
<fileset dir="${dist.root}/build-lib" includes="*.jar"/> |
| 64 |
</indexjars--> |
| 65 |
- </jarjar> |
| 66 |
+ </jar> |
| 67 |
</target> |
| 68 |
|
| 69 |
<target name="lib-tests" depends="init,compile-tests" unless="lib-test.skip" |
Archives