From 1f679cd95a30d6f7473feb33d50f4d4b03ebc435 Mon Sep 17 00:00:00 2001 From: steros Date: Mon, 13 May 2013 17:30:24 +0200 Subject: [PATCH] Update PHPToolExecutableLauncher.java https://github.com/PHPsrc/org.phpsrc.eclipse.pti.core/pull/1#issuecomment-15315031 fixes: https://github.com/PHPsrc/PHP-Tool-Integration/issues/3 --- .../launching/PHPToolExecutableLauncher.java | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/org/phpsrc/eclipse/pti/core/launching/PHPToolExecutableLauncher.java b/src/org/phpsrc/eclipse/pti/core/launching/PHPToolExecutableLauncher.java index 0700c38..93d4a99 100644 --- a/src/org/phpsrc/eclipse/pti/core/launching/PHPToolExecutableLauncher.java +++ b/src/org/phpsrc/eclipse/pti/core/launching/PHPToolExecutableLauncher.java @@ -34,11 +34,14 @@ import org.eclipse.debug.ui.RefreshTab; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.php.debug.core.debugger.parameters.IDebugParametersKeys; +import org.eclipse.php.internal.core.PHPVersion; import org.eclipse.php.internal.debug.core.IPHPDebugConstants; import org.eclipse.php.internal.debug.core.PHPDebugCoreMessages; import org.eclipse.php.internal.debug.core.launching.PHPLaunch; import org.eclipse.php.internal.debug.core.launching.PHPLaunchUtilities; import org.eclipse.php.internal.debug.core.phpIni.PHPINIUtil; +import org.eclipse.php.internal.debug.core.preferences.PHPexeItem; +import org.eclipse.php.internal.debug.core.preferences.PHPexes; import org.eclipse.swt.widgets.Display; import org.phpsrc.eclipse.pti.core.PHPToolCorePlugin; import org.phpsrc.eclipse.pti.core.listener.IOutputListener; @@ -110,10 +113,19 @@ public IProcess launch(ILaunchConfiguration configuration, ILaunch launch, String[] args = PHPLaunchUtilities.getProgramArguments(launch .getLaunchConfiguration()); - String[] cmdLine = PHPLaunchUtilities.getCommandLine( - launch.getLaunchConfiguration(), - OperatingSystem.escapePHPFileArg(phpExeString), phpConfigDir, - OperatingSystem.escapeShellFileArg(fileName), args); + String phpV = null; + PHPexeItem[] items = PHPexes.getInstance().getAllItems(); + for (PHPexeItem item : items) { + if (item.getExecutable().equals(phpExeFile)) { + phpV = item.getVersion(); + break; + } + } + + String[] cmdLine = PHPLaunchUtilities.getCommandLine( + launch.getLaunchConfiguration(), + OperatingSystem.escapePHPFileArg(phpExeString), phpConfigDir, + OperatingSystem.escapeShellFileArg(fileName), args, phpV); // remove unwanted -n argument ArrayList newCmdLineList = new ArrayList(cmdLine.length); @@ -252,4 +264,4 @@ public void addOutputListener(IOutputListener listener) { public void removeOutputListener(IOutputListener listener) { outputListenerList.remove(listener); } -} +}