|
 |
f90952 |
From 813085c72e9906a53bec5954bcce7305a7c320d1 Mon Sep 17 00:00:00 2001
|
|
|
f90952 |
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
|
|
f90952 |
Date: Mon, 21 Feb 2011 17:58:39 +0100
|
|
|
f90952 |
Subject: [PATCH 3/3] Use system jars
|
|
|
f90952 |
|
|
|
f90952 |
---
|
|
|
f90952 |
build/build.xml | 56 +++++++++++----------------------------------------
|
|
|
f90952 |
build/testcases.xml | 6 -----
|
|
|
f90952 |
2 files changed, 12 insertions(+), 50 deletions(-)
|
|
|
f90952 |
|
|
|
f90952 |
diff --git a/build/build.xml b/build/build.xml
|
|
|
f90952 |
index c667553..479ef2d 100644
|
|
|
f90952 |
--- a/build/build.xml
|
|
|
f90952 |
+++ b/build/build.xml
|
|
|
f90952 |
@@ -140,28 +140,6 @@
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
- <target name="build-prepare">
|
|
|
f90952 |
- <ant antfile="${velocity.build.dir}/download.xml" target="build-download" />
|
|
|
f90952 |
-
|
|
|
f90952 |
-
|
|
|
f90952 |
- <path id="velocity.build.classpath">
|
|
|
f90952 |
- <fileset dir="${build.lib}">
|
|
|
f90952 |
- <include name="**/*.jar"/>
|
|
|
f90952 |
- </fileset>
|
|
|
f90952 |
- </path>
|
|
|
f90952 |
-
|
|
|
f90952 |
-
|
|
|
f90952 |
- <path id="velocity.test.classpath">
|
|
|
f90952 |
- <fileset dir="${build.test.lib}">
|
|
|
f90952 |
- <include name="**/*.jar"/>
|
|
|
f90952 |
- </fileset>
|
|
|
f90952 |
- </path>
|
|
|
f90952 |
-
|
|
|
f90952 |
- <path id="velocity.run.classpath">
|
|
|
f90952 |
- <path refid="velocity.build.classpath"/>
|
|
|
f90952 |
- <pathelement location="${build.dir}/${final.name}.jar"/>
|
|
|
f90952 |
- </path>
|
|
|
f90952 |
- </target>
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
@@ -174,12 +152,11 @@
|
|
|
f90952 |
<target name="prepare-jdbc" depends="check-jdbc,check-jdbc-true,check-jdbc-false"/>
|
|
|
f90952 |
<target name="prepare-jdk14" depends="check-jdk14,check-jdk14-true,check-jdk14-false"/>
|
|
|
f90952 |
|
|
|
f90952 |
- <target name="check-jdbc" depends="build-prepare">
|
|
|
f90952 |
+ <target name="check-jdbc">
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
property="jdbc.present">
|
|
|
f90952 |
- <classpath refid="velocity.build.classpath"/>
|
|
|
f90952 |
</available>
|
|
|
f90952 |
</target>
|
|
|
f90952 |
|
|
|
f90952 |
@@ -210,10 +187,9 @@
|
|
|
f90952 |
</echo>
|
|
|
f90952 |
</target>
|
|
|
f90952 |
|
|
|
f90952 |
- <target name="check-jdk14" depends="build-prepare">
|
|
|
f90952 |
+ <target name="check-jdk14">
|
|
|
f90952 |
|
|
|
f90952 |
property="jdk14.present">
|
|
|
f90952 |
- <classpath refid="velocity.build.classpath"/>
|
|
|
f90952 |
</available>
|
|
|
f90952 |
</target>
|
|
|
f90952 |
|
|
|
f90952 |
@@ -248,7 +224,7 @@
|
|
|
f90952 |
|
|
|
f90952 |
<target name="compile" depends="compile-src,compile-test"/>
|
|
|
f90952 |
|
|
|
f90952 |
-
|
|
|
f90952 |
+
|
|
|
f90952 |
description="Compiles the Velocity source">
|
|
|
f90952 |
|
|
|
f90952 |
destdir="${build.dest}"
|
|
|
f90952 |
@@ -257,8 +233,7 @@
|
|
|
f90952 |
target="${javac.target}"
|
|
|
f90952 |
source="${javac.source}"
|
|
|
f90952 |
deprecation="${deprecation}"
|
|
|
f90952 |
- optimize="${optimize}"
|
|
|
f90952 |
- classpathref="velocity.build.classpath"/>
|
|
|
f90952 |
+ optimize="${optimize}"/>
|
|
|
f90952 |
|
|
|
f90952 |
<copy todir="${build.dest}" filtering="yes">
|
|
|
f90952 |
<fileset dir="${src.java.dir}">
|
|
|
f90952 |
@@ -268,7 +243,7 @@
|
|
|
f90952 |
|
|
|
f90952 |
</target>
|
|
|
f90952 |
|
|
|
f90952 |
-
|
|
|
f90952 |
+
|
|
|
f90952 |
description="Compiles the Velocity test classes">
|
|
|
f90952 |
|
|
|
f90952 |
destdir="${build.test.dest}"
|
|
|
f90952 |
@@ -279,8 +254,6 @@
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
<classpath>
|
|
|
f90952 |
- <path refid="velocity.build.classpath"/>
|
|
|
f90952 |
- <path refid="velocity.test.classpath" />
|
|
|
f90952 |
<pathelement location="${build.dest}"/>
|
|
|
f90952 |
</classpath>
|
|
|
f90952 |
</javac>
|
|
|
f90952 |
@@ -561,7 +534,7 @@
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
-
|
|
|
f90952 |
+
|
|
|
f90952 |
description="Compiles the Velocity Example code">
|
|
|
f90952 |
|
|
|
f90952 |
<echo>
|
|
|
f90952 |
@@ -585,8 +558,7 @@
|
|
|
f90952 |
encoding="UTF-8"
|
|
|
f90952 |
debug="${debug}"
|
|
|
f90952 |
deprecation="${deprecation}"
|
|
|
f90952 |
- optimize="${optimize}"
|
|
|
f90952 |
- classpathref="velocity.run.classpath"/>
|
|
|
f90952 |
+ optimize="${optimize}"/>
|
|
|
f90952 |
</target>
|
|
|
f90952 |
|
|
|
f90952 |
<target name="examples-clean" depends="examples-clean-anakia">
|
|
|
f90952 |
@@ -604,7 +576,7 @@
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
-
|
|
|
f90952 |
+
|
|
|
f90952 |
description="Creates the Javadoc API documentation">
|
|
|
f90952 |
|
|
|
f90952 |
<mkdir dir="${build.javadoc}"/>
|
|
|
f90952 |
@@ -620,8 +592,7 @@
|
|
|
f90952 |
doctitle="${name} ${version} API"
|
|
|
f90952 |
encoding="UTF-8"
|
|
|
f90952 |
docencoding="UTF-8"
|
|
|
f90952 |
- bottom="Copyright © 2000-${build.year} <a href="http://www.apache.org/">Apache Software Foundation</a>. All Rights Reserved."
|
|
|
f90952 |
- classpathref="velocity.build.classpath">
|
|
|
f90952 |
+ bottom="Copyright © 2000-${build.year} <a href="http://www.apache.org/">Apache Software Foundation</a>. All Rights Reserved.">
|
|
|
f90952 |
|
|
|
f90952 |
<link href="${javadocs.ref.jsdk}"/>
|
|
|
f90952 |
<link href="http://www.jdom.org/docs/apidocs"/>
|
|
|
f90952 |
@@ -1024,12 +995,11 @@
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
-
|
|
|
f90952 |
+
|
|
|
f90952 |
description="Generates the Velocity HTML documentation">
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
- classname="org.apache.velocity.anakia.AnakiaTask"
|
|
|
f90952 |
- classpathref="velocity.run.classpath"/>
|
|
|
f90952 |
+ classname="org.apache.velocity.anakia.AnakiaTask"/>
|
|
|
f90952 |
|
|
|
f90952 |
<echo>
|
|
|
f90952 |
#######################################################
|
|
|
f90952 |
@@ -1231,7 +1201,7 @@
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
-
|
|
|
f90952 |
+
|
|
|
f90952 |
description="Run the Velocity testcases">
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
@@ -1264,8 +1234,6 @@
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
<classpath>
|
|
|
f90952 |
- <path refid="velocity.build.classpath" />
|
|
|
f90952 |
- <path refid="velocity.test.classpath" />
|
|
|
f90952 |
<pathelement path="${build.dest}"/>
|
|
|
f90952 |
<pathelement path="${build.test.dest}"/>
|
|
|
f90952 |
</classpath>
|
|
|
f90952 |
diff --git a/build/testcases.xml b/build/testcases.xml
|
|
|
f90952 |
index 06bb36e..f3749bc 100644
|
|
|
f90952 |
--- a/build/testcases.xml
|
|
|
f90952 |
+++ b/build/testcases.xml
|
|
|
f90952 |
@@ -36,12 +36,6 @@
|
|
|
f90952 |
|
|
|
f90952 |
|
|
|
f90952 |
<path id="velocity.test.classpath">
|
|
|
f90952 |
- <fileset dir="${build.lib}">
|
|
|
f90952 |
- <include name="**/*.jar"/>
|
|
|
f90952 |
- </fileset>
|
|
|
f90952 |
- <fileset dir="${build.test.lib}">
|
|
|
f90952 |
- <include name="**/*.jar"/>
|
|
|
f90952 |
- </fileset>
|
|
|
f90952 |
<pathelement location="${build.dest}"/>
|
|
|
f90952 |
<pathelement location="${build.test.dest}"/>
|
|
|
f90952 |
</path>
|
|
|
f90952 |
--
|
|
|
f90952 |
1.7.4
|
|
|
f90952 |
|