bodewig 2003/02/06 08:27:45
Modified: src/main/org/apache/tools/ant/taskdefs/condition Os.java
Log:
Very quick fix for bug 16611
Revision Changes Path
1.21 +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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Os.java 4 Dec 2002 16:42:32 -0000 1.20
+++ Os.java 6 Feb 2003 16:27:45 -0000 1.21
@@ -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
