diff options
author | Jeff Johnston | 2017-11-01 20:44:13 +0000 |
---|---|---|
committer | Jeff Johnston | 2017-11-02 15:20:35 +0000 |
commit | bd88f34dde4388cbd09e03e626eaf0c2f78f8d50 (patch) | |
tree | 8dc7ec5fdfcbcc16a6979ef33de91b2a26f3f5b9 /remote | |
parent | 2e0f85e5143587204f7380ef8c8209fdf266e1d8 (diff) | |
download | org.eclipse.cdt-bd88f34dde4388cbd09e03e626eaf0c2f78f8d50.tar.gz org.eclipse.cdt-bd88f34dde4388cbd09e03e626eaf0c2f78f8d50.tar.xz org.eclipse.cdt-bd88f34dde4388cbd09e03e626eaf0c2f78f8d50.zip |
Bug 526730 - Autotools should not run autotool commands in the Container
- modify runCommand and runScript methods in AutotoolsNewMakeGenerator
class to take an ICommandLauncher to use
- modify AutotoolsNewMakeGenerator regenerateMakefile method to
pass a local CommandLauncher when running autotool commands, but
using one from the CommandLauncherManager when running configure
or config.status to do the configuration
- modify RemoteCommandLauncher to add a constructor that includes
the ICommandLauncher to use if the project is not remote
- fix AbstractAutotoolsHandler to use local CommandLauncher
Change-Id: Ib3f0deff3cca4b7b40459b5dd691d73dcbf2a87c
Signed-off-by: Jeff Johnston <jjohnstn@redhat.com>
Diffstat (limited to 'remote')
-rw-r--r-- | remote/org.eclipse.cdt.remote.core/src/org/eclipse/cdt/remote/core/RemoteCommandLauncher.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/remote/org.eclipse.cdt.remote.core/src/org/eclipse/cdt/remote/core/RemoteCommandLauncher.java b/remote/org.eclipse.cdt.remote.core/src/org/eclipse/cdt/remote/core/RemoteCommandLauncher.java index da2ee6f03f7..dc173e09501 100644 --- a/remote/org.eclipse.cdt.remote.core/src/org/eclipse/cdt/remote/core/RemoteCommandLauncher.java +++ b/remote/org.eclipse.cdt.remote.core/src/org/eclipse/cdt/remote/core/RemoteCommandLauncher.java @@ -104,12 +104,19 @@ public class RemoteCommandLauncher implements ICommandLauncher { return s; } - private ICommandLauncher fLocalLauncher = CommandLauncherManager.getInstance().getCommandLauncher(); + private ICommandLauncher fLocalLauncher; private boolean fShowCommand; private String[] fCommandArgs; private IRemoteConnection fConnection; private IRemoteProcess fRemoteProcess; private final Properties fEnvironment = new Properties(); + + public RemoteCommandLauncher() { + } + + public RemoteCommandLauncher(ICommandLauncher localLauncher) { + this.fLocalLauncher = localLauncher; + } /** * The number of milliseconds to pause between polling. @@ -135,7 +142,9 @@ public class RemoteCommandLauncher implements ICommandLauncher { localLauncher.setProject(getProject()); localLauncher.setErrorMessage(getErrorMessage()); usingLocalLauncher = false; - fLocalLauncher = localLauncher; + if (fLocalLauncher == null) { + fLocalLauncher = localLauncher; + } if (getProject() != null) { IRemoteResource remRes = (IRemoteResource) getProject().getAdapter(IRemoteResource.class); if (remRes != null) { |