From 184328a6053d43f95ce0a29e89c9314e50395f74 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Fri, 21 Dec 2001 09:31:19 +0000 Subject: [PATCH] Ugly to hack to get it compiling clean git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270275 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/org/apache/tools/ant/taskdefs/exec/Execute.java | 2 +- .../org/apache/tools/ant/taskdefs/exec/MacCommandLauncher.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java | 2 +- .../org/apache/tools/ant/taskdefs/exec/MacCommandLauncher.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java index 9ddfc3998..6d882cc10 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java @@ -32,7 +32,7 @@ public class Execute */ public final static int INVALID = Integer.MAX_VALUE; - private static String c_antWorkingDirectory = System.getProperty( "user.dir" ); + protected static String c_antWorkingDirectory = System.getProperty( "user.dir" ); private static CommandLauncher c_vmLauncher; private static CommandLauncher c_shellLauncher; private static Vector c_procEnvironment; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/MacCommandLauncher.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/MacCommandLauncher.java index b0e2b43c5..269996a6d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/MacCommandLauncher.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/MacCommandLauncher.java @@ -50,7 +50,7 @@ class MacCommandLauncher } finally { - System.getProperties().put( "user.dir", Execute.antWorkingDirectory ); + System.getProperties().put( "user.dir", Execute.c_antWorkingDirectory ); } } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java index 9ddfc3998..6d882cc10 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java @@ -32,7 +32,7 @@ public class Execute */ public final static int INVALID = Integer.MAX_VALUE; - private static String c_antWorkingDirectory = System.getProperty( "user.dir" ); + protected static String c_antWorkingDirectory = System.getProperty( "user.dir" ); private static CommandLauncher c_vmLauncher; private static CommandLauncher c_shellLauncher; private static Vector c_procEnvironment; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/MacCommandLauncher.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/MacCommandLauncher.java index b0e2b43c5..269996a6d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/MacCommandLauncher.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/MacCommandLauncher.java @@ -50,7 +50,7 @@ class MacCommandLauncher } finally { - System.getProperties().put( "user.dir", Execute.antWorkingDirectory ); + System.getProperties().put( "user.dir", Execute.c_antWorkingDirectory ); } } }