# HG changeset patch # User wpaul # Date 1248299746 18000 # Node ID 8addaa0ffc18d4f194fa397960491d05fd8c692f # Parent 6dbcc7b15903bf47f7eca46000cab2b432659476 fixed location of debugger directory for debug builds (no change for regular Carbide release builds). diff -r 6dbcc7b15903 -r 8addaa0ffc18 connectivity/com.nokia.tcf/src/com/nokia/tcf/Activator.java --- a/connectivity/com.nokia.tcf/src/com/nokia/tcf/Activator.java Wed Jul 22 12:23:32 2009 -0500 +++ b/connectivity/com.nokia.tcf/src/com/nokia/tcf/Activator.java Wed Jul 22 16:55:46 2009 -0500 @@ -23,7 +23,6 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; -import org.eclipse.osgi.service.datalocation.Location; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -62,18 +61,7 @@ String pluginFilePath = pluginURL.getFile(); Path pluginPath = new Path(pluginFilePath); - Location installLocation = Platform.getInstallLocation(); - URL installURL = installLocation.getURL(); - String installFilePath = installURL.getFile(); - Path installPath = new Path(installFilePath); - - if (installPath.isPrefixOf(pluginPath)) { // Release build - debuggerPath = pluginPath.append("Debugger"); //$NON-NLS-1$ - } else { // Debug build - IPath basePath = pluginPath.removeLastSegments(3); - debuggerPath = basePath - .append("ide").append("Output").append("IDEDebug"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } + debuggerPath = pluginPath.append("Debugger"); //$NON-NLS-1$ } TCAPIConnection api = new TCAPIConnection(); long err = api.nativeStartServer();