ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@locus.apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Exec.java
Date Sun, 30 Jan 2000 16:20:24 GMT
rubys       00/01/30 08:20:24

  Modified:    src/bin  antRun
               src/main/org/apache/tools/ant/taskdefs Exec.java
  Log:
  Ensure quoted strings for javadoc are interpreted properly by the shell
  
  Revision  Changes    Path
  1.3       +1 -2      jakarta-ant/src/bin/antRun
  
  Index: antRun
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/bin/antRun,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- antRun	2000/01/26 03:46:05	1.2
  +++ antRun	2000/01/30 16:20:24	1.3
  @@ -10,5 +10,4 @@
     CMD="sh $CMD.sh"
   fi
   
  -echo $CMD $@
  -$CMD $@
  +echo $CMD $@ | sh
  
  
  
  1.6       +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exec.java
  
  Index: Exec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exec.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Exec.java	2000/01/27 03:57:32	1.5
  +++ Exec.java	2000/01/30 16:20:24	1.6
  @@ -67,12 +67,17 @@
   public class Exec extends Task {
       private String os;
       private String out;
  -    private String dir;
  +    private String dir = ".";
       private String command;
   
       private static final int BUFFER_SIZE = 512;
   
       public void execute() throws BuildException {
  +        run(command);
  +    }
  +
  +    protected void run(String command) throws BuildException {
  +
           // test if os match
           String myos = System.getProperty("os.name");
           project.log("Myos = " + myos, Project.MSG_VERBOSE);
  @@ -88,11 +93,6 @@
           String antRun = project.resolveFile(ant + "/bin/antRun").toString();
           if (myos.toLowerCase().indexOf("windows") >= 0) antRun = antRun + ".bat";
           command = antRun + " " + project.resolveFile(dir) + " " + command;
  -
  -        run(command);
  -    }
  -
  -    protected void run(String command) throws BuildException {
   
           try {
               // show the command
  
  
  

Mime
View raw message