|
6 | 6 | import java.io.InputStreamReader; |
7 | 7 | import java.lang.reflect.InvocationTargetException; |
8 | 8 | import java.util.ArrayList; |
| 9 | +import java.util.Arrays; |
9 | 10 | import java.util.List; |
10 | 11 | import java.util.Map; |
11 | 12 |
|
12 | 13 | import org.eclipse.cdt.core.templateengine.TemplateCore; |
13 | 14 | import org.eclipse.cdt.core.templateengine.process.ProcessArgument; |
14 | 15 | import org.eclipse.cdt.core.templateengine.process.ProcessFailureException; |
15 | 16 | import org.eclipse.cdt.core.templateengine.process.ProcessRunner; |
16 | | -import org.eclipse.cdt.utils.spawner.ProcessFactory; |
17 | 17 | import org.eclipse.core.resources.IProject; |
18 | 18 | import org.eclipse.core.resources.IResource; |
19 | 19 | import org.eclipse.core.resources.ResourcesPlugin; |
@@ -117,9 +117,6 @@ public void process(TemplateCore template, ProcessArgument[] args, String proces |
117 | 117 | } |
118 | 118 | } |
119 | 119 |
|
120 | | - // Inherit from parent process. |
121 | | - String envp[] = null; |
122 | | - |
123 | 120 | String substitutedCwd = EclipseUtils.performStringSubstitution(cwd); |
124 | 121 | if (substitutedCwd == null) { |
125 | 122 | // If substitution fails, revert to the original string, to alert |
@@ -150,7 +147,10 @@ public void run(IProgressMonitor pm) throws InterruptedException { |
150 | 147 | try { |
151 | 148 | BufferedReader reader = null; |
152 | 149 | pm.worked(1); |
153 | | - Process process = ProcessFactory.getFactory().exec(cmdArray, envp, dir); |
| 150 | + ProcessBuilder processBuilder = new ProcessBuilder(Arrays.asList(cmdArray)); |
| 151 | + processBuilder.directory(dir); |
| 152 | + |
| 153 | + Process process = processBuilder.start(); |
154 | 154 | pm.worked(1); |
155 | 155 | reader = new BufferedReader(new InputStreamReader(process.getInputStream())); |
156 | 156 |
|
|
0 commit comments