Browse Source

Mad all the command launchers use getEnvironmentSpec and thus made ExecUtil.toNativeEnvironment private as it is not used outside class.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270521 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
146898d169
4 changed files with 5 additions and 5 deletions
  1. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ExecUtil.java
  2. +2
    -2
      proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/MacCommandLauncher.java
  3. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ScriptCommandLauncher.java
  4. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/WinNTCommandLauncher.java

+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ExecUtil.java View File

@@ -79,7 +79,7 @@ class ExecUtil
return file.getCanonicalFile().equals( getCwd() );
}

protected static String[] toNativeEnvironment( final Properties environment )
private static String[] toNativeEnvironment( final Properties environment )
throws ExecException
{
if( null == environment )


+ 2
- 2
proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/MacCommandLauncher.java View File

@@ -36,7 +36,7 @@ public class MacCommandLauncher
final File directory = metaData.getWorkingDirectory().getCanonicalFile();
if( ExecUtil.isCwd( directory ) )
{
final String[] env = ExecUtil.toNativeEnvironment( metaData.getEnvironment() );
final String[] env = ExecUtil.getEnvironmentSpec( metaData );
return Runtime.getRuntime().exec( metaData.getCommand(), env );
}

@@ -46,7 +46,7 @@ public class MacCommandLauncher
try
{
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 );
}
finally


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ScriptCommandLauncher.java View File

@@ -70,7 +70,7 @@ public class ScriptCommandLauncher
prefix[ m_script.length ] = metaData.getWorkingDirectory().getCanonicalPath();

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 );
}
}

+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/WinNTCommandLauncher.java View File

@@ -41,7 +41,7 @@ public class WinNTCommandLauncher
prefix[ 5 ] = "&&";

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 );
}
}

Loading…
Cancel
Save