git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270521 13f79535-47bb-0310-9956-ffa450edef68master
@@ -79,7 +79,7 @@ class ExecUtil | |||||
return file.getCanonicalFile().equals( getCwd() ); | return file.getCanonicalFile().equals( getCwd() ); | ||||
} | } | ||||
protected static String[] toNativeEnvironment( final Properties environment ) | |||||
private static String[] toNativeEnvironment( final Properties environment ) | |||||
throws ExecException | throws ExecException | ||||
{ | { | ||||
if( null == environment ) | if( null == environment ) | ||||
@@ -36,7 +36,7 @@ public class MacCommandLauncher | |||||
final File directory = metaData.getWorkingDirectory().getCanonicalFile(); | final File directory = metaData.getWorkingDirectory().getCanonicalFile(); | ||||
if( ExecUtil.isCwd( directory ) ) | if( ExecUtil.isCwd( directory ) ) | ||||
{ | { | ||||
final String[] env = ExecUtil.toNativeEnvironment( metaData.getEnvironment() ); | |||||
final String[] env = ExecUtil.getEnvironmentSpec( metaData ); | |||||
return Runtime.getRuntime().exec( metaData.getCommand(), env ); | return Runtime.getRuntime().exec( metaData.getCommand(), env ); | ||||
} | } | ||||
@@ -46,7 +46,7 @@ public class MacCommandLauncher | |||||
try | try | ||||
{ | { | ||||
System.setProperty( "user.dir", directory.toString() ); | System.setProperty( "user.dir", directory.toString() ); | ||||
final String[] env = ExecUtil.toNativeEnvironment( metaData.getEnvironment() ); | |||||
final String[] env = ExecUtil.getEnvironmentSpec( metaData ); | |||||
return Runtime.getRuntime().exec( metaData.getCommand(), env ); | return Runtime.getRuntime().exec( metaData.getCommand(), env ); | ||||
} | } | ||||
finally | finally | ||||
@@ -70,7 +70,7 @@ public class ScriptCommandLauncher | |||||
prefix[ m_script.length ] = metaData.getWorkingDirectory().getCanonicalPath(); | prefix[ m_script.length ] = metaData.getWorkingDirectory().getCanonicalPath(); | ||||
final ExecMetaData newMetaData = ExecUtil.prepend( metaData, prefix ); | final ExecMetaData newMetaData = ExecUtil.prepend( metaData, prefix ); | ||||
final String[] env = ExecUtil.toNativeEnvironment( metaData.getEnvironment() ); | |||||
final String[] env = ExecUtil.getEnvironmentSpec( metaData ); | |||||
return Runtime.getRuntime().exec( newMetaData.getCommand(), env ); | return Runtime.getRuntime().exec( newMetaData.getCommand(), env ); | ||||
} | } | ||||
} | } |
@@ -41,7 +41,7 @@ public class WinNTCommandLauncher | |||||
prefix[ 5 ] = "&&"; | prefix[ 5 ] = "&&"; | ||||
final ExecMetaData newMetaData = ExecUtil.prepend( metaData, prefix ); | final ExecMetaData newMetaData = ExecUtil.prepend( metaData, prefix ); | ||||
final String[] env = ExecUtil.toNativeEnvironment( metaData.getEnvironment() ); | |||||
final String[] env = ExecUtil.getEnvironmentSpec( metaData ); | |||||
return Runtime.getRuntime().exec( newMetaData.getCommand(), env ); | return Runtime.getRuntime().exec( newMetaData.getCommand(), env ); | ||||
} | } | ||||
} | } |