mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 18:56:02 +02:00
Code Issues Wiki Activity

Merge remote-tracking branch 'cdt/master' into sd90

Browse source
This commit is contained in:
Andrew Gvozdev 2012-04-12 01:31:33 -04:00
commit 2aadaa0262
5 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build/org.eclipse.cdt.autotools.core/ChangeLog
View file

@ -1,3 +1,10 @@
2012-04-11 Jeff Johnston <jjohnstn@redhat.com>
Bug #375007 fix from Anna Dushistova
* src/org/eclipse.cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java
(getConfigurePath): If configure command is specified as absolute
path, just use it.
2012-03-30 Jeff Johnston <jjohnstn@redhat.com>
Bug #371277

18
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java
View file

@ -1,12 +1,13 @@
/*******************************************************************************
* Copyright (c) 2009 Red Hat Inc..
* Copyright (c) 2009, 2012 Red Hat Inc.and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Red Hat Incorporated - initial API and implementation
* Red Hat Incorporated - initial API and implementation
* Anna Dushistova (MontaVista)- [375007] [autotools] allow absolute paths for configure scripts
*******************************************************************************/
package org.eclipse.cdt.internal.autotools.core;
@ -753,10 +754,15 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
for (int i = 1; i < tokens.length; ++i)
cmdParms.add(tokens[i]);
}
if (srcDir.equals(""))
configPath = project.getLocation().append(command);
else
configPath = project.getLocation().append(srcDir).append(command);
if (Path.fromOSString(command).isAbsolute()) {
configPath = new Path(command);
} else {
if (srcDir.equals(""))
configPath = project.getLocation().append(command);
else
configPath = project.getLocation().append(srcDir)
.append(command);
}
return configPath;
}

2
debug/org.eclipse.cdt.debug.ui/plugin.properties
View file

@ -35,7 +35,7 @@ ToggleInstructionStepModeAction.tooltip=Instruction Stepping Mode
ShowDebuggerConsoleAction.label=Show Debugger Console
ShowDebuggerConsoleAction.tooltip=Show Debugger Console On Target Selection
AddBreakpoint.label=Toggle &Breakpoint\tDouble Click
AddBreakpoint.label=Toggle Brea&kpoint
AddBreakpointInteractive.label=&Add Breakpoint...\tCtrl+Double Click
EnableBreakpoint.label=&Toggle Breakpoint Enabled\tShift+Double Click
BreakpointProperties.label=Breakpoint P&roperties...

2
debug/org.eclipse.cdt.debug.ui/plugin.xml
View file

@ -450,6 +450,7 @@
label="%AddBreakpoint.label"
helpContextId="manage_breakpoint_action_context"
class="org.eclipse.cdt.debug.internal.ui.actions.breakpoints.CRulerToggleBreakpointActionDelegate"
definitionId="org.eclipse.debug.ui.commands.ToggleBreakpoint"
menubarPath="debug"
id="org.eclipse.cdt.debug.ui.actions.RulerToggleBreakpointAction">
</action>
@ -528,6 +529,7 @@
label="%AddBreakpoint.label"
helpContextId="manage_breakpoint_action_context"
class="org.eclipse.cdt.debug.internal.ui.actions.breakpoints.CRulerToggleBreakpointActionDelegate"
definitionId="org.eclipse.debug.ui.commands.ToggleBreakpoint"
menubarPath="debug"
id="org.eclipse.cdt.debug.ui.actions.asm.RulerToggleBreakpointAction">
</action>

2
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ActionMessages.properties
View file

@ -132,4 +132,4 @@ RetargetResumeAtLineAction.0=The operation is unavailable on the current selecti
CAddBreakpointInteractiveRulerAction_label=&Add Breakpoint...\tCtrl+Double Click
CAddBreakpointInteractiveRulerAction_error_title=Error
CAddBreakpointInteractiveRulerAction_error_message=Unable to create breakpoint
CRulerToggleBreakpointActionDelegate_label=Toggle Brea&kpoint\tDouble Click
CRulerToggleBreakpointActionDelegate_label=Toggle Brea&kpoint