Return-Path: <conor@locus.apache.org>
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 78607 invoked by uid 500); 1 Aug 2000 09:59:43 -0000
Delivered-To: apmail-jakarta-ant-cvs@apache.org
Received: (qmail 78602 invoked by uid 1142); 1 Aug 2000 09:59:41 -0000
Date: 1 Aug 2000 09:59:41 -0000
Message-ID: <20000801095941.78601.qmail@locus.apache.org>
From: conor@locus.apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs
 Execute.java

conor       00/08/01 02:59:40

  Modified:    src/main/org/apache/tools/ant/taskdefs Execute.java
  Log:
  Recognize Windows 2000 for ther purposes of exec (so that it behaves
  in the same manner as NT)
  Submitted by:	Robert Watkins <robert.watkins@mincom.com>
  
  Revision  Changes    Path
  1.3       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Execute.java
  
  Index: Execute.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Execute.java	2000/07/25 12:03:26	1.2
  +++ Execute.java	2000/08/01 09:59:39	1.3
  @@ -120,7 +120,8 @@
               !antWorkingDirectory.equals(workingDirectory.getAbsolutePath())) {
   
               if (myos.toLowerCase().indexOf("windows") >= 0 &&
  -                myos.toLowerCase().indexOf("nt") >= 0) {
  +                (myos.toLowerCase().indexOf("nt") >= 0 ||
  +                 myos.indexOf("2000") >= 0)) {
   
                   commandLine = new String[cmdl.length+5];
                   commandLine[0] = "cmd";