From 955453dc084e04306d04ddb92b1d8cdb1481a4a8 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Tue, 25 Nov 2003 11:47:00 +0000 Subject: [PATCH] Mono always needs the full path to the executable git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275690 13f79535-47bb-0310-9956-ffa450edef68 --- .../taskdefs/optional/dotnet/DotNetExecTask.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/proposal/sandbox/dotnet/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotNetExecTask.java b/proposal/sandbox/dotnet/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotNetExecTask.java index a7a6a0345..5266c0aa0 100644 --- a/proposal/sandbox/dotnet/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotNetExecTask.java +++ b/proposal/sandbox/dotnet/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotNetExecTask.java @@ -135,10 +135,21 @@ public class DotNetExecTask extends ExecTask { // can invoke executable directly super.setExecutable(executable); } else { + boolean b = getResolveExecutable(); + // Mono wants the absolte path of the assembly + setResolveExecutable(b || isMono(vm)); super.setExecutable(vm); cmdl.createArgument(true) - .setValue(resolveExecutable(executable)); + .setValue(resolveExecutable(executable, isMono(vm))); + setResolveExecutable(b); } } } + + /** + * Whether the given vm looks like the Mono executable. + */ + protected final static boolean isMono(String vm) { + return "mono".equals(vm) || "mint".equals(vm); + } }