From 795157a46f9c95074ca3b5bad5cdc680ee198528 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Wed, 6 Dec 2000 10:46:20 +0000 Subject: [PATCH] Make perforce tasks work on Windows 2000 as well. Reported by: Craig Kelley git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268321 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/taskdefs/optional/perforce/P4Base.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java index 9191d8b9f..d0b1e0d07 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java @@ -111,10 +111,15 @@ public abstract class P4Base extends org.apache.tools.ant.Task { String myOS = System.getProperty("os.name"); if(myOS == null) throw new BuildException("Unable to determine OS"); + myOS = myOS.toLowerCase(); - if(myOS.toLowerCase().indexOf("nt") >= 0) { + if( myOS.indexOf("os/2") >= 0 ) { + shell = "cmd /c "; + } else if( myOS.startsWith("windows") + && (myOS.indexOf("2000") >= 0 || myOS.indexOf("nt") >= 0 ) ) { shell = "cmd /c "; } else { + // What about Mac OS? No perforce support there? shell = "/bin/sh "; //This needs testing on Unix!!!! } //Get default P4 settings from environment - Mark would have done something cool with