Browse Source

More ant.home cleanup

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267578 13f79535-47bb-0310-9956-ffa450edef68
master
Sam Ruby 25 years ago
parent
commit
8c796fb38a
2 changed files with 2 additions and 6 deletions
  1. +1
    -0
      build.xml
  2. +1
    -6
      src/main/org/apache/tools/ant/taskdefs/Cvs.java

+ 1
- 0
build.xml View File

@@ -10,6 +10,7 @@
<property name="name" value="ant"/> <property name="name" value="ant"/>
<property name="version" value="1.0-rc1"/> <property name="version" value="1.0-rc1"/>


<property name="ant.home" value="."/>
<property name="bin.dir" value="bin"/> <property name="bin.dir" value="bin"/>
<property name="src.bin.dir" value="src/bin"/> <property name="src.bin.dir" value="src/bin"/>
<property name="src.dir" value="src/main"/> <property name="src.dir" value="src/main"/>


+ 1
- 6
src/main/org/apache/tools/ant/taskdefs/Cvs.java View File

@@ -67,7 +67,6 @@ import java.io.*;
public class Cvs extends Exec { public class Cvs extends Exec {


private String cvsRoot; private String cvsRoot;
private String dest;
private String pack; private String pack;
private String tag; private String tag;
@@ -76,11 +75,7 @@ public class Cvs extends Exec {
// XXX: we should use JCVS (www.ice.com/JCVS) instead of command line // 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) // 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(); StringBuffer sb=new StringBuffer();
sb.append(ant).append("/bin/antRun ").append(dest);
sb.append(" cvs -d ").append( cvsRoot ).append(" checkout "); sb.append(" cvs -d ").append( cvsRoot ).append(" checkout ");
if (tag!=null) if (tag!=null)
sb.append("-r ").append(tag).append(" "); sb.append("-r ").append(tag).append(" ");
@@ -95,7 +90,7 @@ public class Cvs extends Exec {
} }


public void setDest(String dest) { public void setDest(String dest) {
this.dest = dest;
setDir(dest);
} }


public void setPackage(String p) { public void setPackage(String p) {


Loading…
Cancel
Save