|
 |
c7075f8 |
--- velocity-1.6.3.mef/build/build.xml.orig 2010-01-15 12:53:01.344906711 +0000
|
|
|
c7075f8 |
+++ velocity-1.6.3.mef/build/build.xml 2010-01-15 12:53:07.537915055 +0000
|
|
|
c7075f8 |
@@ -138,28 +138,6 @@
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
- <target name="build-prepare">
|
|
|
c7075f8 |
- <ant antfile="${velocity.build.dir}/download.xml" target="build-download" />
|
|
|
c7075f8 |
-
|
|
|
c7075f8 |
-
|
|
|
c7075f8 |
- <path id="velocity.build.classpath">
|
|
|
c7075f8 |
- <fileset dir="${build.lib}">
|
|
|
c7075f8 |
- <include name="**/*.jar"/>
|
|
|
c7075f8 |
- </fileset>
|
|
|
c7075f8 |
- </path>
|
|
|
c7075f8 |
-
|
|
|
c7075f8 |
-
|
|
|
c7075f8 |
- <path id="velocity.test.classpath">
|
|
|
c7075f8 |
- <fileset dir="${build.test.lib}">
|
|
|
c7075f8 |
- <include name="**/*.jar"/>
|
|
|
c7075f8 |
- </fileset>
|
|
|
c7075f8 |
- </path>
|
|
|
c7075f8 |
-
|
|
|
c7075f8 |
- <path id="velocity.run.classpath">
|
|
|
c7075f8 |
- <path refid="velocity.build.classpath"/>
|
|
|
c7075f8 |
- <pathelement location="${build.dir}/${final.name}.jar"/>
|
|
|
c7075f8 |
- </path>
|
|
|
c7075f8 |
- </target>
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
@@ -172,12 +150,11 @@
|
|
|
c7075f8 |
<target name="prepare-jdbc" depends="check-jdbc,check-jdbc-true,check-jdbc-false"/>
|
|
|
c7075f8 |
<target name="prepare-jdk14" depends="check-jdk14,check-jdk14-true,check-jdk14-false"/>
|
|
|
c7075f8 |
|
|
|
c7075f8 |
- <target name="check-jdbc" depends="build-prepare">
|
|
|
c7075f8 |
+ <target name="check-jdbc">
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
property="jdbc.present">
|
|
|
c7075f8 |
- <classpath refid="velocity.build.classpath"/>
|
|
|
c7075f8 |
</available>
|
|
|
c7075f8 |
</target>
|
|
|
c7075f8 |
|
|
|
c7075f8 |
@@ -208,10 +185,9 @@
|
|
|
c7075f8 |
</echo>
|
|
|
c7075f8 |
</target>
|
|
|
c7075f8 |
|
|
|
c7075f8 |
- <target name="check-jdk14" depends="build-prepare">
|
|
|
c7075f8 |
+ <target name="check-jdk14">
|
|
|
c7075f8 |
|
|
|
c7075f8 |
property="jdk14.present">
|
|
|
c7075f8 |
- <classpath refid="velocity.build.classpath"/>
|
|
|
c7075f8 |
</available>
|
|
|
c7075f8 |
</target>
|
|
|
c7075f8 |
|
|
|
c7075f8 |
@@ -246,7 +222,7 @@
|
|
|
c7075f8 |
|
|
|
c7075f8 |
<target name="compile" depends="compile-src,compile-test"/>
|
|
|
c7075f8 |
|
|
|
c7075f8 |
-
|
|
|
c7075f8 |
+
|
|
|
c7075f8 |
description="Compiles the Velocity source">
|
|
|
c7075f8 |
|
|
|
c7075f8 |
destdir="${build.dest}"
|
|
|
c7075f8 |
@@ -255,8 +231,7 @@
|
|
|
c7075f8 |
target="${javac.target}"
|
|
|
c7075f8 |
source="${javac.source}"
|
|
|
c7075f8 |
deprecation="${deprecation}"
|
|
|
c7075f8 |
- optimize="${optimize}"
|
|
|
c7075f8 |
- classpathref="velocity.build.classpath"/>
|
|
|
c7075f8 |
+ optimize="${optimize}"/>
|
|
|
c7075f8 |
|
|
|
c7075f8 |
<copy todir="${build.dest}" filtering="yes">
|
|
|
c7075f8 |
<fileset dir="${src.java.dir}">
|
|
|
c7075f8 |
@@ -266,7 +241,7 @@
|
|
|
c7075f8 |
|
|
|
c7075f8 |
</target>
|
|
|
c7075f8 |
|
|
|
c7075f8 |
-
|
|
|
c7075f8 |
+
|
|
|
c7075f8 |
description="Compiles the Velocity test classes">
|
|
|
c7075f8 |
|
|
|
c7075f8 |
destdir="${build.test.dest}"
|
|
|
c7075f8 |
@@ -277,8 +252,6 @@
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
<classpath>
|
|
|
c7075f8 |
- <path refid="velocity.build.classpath"/>
|
|
|
c7075f8 |
- <path refid="velocity.test.classpath" />
|
|
|
c7075f8 |
<pathelement location="${build.dest}"/>
|
|
|
c7075f8 |
</classpath>
|
|
|
c7075f8 |
</javac>
|
|
|
c7075f8 |
@@ -503,7 +476,7 @@
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
-
|
|
|
c7075f8 |
+
|
|
|
c7075f8 |
description="Compiles the Velocity Example code">
|
|
|
c7075f8 |
|
|
|
c7075f8 |
<echo>
|
|
|
c7075f8 |
@@ -527,8 +500,7 @@
|
|
|
c7075f8 |
encoding="UTF-8"
|
|
|
c7075f8 |
debug="${debug}"
|
|
|
c7075f8 |
deprecation="${deprecation}"
|
|
|
c7075f8 |
- optimize="${optimize}"
|
|
|
c7075f8 |
- classpathref="velocity.run.classpath"/>
|
|
|
c7075f8 |
+ optimize="${optimize}"/>
|
|
|
c7075f8 |
</target>
|
|
|
c7075f8 |
|
|
|
c7075f8 |
<target name="examples-clean" depends="examples-clean-anakia">
|
|
|
c7075f8 |
@@ -546,7 +518,7 @@
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
-
|
|
|
c7075f8 |
+
|
|
|
c7075f8 |
description="Creates the Javadoc API documentation">
|
|
|
c7075f8 |
|
|
|
c7075f8 |
<mkdir dir="${build.javadoc}"/>
|
|
|
c7075f8 |
@@ -562,8 +534,7 @@
|
|
|
c7075f8 |
doctitle="${name} ${version} API"
|
|
|
c7075f8 |
encoding="UTF-8"
|
|
|
c7075f8 |
docencoding="UTF-8"
|
|
|
c7075f8 |
- bottom="Copyright © 2000-${build.year} <a href="http://www.apache.org/">Apache Software Foundation</a>. All Rights Reserved."
|
|
|
c7075f8 |
- classpathref="velocity.build.classpath">
|
|
|
c7075f8 |
+ bottom="Copyright © 2000-${build.year} <a href="http://www.apache.org/">Apache Software Foundation</a>. All Rights Reserved.">
|
|
|
c7075f8 |
|
|
|
c7075f8 |
<link href="${javadocs.ref.jsdk}"/>
|
|
|
c7075f8 |
<link href="http://www.jdom.org/docs/apidocs"/>
|
|
|
c7075f8 |
@@ -918,12 +889,11 @@
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
-
|
|
|
c7075f8 |
+
|
|
|
c7075f8 |
description="Generates the Velocity HTML documentation">
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
- classname="org.apache.velocity.anakia.AnakiaTask"
|
|
|
c7075f8 |
- classpathref="velocity.run.classpath"/>
|
|
|
c7075f8 |
+ classname="org.apache.velocity.anakia.AnakiaTask"/>
|
|
|
c7075f8 |
|
|
|
c7075f8 |
<echo>
|
|
|
c7075f8 |
#######################################################
|
|
|
c7075f8 |
@@ -1106,7 +1076,7 @@
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
-
|
|
|
c7075f8 |
+
|
|
|
c7075f8 |
description="Run the Velocity testcases">
|
|
|
c7075f8 |
|
|
|
c7075f8 |
<mkdir dir="${build.test.reports}"/>
|
|
|
c7075f8 |
@@ -1120,8 +1090,6 @@
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
<classpath>
|
|
|
c7075f8 |
- <path refid="velocity.build.classpath" />
|
|
|
c7075f8 |
- <path refid="velocity.test.classpath" />
|
|
|
c7075f8 |
<pathelement path="${build.dest}"/>
|
|
|
c7075f8 |
<pathelement path="${build.test.dest}"/>
|
|
|
c7075f8 |
</classpath>
|
|
|
c7075f8 |
--- velocity-1.6.3.mef/build/testcases.xml.orig 2010-01-15 13:09:06.265907075 +0000
|
|
|
c7075f8 |
+++ velocity-1.6.3.mef/build/testcases.xml 2010-01-15 13:09:08.356067618 +0000
|
|
|
c7075f8 |
@@ -36,12 +36,6 @@
|
|
|
c7075f8 |
|
|
|
c7075f8 |
|
|
|
c7075f8 |
<path id="velocity.test.classpath">
|
|
|
c7075f8 |
- <fileset dir="${build.lib}">
|
|
|
c7075f8 |
- <include name="**/*.jar"/>
|
|
|
c7075f8 |
- </fileset>
|
|
|
c7075f8 |
- <fileset dir="${build.test.lib}">
|
|
|
c7075f8 |
- <include name="**/*.jar"/>
|
|
|
c7075f8 |
- </fileset>
|
|
|
c7075f8 |
<pathelement location="${build.dest}"/>
|
|
|
c7075f8 |
<pathelement location="${build.test.dest}"/>
|
|
|
c7075f8 |
</path>
|