rubys 00/01/30 09:15:33
Modified: . build.xml
src/main/org/apache/tools/ant/taskdefs Cvs.java
Log:
More ant.home cleanup
Revision Changes Path
1.5 +1 -0 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 2000/01/27 03:47:34 1.4
+++ build.xml 2000/01/30 17:15:32 1.5
@@ -10,6 +10,7 @@
<property name="name" value="ant"/>
<property name="version" value="1.0-rc1"/>
+ <property name="ant.home" value="."/>
<property name="bin.dir" value="bin"/>
<property name="src.bin.dir" value="src/bin"/>
<property name="src.dir" value="src/main"/>
1.3 +1 -6
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Cvs.java
Index: Cvs.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Cvs.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Cvs.java 2000/01/26 03:46:06 1.2
+++ Cvs.java 2000/01/30 17:15:32 1.3
@@ -67,7 +67,6 @@
public class Cvs extends Exec {
private String cvsRoot;
- private String dest;
private String pack;
private String tag;
@@ -76,11 +75,7 @@
// XXX: we should use JCVS (www.ice.com/JCVS) instead of command line
// execution so that we don't rely on having native CVS stuff around
(SM)
- String ant=project.getProperty("ant.home");
- if(ant==null) throw new BuildException("Needs ant.home");
-
StringBuffer sb=new StringBuffer();
- sb.append(ant).append("/bin/antRun ").append(dest);
sb.append(" cvs -d ").append( cvsRoot ).append(" checkout ");
if (tag!=null)
sb.append("-r ").append(tag).append(" ");
@@ -95,7 +90,7 @@
}
public void setDest(String dest) {
- this.dest = dest;
+ setDir(dest);
}
public void setPackage(String p) {
