mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
build changes
This commit is contained in:
parent
d0ea6cb06e
commit
04d90a4425
13 changed files with 72 additions and 46 deletions
|
@ -1,4 +1,4 @@
|
|||
source.cdebugcore.jar = src/
|
||||
source.cdtdebugcore.jar = src/
|
||||
bin.includes = plugin.xml,\
|
||||
plugin.properties,\
|
||||
about.html,\
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
pluginName=CDT Debug Model
|
||||
pluginName=C/C++ Development Tools Debug Model
|
||||
providerName=Eclipse.org
|
||||
|
||||
CDTDebugger.name=C/C++ Core Debugger Extension
|
||||
CDTDebugger.name=C/C++ Development Tools Core Debugger Extension
|
||||
|
|
|
@ -7,14 +7,13 @@
|
|||
class="org.eclipse.cdt.debug.core.CDebugCorePlugin">
|
||||
|
||||
<runtime>
|
||||
<library name="cdebugcore.jar">
|
||||
<library name="cdtdebugcore.jar">
|
||||
<export name="*"/>
|
||||
</library>
|
||||
</runtime>
|
||||
<requires>
|
||||
<import plugin="org.eclipse.core.resources"/>
|
||||
<import plugin="org.eclipse.debug.core"/>
|
||||
<import plugin="org.eclipse.cdt.core"/>
|
||||
</requires>
|
||||
|
||||
|
||||
|
|
|
@ -3,4 +3,4 @@ bin.includes = plugin.xml,\
|
|||
about.html,\
|
||||
*.jar
|
||||
src.includes = about.html
|
||||
source.micore.jar = src/
|
||||
source.cdtmicore.jar = src/
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
pluginName=GDB/MI CDI Debugger Core
|
||||
pluginName=C/C++ Development Tools GDB/MI CDI Debugger Core
|
||||
providerName=Eclipse.org
|
||||
|
||||
GDBDebugger.name=GDB Debugger
|
|
@ -7,7 +7,7 @@
|
|||
class="org.eclipse.cdt.debug.mi.core.MIPlugin">
|
||||
|
||||
<runtime>
|
||||
<library name="micore.jar">
|
||||
<library name="cdtmicore.jar">
|
||||
<export name="*"/>
|
||||
</library>
|
||||
</runtime>
|
||||
|
|
|
@ -4,4 +4,4 @@ bin.includes = plugin.xml,\
|
|||
*.jar,\
|
||||
icons/
|
||||
src.includes = about.html
|
||||
source.miui.jar = src/
|
||||
source.cdtmiui.jar = src/
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
pluginName=GDB/MI CDI Debugger UI
|
||||
pluginName=C/C++ Development Tools GDB/MI CDI Debugger UI
|
||||
providerName=Eclipse.org
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
class="org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin">
|
||||
|
||||
<runtime>
|
||||
<library name="miui.jar">
|
||||
<library name="cdtmiui.jar">
|
||||
<export name="*"/>
|
||||
</library>
|
||||
</runtime>
|
||||
|
|
|
@ -4,20 +4,18 @@
|
|||
*/
|
||||
package org.eclipse.cdt.debug.mi.internal.ui;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.ArrayList;
|
||||
import java.util.StringTokenizer;
|
||||
|
||||
import org.eclipse.cdt.debug.core.ICDebugConfiguration;
|
||||
import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants;
|
||||
import org.eclipse.cdt.debug.mi.core.IMILaunchConfigurationConstants;
|
||||
import org.eclipse.core.runtime.CoreException;
|
||||
import org.eclipse.debug.core.ILaunchConfiguration;
|
||||
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
|
||||
import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
|
||||
import org.eclipse.jface.preference.ListEditor;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.events.ModifyEvent;
|
||||
import org.eclipse.swt.events.ModifyListener;
|
||||
import org.eclipse.swt.events.SelectionAdapter;
|
||||
import org.eclipse.swt.events.SelectionEvent;
|
||||
import org.eclipse.swt.layout.GridData;
|
||||
import org.eclipse.swt.layout.GridLayout;
|
||||
import org.eclipse.swt.widgets.Button;
|
||||
|
@ -26,21 +24,23 @@ import org.eclipse.swt.widgets.Label;
|
|||
import org.eclipse.swt.widgets.Text;
|
||||
|
||||
public class CDebuggerPage extends AbstractLaunchConfigurationTab {
|
||||
protected Text fDebuggerCommandText;
|
||||
|
||||
protected static final Map EMPTY_MAP = new HashMap(1);
|
||||
protected Text fDebuggerCommandText;
|
||||
private Button fAutoSoLibButton;
|
||||
|
||||
public void createControl(Composite parent) {
|
||||
Composite comp = new Composite(parent, SWT.NONE);
|
||||
GridLayout topLayout = new GridLayout();
|
||||
topLayout.numColumns = 2;
|
||||
comp.setLayout(topLayout);
|
||||
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
|
||||
comp.setLayoutData(gd);
|
||||
setControl(comp);
|
||||
|
||||
createVerticalSpacer(comp, 2);
|
||||
|
||||
Label debugCommandLabel= new Label(comp, SWT.NONE);
|
||||
debugCommandLabel.setText("Debugger executable:");
|
||||
debugCommandLabel.setText("MI Debugger:");
|
||||
|
||||
fDebuggerCommandText= new Text(comp, SWT.SINGLE | SWT.BORDER);
|
||||
gd = new GridData(GridData.FILL_HORIZONTAL);
|
||||
|
@ -50,19 +50,51 @@ public class CDebuggerPage extends AbstractLaunchConfigurationTab {
|
|||
updateLaunchConfigurationDialog();
|
||||
}
|
||||
});
|
||||
fDebuggerCommandText.setText(getCommand());
|
||||
|
||||
setControl(comp);
|
||||
createVerticalSpacer(comp, 2);
|
||||
|
||||
fAutoSoLibButton = new Button(comp, SWT.CHECK ) ;
|
||||
fAutoSoLibButton.setText("Load shared library symbols automaticly");
|
||||
gd = new GridData();
|
||||
gd.horizontalSpan = 2;
|
||||
fAutoSoLibButton.setLayoutData(gd);
|
||||
|
||||
ListEditor listEditor = new ListEditor("1", "Shared library search paths:", comp) {
|
||||
protected String createList(String[] items) {
|
||||
StringBuffer buf = new StringBuffer();
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
buf.append(items[i]);
|
||||
buf.append(';');
|
||||
}
|
||||
return buf.toString();
|
||||
}
|
||||
protected String getNewInputObject() {
|
||||
// StringInputDialog dialog= new StringInputDialog(comp.getShell(), "Library Path", null, "Enter a library path", "", null);
|
||||
// if (dialog.open() == dialog.OK) {
|
||||
// return dialog.getValue();
|
||||
// } else {
|
||||
// return null;
|
||||
// }
|
||||
return null;
|
||||
}
|
||||
|
||||
protected String[] parseString(String list) {
|
||||
StringTokenizer st = new StringTokenizer(list, ";");
|
||||
ArrayList v = new ArrayList();
|
||||
while (st.hasMoreElements()) {
|
||||
v.add(st.nextElement());
|
||||
}
|
||||
return (String[]) v.toArray(new String[v.size()]);
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
||||
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
|
||||
Map attributeMap = new HashMap(1);
|
||||
// attributeMap.put(ATTR_DEBUGGER_COMMAND, getCommand());
|
||||
configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_SPECIFIC_ATTRS_MAP, attributeMap);
|
||||
}
|
||||
|
||||
private String getCommand() {
|
||||
return "gdb";
|
||||
configuration.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb");
|
||||
configuration.setAttribute(IMILaunchConfigurationConstants.ATTR_AUTO_SOLIB, false);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -81,27 +113,22 @@ public class CDebuggerPage extends AbstractLaunchConfigurationTab {
|
|||
}
|
||||
|
||||
public void initializeFrom(ILaunchConfiguration configuration) {
|
||||
String debuggerCommand= null;
|
||||
String debuggerCommand = "gdb";
|
||||
boolean autosolib = false;
|
||||
try {
|
||||
Map attributeMap = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_SPECIFIC_ATTRS_MAP, EMPTY_MAP);
|
||||
if (attributeMap != null) {
|
||||
// debuggerCommand = (String) attributeMap.get(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND);
|
||||
if (debuggerCommand == null) {
|
||||
debuggerCommand = getCommand();
|
||||
}
|
||||
}
|
||||
} catch(CoreException ce) {
|
||||
// JDIDebugUIPlugin.log(ce);
|
||||
debuggerCommand = configuration.getAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb");
|
||||
autosolib = configuration.getAttribute(IMILaunchConfigurationConstants.ATTR_AUTO_SOLIB, false);
|
||||
} catch (CoreException e) {
|
||||
}
|
||||
fDebuggerCommandText.setText(debuggerCommand);
|
||||
fAutoSoLibButton.setSelection(autosolib);
|
||||
}
|
||||
|
||||
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
|
||||
String debuggerCommand = fDebuggerCommandText.getText();
|
||||
Map attributeMap = new HashMap(1);
|
||||
// attributeMap.put(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_SPECIFIC_ATTRS_MAPVA_COMMAND, debuggerCommand);
|
||||
configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_SPECIFIC_ATTRS_MAP, attributeMap);
|
||||
|
||||
debuggerCommand.trim();
|
||||
configuration.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, debuggerCommand);
|
||||
configuration.setAttribute(IMILaunchConfigurationConstants.ATTR_AUTO_SOLIB, fAutoSoLibButton.getSelection());
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
|
|
|
@ -4,4 +4,4 @@ bin.includes = plugin.xml,\
|
|||
*.jar,\
|
||||
icons/
|
||||
src.includes = about.html
|
||||
source.cdebugui.jar = src/
|
||||
source.cdtdebuguii.jar = src/
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# All Rights Reserved.
|
||||
######################################################################
|
||||
|
||||
pluginName=CDT Debug UI
|
||||
pluginName=C/C++ Development Tools Debugger UI
|
||||
providerName=Eclipse.org
|
||||
|
||||
RegistersView.name=Registers
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
class="org.eclipse.cdt.debug.ui.CDebugUIPlugin">
|
||||
|
||||
<runtime>
|
||||
<library name="cdebugui.jar">
|
||||
<library name="cdtdebugui.jar">
|
||||
<export name="*"/>
|
||||
</library>
|
||||
</runtime>
|
||||
|
|
Loading…
Add table
Reference in a new issue