mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-17 05:52:26 +00:00
fixed #280.
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@2092 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
d6f052ddfc
commit
2b9fbcdefa
1 file changed
+4
-6
@@ -58,10 +58,10 @@ public class Ant extends Builder {
|
||||
String cmd;
|
||||
|
||||
String execName;
|
||||
if(onWindows)
|
||||
execName = "ant.bat";
|
||||
else
|
||||
if(launcher.isUnix())
|
||||
execName = "ant";
|
||||
else
|
||||
execName = "ant.bat";
|
||||
|
||||
String normalizedTarget = targets.replaceAll("[\t\r\n]+"," ");
|
||||
|
||||
@@ -81,7 +81,7 @@ public class Ant extends Builder {
|
||||
if(ai!=null)
|
||||
env.put("ANT_HOME",ai.getAntHome());
|
||||
|
||||
if(onWindows) {
|
||||
if(!launcher.isUnix()) {
|
||||
// on Windows, executing batch file can't return the correct error code,
|
||||
// so we need to wrap it into cmd.exe.
|
||||
// double %% is needed because we want ERRORLEVEL to be expanded after
|
||||
@@ -228,6 +228,4 @@ public class Ant extends Builder {
|
||||
return getExecutable().exists();
|
||||
}
|
||||
}
|
||||
|
||||
private static final boolean onWindows = File.separatorChar == '\\';
|
||||
}
|
||||
Reference in new issue
Block a user