ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Execute.java
Date Tue, 29 Jan 2002 16:55:11 GMT
bodewig     02/01/29 08:55:11

  Modified:    src/main/org/apache/tools/ant/taskdefs Execute.java
  Log:
  make Execute support Windows XP.
  
  Revision  Changes    Path
  1.30      +18 -12    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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- Execute.java	10 Jan 2002 13:59:31 -0000	1.29
  +++ Execute.java	29 Jan 2002 16:55:11 -0000	1.30
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -76,6 +76,8 @@
    * Runs an external program.
    *
    * @author thomas.haas@softwired-inc.com
  + *
  + * @version $Revision: 1.30 $
    */
   public class Execute {
   
  @@ -135,12 +137,14 @@
                   baseLauncher = new CommandLauncher();
               }
   
  -            // Determine if we're running under 2000/NT or 98/95
  +            // Determine if we're running under XP/2000/NT or 98/95
               String osname =
                   System.getProperty("os.name").toLowerCase(Locale.US);
   
  -            if ( osname.indexOf("nt") >= 0 || osname.indexOf("2000") >= 0 ) {
  -                // Windows 2000/NT
  +            if ( osname.indexOf("nt") >= 0 ||
  +                 osname.indexOf("2000") >= 0 ||
  +                 osname.indexOf("xp") >= 0 ) {
  +                // Windows XP/2000/NT
                   shellLauncher = new WinNTCommandLauncher(baseLauncher);
               }
               else {
  @@ -173,7 +177,7 @@
        */
       public static synchronized Vector getProcEnvironment() {
           if (procEnvironment != null) {
  -          return procEnvironment;
  +            return procEnvironment;
           }
   
           procEnvironment = new Vector();
  @@ -231,9 +235,11 @@
           else if ( Os.isFamily("windows") ) {
               String osname =
                   System.getProperty("os.name").toLowerCase(Locale.US);
  -            // Determine if we're running under 2000/NT or 98/95
  -            if ( osname.indexOf("nt") >= 0 || osname.indexOf("2000") >= 0 ) {
  -                // Windows 2000/NT
  +            // Determine if we're running under XP/2000/NT or 98/95
  +            if ( osname.indexOf("nt") >= 0 ||
  +                 osname.indexOf("2000") >= 0 ||
  +                 osname.indexOf("xp") >= 0 ) {
  +                // Windows XP/2000/NT
                   String[] cmd = {"cmd", "/c", "set" };
                   return cmd;
               }
  @@ -329,7 +335,7 @@
        */
       public String[] getEnvironment() {
           if (env == null || newEnvironment) {
  -          return env;
  +            return env;
           }
           return patchEnvironment();
       }
  @@ -414,7 +420,7 @@
           processDestroyer.add(process);
   
           if (watchdog != null) {
  -          watchdog.start(process);
  +            watchdog.start(process);
           }
           waitFor(process);
   
  @@ -423,11 +429,11 @@
           processDestroyer.remove(process);
   
           if (watchdog != null) {
  -          watchdog.stop();
  +            watchdog.stop();
           }
           streamHandler.stop();
           if (watchdog != null) {
  -          watchdog.checkException();
  +            watchdog.checkException();
           }
           return getExitValue();
       }
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message