ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/condition Os.java
Date Fri, 30 May 2003 09:31:45 GMT
bodewig     2003/05/30 02:31:45

  Modified:    src/main/org/apache/tools/ant/taskdefs/condition Os.java
  Log:
  Revert logic that performs the <os family="win9x"/> check from "I know
  all that are not win9x" to "I know all thar are win9x".
  
  Note that the list is as authoritative, complete and real-world-tested
  as my knowledge on said platform. ;-)
  
  PR: 16611
  
  Revision  Changes    Path
  1.25      +5 -15     ant/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
  
  Index: Os.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/condition/Os.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Os.java	14 Mar 2003 16:01:04 -0000	1.24
  +++ Os.java	30 May 2003 09:31:45 -0000	1.25
  @@ -222,20 +222,10 @@
                           && (!isFamily("mac") || osName.endsWith("x"));
                   } else if (family.equals("win9x")) {
                       isFamily = isFamily("windows") &&
  -                        /*
  -                         * FIXME
  -                         *
  -                         * Need a better way to know which one runs CMD.EXE
  -                         * and wich COMMAND.COM.
  -                         *
  -                         * If we use a fixed list of names, we should rather
  -                         * use one for all win9x flavors as it is supposed to
  -                         * be a final list.
  -                         */
  -                        !(osName.indexOf("nt") >= 0 ||
  -                          osName.indexOf("2000") >= 0 ||
  -                          osName.indexOf("2003") >= 0 ||
  -                          osName.indexOf("xp") >= 0);
  +                        (osName.indexOf("95") >= 0 ||
  +                         osName.indexOf("98") >= 0 ||
  +                         osName.indexOf("me") >= 0 ||
  +                         osName.indexOf("ce") >= 0);
                   } else if (family.equals("z/os")) {
                       isFamily = osName.indexOf("z/os") > -1
                           || osName.indexOf("os/390") > -1;
  
  
  

Mime
View raw message