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
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
|
From 813085c72e9906a53bec5954bcce7305a7c320d1 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Mon, 21 Feb 2011 17:58:39 +0100
Subject: [PATCH 3/3] Use system jars
---
build/build.xml | 56 +++++++++++----------------------------------------
build/testcases.xml | 6 -----
2 files changed, 12 insertions(+), 50 deletions(-)
diff --git a/build/build.xml b/build/build.xml
index c667553..479ef2d 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -140,28 +140,6 @@
<!-- =================================================================== -->
<!-- sets up the build environment (classpath and libs) -->
<!-- =================================================================== -->
- <target name="build-prepare">
- <ant antfile="${velocity.build.dir}/download.xml" target="build-download" />
-
- <!-- Build classpath -->
- <path id="velocity.build.classpath">
- <fileset dir="${build.lib}">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <!-- Test classpath, contains dependencies needed only for Testing -->
- <path id="velocity.test.classpath">
- <fileset dir="${build.test.lib}">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <path id="velocity.run.classpath">
- <path refid="velocity.build.classpath"/>
- <pathelement location="${build.dir}/${final.name}.jar"/>
- </path>
- </target>
<!-- =================================================================== -->
<!-- checks for the existence/non-existence of various java features -->
@@ -174,12 +152,11 @@
<target name="prepare-jdbc" depends="check-jdbc,check-jdbc-true,check-jdbc-false"/>
<target name="prepare-jdk14" depends="check-jdk14,check-jdk14-true,check-jdk14-false"/>
- <target name="check-jdbc" depends="build-prepare">
+ <target name="check-jdbc">
<!-- note: check to see if required class is available. -->
<!-- might be j2ee.jar, jdbc2_0-stdext.jar, or simply JDK 1.4+ -->
<available classname="javax.sql.DataSource"
property="jdbc.present">
- <classpath refid="velocity.build.classpath"/>
</available>
</target>
@@ -210,10 +187,9 @@
</echo>
</target>
- <target name="check-jdk14" depends="build-prepare">
+ <target name="check-jdk14">
<available classname="java.util.logging.Logger"
property="jdk14.present">
- <classpath refid="velocity.build.classpath"/>
</available>
</target>
@@ -248,7 +224,7 @@
<!-- =================================================================== -->
<target name="compile" depends="compile-src,compile-test"/>
- <target name="compile-src" depends="prepare,build-prepare,check-jdbc,check-jdk14"
+ <target name="compile-src" depends="prepare,check-jdbc,check-jdk14"
description="Compiles the Velocity source">
<javac srcdir="${build.src}"
destdir="${build.dest}"
@@ -257,8 +233,7 @@
target="${javac.target}"
source="${javac.source}"
deprecation="${deprecation}"
- optimize="${optimize}"
- classpathref="velocity.build.classpath"/>
+ optimize="${optimize}"/>
<copy todir="${build.dest}" filtering="yes">
<fileset dir="${src.java.dir}">
@@ -268,7 +243,7 @@
</target>
- <target name="compile-test" depends="prepare,build-prepare,compile-src"
+ <target name="compile-test" depends="prepare,compile-src"
description="Compiles the Velocity test classes">
<javac srcdir="${build.test.src}"
destdir="${build.test.dest}"
@@ -279,8 +254,6 @@
<!-- Don't use the run classpath, build using the exploded class tree -->
<classpath>
- <path refid="velocity.build.classpath"/>
- <path refid="velocity.test.classpath" />
<pathelement location="${build.dest}"/>
</classpath>
</javac>
@@ -561,7 +534,7 @@
<!-- =================================================================== -->
<!-- Compiles the example code -->
<!-- =================================================================== -->
- <target name="examples" depends="build-prepare,jar"
+ <target name="examples"
description="Compiles the Velocity Example code">
<echo>
@@ -585,8 +558,7 @@
encoding="UTF-8"
debug="${debug}"
deprecation="${deprecation}"
- optimize="${optimize}"
- classpathref="velocity.run.classpath"/>
+ optimize="${optimize}"/>
</target>
<target name="examples-clean" depends="examples-clean-anakia">
@@ -604,7 +576,7 @@
<!-- =================================================================== -->
<!-- Creates the API documentation -->
<!-- =================================================================== -->
- <target name="javadocs" depends="prepare,build-prepare"
+ <target name="javadocs" depends="prepare"
description="Creates the Javadoc API documentation">
<mkdir dir="${build.javadoc}"/>
@@ -620,8 +592,7 @@
doctitle="${name} ${version} API"
encoding="UTF-8"
docencoding="UTF-8"
- bottom="Copyright © 2000-${build.year} <a href="http://www.apache.org/">Apache Software Foundation</a>. All Rights Reserved."
- classpathref="velocity.build.classpath">
+ bottom="Copyright © 2000-${build.year} <a href="http://www.apache.org/">Apache Software Foundation</a>. All Rights Reserved.">
<link href="${javadocs.ref.jsdk}"/>
<link href="http://www.jdom.org/docs/apidocs"/>
@@ -1024,12 +995,11 @@
<!-- Make HTML version of Velocity documentation -->
<!-- =================================================================== -->
- <target name="docs" depends="build-prepare,jar"
+ <target name="docs" depends="jar"
description="Generates the Velocity HTML documentation">
<taskdef name="anakia"
- classname="org.apache.velocity.anakia.AnakiaTask"
- classpathref="velocity.run.classpath"/>
+ classname="org.apache.velocity.anakia.AnakiaTask"/>
<echo>
#######################################################
@@ -1231,7 +1201,7 @@
<!-- =================================================================== -->
<!-- JUnit Tests for Velocity -->
<!-- =================================================================== -->
- <target name="test-main" depends="build-prepare,compile-test"
+ <target name="test-main" depends="compile-test"
description="Run the Velocity testcases">
<!-- Require ant 1.7+ for Junit compatibility -->
@@ -1264,8 +1234,6 @@
<!-- Don't use the run classpath, test using the exploded class tree -->
<classpath>
- <path refid="velocity.build.classpath" />
- <path refid="velocity.test.classpath" />
<pathelement path="${build.dest}"/>
<pathelement path="${build.test.dest}"/>
</classpath>
diff --git a/build/testcases.xml b/build/testcases.xml
index 06bb36e..f3749bc 100644
--- a/build/testcases.xml
+++ b/build/testcases.xml
@@ -36,12 +36,6 @@
<!-- Build classpath -->
<path id="velocity.test.classpath">
- <fileset dir="${build.lib}">
- <include name="**/*.jar"/>
- </fileset>
- <fileset dir="${build.test.lib}">
- <include name="**/*.jar"/>
- </fileset>
<pathelement location="${build.dest}"/>
<pathelement location="${build.test.dest}"/>
</path>
--
1.7.4
|