blob: 58c3db7f62ae858c6bc1bfb075064ab5ed9a31bb (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
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
--- xmlc-src-2.3.1/xmlc/modules/taskdef/build-default.properties 2007-04-22 00:40:58.000000000 +0300
+++ xmlc-src-2.3.1_patched/xmlc/modules/taskdef/build-default.properties 2009-01-31 20:00:27.000000000 +0200
@@ -37,7 +37,7 @@
# Comma seperated list of libraries (or more exactly, include patterns) this
# module depends on for building.
# They are searched relative to ${lib.dir}
-module.depends=xmlc.jar
+module.depends=xmlc.jar,ant.jar
# Javadoc settings
javadoc.packages=org.enhydra.*
diff -Nur xmlc-src-2.3.1/xmlc/modules/xmlc/build.xml xmlc-src-2.3.1_patched/xmlc/modules/xmlc/build.xml
--- xmlc-src-2.3.1/xmlc/modules/xmlc/build.xml 2007-11-04 01:07:36.000000000 +0200
+++ xmlc-src-2.3.1_patched/xmlc/modules/xmlc/build.xml 2009-01-31 20:13:12.000000000 +0200
@@ -148,15 +148,12 @@
description="Build the module .jar file">
<tstamp/>
<delete file="${module.jar}"/>
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar.jar"/>
- <jarjar jarfile="${module.jar}"><!-- index="true"-->
+ <jar jarfile="${module.jar}"><!-- index="true"-->
<fileset file="${dist.root}/../LICENSE-xmlc"/>
<fileset dir="${build.classes}" />
<fileset dir="${src.dir}"
includes="${module.lib.extra.includes}"
excludes="${module.lib.extra.excludes}" />
- <zipfileset src="${build.lib.dir}/asm.jar"/>
- <rule pattern="org.objectweb.asm.**" result="org.enhydra.xml.xmlc.deferredparsing.asm.@1"/>
<manifest>
<attribute name="Built-By" value="${user.name}"/>
<attribute name="Built-On" value="${TODAY}"/>
@@ -171,18 +168,13 @@
<attribute name="Implementation-Vendor" value="OW2 Consortium"/>
<attribute name="Implementation-Vendor-Id" value="org.ow2"/>
<attribute name="Implementation-URL" value="http://www.enhydra.org/tech/xmlc/"/>
- </section>
- <section name="org/enhydra/xml/xmlc/deferredparsing/asm/">
- <attribute name="Implementation-Title" value="ASM"/>
- <attribute name="Implementation-Version" value="3.1"/>
- <attribute name="Implementation-Vendor" value="France Telecom R&D"/>
- </section>
+ </section>
</manifest>
<!--indexjars>
<fileset dir="${dist.root}/lib" includes="*.jar"/>
<fileset dir="${dist.root}/build-lib" includes="*.jar"/>
</indexjars-->
- </jarjar>
+ </jar>
</target>
<target name="lib-tests" depends="init,compile-tests" unless="lib-test.skip"
|
GitWeb
