bodewig 2003/11/25 03:47:00
Modified:
proposal/sandbox/dotnet/src/main/org/apache/tools/ant/taskdefs/optional/dotnet
DotNetExecTask.java
Log:
Mono always needs the full path to the executable
Revision Changes Path
1.2 +12 -1
ant/proposal/sandbox/dotnet/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotNetExecTask.java
Index: DotNetExecTask.java
===================================================================
RCS file:
/home/cvs/ant/proposal/sandbox/dotnet/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotNetExecTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DotNetExecTask.java 21 Nov 2003 12:39:31 -0000 1.1
+++ DotNetExecTask.java 25 Nov 2003 11:47:00 -0000 1.2
@@ -135,10 +135,21 @@
// 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);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
