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/condition Os.java
Date Thu, 06 Feb 2003 16:25:57 GMT
bodewig     2003/02/06 08:25:55

  Modified:    src/main/org/apache/tools/ant/taskdefs/condition Tag:
                        ANT_15_BRANCH Os.java
  Log:
  Very quick fix for bug 16611
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.15.2.3  +13 -2     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
  
  Index: Os.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Os.java,v
  retrieving revision 1.15.2.2
  retrieving revision 1.15.2.3
  diff -u -r1.15.2.2 -r1.15.2.3
  --- Os.java	4 Dec 2002 17:02:35 -0000	1.15.2.2
  +++ Os.java	6 Feb 2003 16:25:54 -0000	1.15.2.3
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -219,8 +219,19 @@
                           && (!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);
                   } else if (family.equals("z/os")) {
                       isFamily = osName.indexOf("z/os") > -1 
  
  
  

Mime
View raw message