bodewig 01/01/29 07:42:24
Modified: . build.xml
src/main/org/apache/tools/ant Constants.java
Log:
(1) Fix <copy> task to point to the "correct" source directory.
(2) I think there are a couple of superfluos @ characters in Constants.java.
Revision Changes Path
1.117 +11 -2 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- build.xml 2001/01/29 12:46:37 1.116
+++ build.xml 2001/01/29 15:42:22 1.117
@@ -214,6 +214,15 @@
-->
<target name="compile" depends="prepare">
+ <javac srcdir="${build.src}"
+ destdir="${build.classes}"
+ debug="${debug}"
+ deprecation="${deprecation}"
+ optimize="${optimize}" >
+ <classpath refid="classpath" />
+ <include name="${constants.file}" />
+ </javac>
+
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${debug}"
@@ -250,10 +259,10 @@
<exclude name="${optional.package}/sound/*.java" unless="jmf.present"
/>
</javac>
- <copy file="${build.src}/${ant.package}/defaultManifest.mf"
+ <copy file="${java.dir}/${ant.package}/defaultManifest.mf"
todir="${build.classes}/${ant.package}" />
- <copy file="${build.src}/${ant.package}/taskdefs/defaults.properties"
+ <copy file="${java.dir}/${ant.package}/taskdefs/defaults.properties"
todir="${build.classes}/${ant.package}/taskdefs" />
</target>
1.2 +2 -2 jakarta-ant/src/main/org/apache/tools/ant/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Constants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Constants.java 2001/01/29 12:42:16 1.1
+++ Constants.java 2001/01/29 15:42:24 1.2
@@ -14,6 +14,6 @@
*/
interface Constants
{
- String DATE = "@@DATE@@";
- String VERSION = "@@VERSION@@";
+ String DATE = "@DATE@";
+ String VERSION = "@VERSION@";
}
