From c5e1c21947ec2bb7f0493ce72994cb180ccdca40 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 30 May 2003 09:31:45 +0000 Subject: [PATCH] Revert logic that performs the 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 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274641 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/taskdefs/condition/Os.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java index 5106f4d63..31c52dbf5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java @@ -222,20 +222,10 @@ public class Os implements Condition { && (!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;