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
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
|
--- jibx-1.0.1/build/build.xml 2006-01-02 19:45:56.000000000 +0000
+++ jibx-1.0.1_COMPILED/build/build.xml 2006-03-05 16:44:08.000000000 +0000
@@ -15,6 +15,7 @@
<!-- The directories -->
<property name="root" value="${basedir}"/>
<property name="lib" value="${basedir}/lib"/>
+ <property name="javalib" value="/usr/share/java"/>
<property name="build" value="${basedir}/build"/>
<property name="src" value="${build}/src"/>
<property name="extrassrc" value="${build}/extras"/>
@@ -36,9 +37,9 @@
<!-- Other definitions -->
<property name="project" value="JiBX Java data binding to XML"/>
<property name="projname" value="jibx"/>
- <property name="bindname" value="jibx-bind"/>
- <property name="runname" value="jibx-run"/>
- <property name="extrasname" value="jibx-extras"/>
+ <property name="bindname" value="jibx-bind-1.0.1"/>
+ <property name="runname" value="jibx-run-1.0.1"/>
+ <property name="extrasname" value="jibx-extras-1.0.1"/>
<property name="version" value="1.0"/>
<property name="distribname" value="jibx_1_0_1"/>
<property name="fullname" value="jibx-full"/>
@@ -58,19 +59,19 @@
<path id="project-classpath">
<pathelement location="${binddest}"/>
<pathelement location="${rundest}"/>
- <pathelement location="${lib}/xpp3.jar"/>
+ <pathelement location="${javalib}/xpp3.jar"/>
<!-- The dom4j.jar and jdom.jar are only needed for distribution tests and builds -->
- <pathelement location="${lib}/dom4j.jar"/>
- <pathelement location="${lib}/jdom.jar"/>
+ <pathelement location="${javalib}/dom4j.jar"/>
+ <pathelement location="${javalib}/jdom1.jar"/>
</path>
<path id="binding-classpath">
<pathelement location="${binddest}"/>
<pathelement location="${rundest}"/>
- <pathelement location="${lib}/xpp3.jar"/>
- <pathelement location="${lib}/bcel.jar"/>
+ <pathelement location="${javalib}/xpp3.jar"/>
+ <pathelement location="${javalib}/bcel.jar"/>
<!-- The dom4j.jar and jdom.jar are only needed for distribution tests and builds -->
- <pathelement location="${lib}/dom4j.jar"/>
- <pathelement location="${lib}/jdom.jar"/>
+ <pathelement location="${javalib}/dom4j.jar"/>
+ <pathelement location="${javalib}/jdom1.jar"/>
</path>
<path id="tests-classpath">
<pathelement location="${testdest}"/>
@@ -79,53 +80,63 @@
<pathelement location="${lib}/${extrasname}.jar"/>
<pathelement location="${lib}/xpp3.jar"/>
<!-- The dom4j.jar and jdom.jar are only needed for distribution tests and builds -->
- <pathelement location="${lib}/dom4j.jar"/>
- <pathelement location="${lib}/jdom.jar"/>
+ <pathelement location="${javalib}/dom4j.jar"/>
+ <pathelement location="${javalib}/jdom1.jar"/>
<!-- The Xerces jars are only needed for testing on JDK 1.3 -->
- <pathelement location="${lib}/xml-apis.jar"/>
- <pathelement location="${lib}/xercesImpl.jar"/>
+ <pathelement location="${javalib}/xml-apis.jar"/>
+ <pathelement location="${javalib}/xercesImpl.jar"/>
</path>
<path id="javadoc-classpath">
<pathelement location="${lib}/${bindname}.jar"/>
<pathelement location="${lib}/${runname}.jar"/>
<pathelement location="${lib}/${extrasname}.jar"/>
- <pathelement location="${lib}/xpp3.jar"/>
- <pathelement location="${lib}/bcel.jar"/>
+ <pathelement location="${javalib}/xpp3.jar"/>
+ <pathelement location="${javalib}/bcel.jar"/>
<!-- The dom4j.jar and jdom.jar are only needed for distribution tests and builds -->
- <pathelement location="${lib}/dom4j.jar"/>
- <pathelement location="${lib}/jdom.jar"/>
+ <pathelement location="${javalib}/dom4j.jar"/>
+ <pathelement location="${javalib}/jdom1.jar"/>
<!-- The Xerces jars are only needed for distribution builds on JDK 1.3 -->
- <pathelement location="${lib}/xml-apis.jar"/>
- <pathelement location="${lib}/xercesImpl.jar"/>
+ <pathelement location="${javalib}/xml-apis.jar"/>
+ <pathelement location="${javalib}/xercesImpl.jar"/>
</path>
<!-- Need to add jars at point of use, so that build doesn't test with old
version (because Ant apparently gets the files at time of definition) -->
<path id="tools-classpath">
<pathelement location="${lib}/${bindname}.jar"/>
<pathelement location="${lib}/${runname}.jar"/>
- <pathelement location="${lib}/bcel.jar"/>
- <pathelement location="${lib}/xpp3.jar"/>
+ <pathelement location="${javalib}/bcel.jar"/>
+ <pathelement location="${javalib}/xpp3.jar"/>
</path>
<!-- Optional components -->
- <available property="dom4j" file="${lib}/dom4j.jar"/>
- <available property="jdom" file="${lib}/jdom.jar"/>
+ <available property="dom4j" file="${javalib}/dom4j.jar"/>
+ <available property="jdom" file="${javalib}/jdom1.jar"/>
+
+ <!-- clean target to make sure source tree is *exactly* the same as before -->
+ <target name="clean" depends="clean-bind,clean-run,clean-extras,clean-tests">
+ <delete quiet="true" includeemptydirs="true">
+ <fileset dir="${build}/classes" includes="**/*"/>
+ </delete>
+ <delete quiet="true" includeemptydirs="true">
+ <fileset dir="${build}/docs" includes="**/*"/>
+ </delete>
+ </target>
<!-- Delete binding class files -->
<target name="clean-bind">
- <delete quiet="true" file="${bindname}.jar"/>
+ <delete quiet="true" file="${lib}/${bindname}.jar"/>
<delete quiet="true" dir="${binddest}/org/jibx/binding"/>
</target>
<!-- Delete runtime class files -->
<target name="clean-run">
- <delete quiet="true" file="${runname}.jar"/>
+ <delete quiet="true" file="${lib}/${runname}.jar"/>
<delete quiet="true" dir="${rundest}/org/jibx/runtime"/>
</target>
<!-- Delete extras class files -->
<target name="clean-extras">
- <delete quiet="true" file="${extrasname}.jar"/>
+ <delete quiet="true" file="${lib}/${extrasname}.jar"/>
<delete quiet="true" dir="${extrasdest}/org/jibx/extras"/>
</target>
@@ -279,7 +290,7 @@
<pathelement path="${testdest}"/>
<pathelement path="${lib}/${runname}.jar"/>
<pathelement path="${lib}/${extrasname}.jar"/>
- <pathelement path="${lib}/xpp3.jar"/>
+ <pathelement path="${javalib}/xpp3.jar"/>
</classpath>
<!-- This is the full set of crossbar tests with most combinations included -->
|
