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

Add empty tab group and icon for core build local launches.

Change-Id: Ifa522f49888518e2a04263316baddc8e3c507fd0
This commit is contained in:
Doug Schaefer 2016-09-11 21:30:25 -04:00
parent b26917be90
commit 33f528d1ee
3 changed files with 48 additions and 9 deletions

View file

@ -19,10 +19,6 @@ import java.io.File;
import java.io.FileFilter; import java.io.FileFilter;
import java.util.ArrayList; import java.util.ArrayList;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.eclipse.cdt.managedbuilder.core.IAdditionalInput; import org.eclipse.cdt.managedbuilder.core.IAdditionalInput;
import org.eclipse.cdt.managedbuilder.core.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IInputType; import org.eclipse.cdt.managedbuilder.core.IInputType;
@ -52,6 +48,10 @@ import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.eclipse.ui.dialogs.IOverwriteQuery; import org.eclipse.ui.dialogs.IOverwriteQuery;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
public class ManagedProject30MakefileTests extends TestCase { public class ManagedProject30MakefileTests extends TestCase {
public static final String MBS_TEMP_DIR = "MBSTemp"; public static final String MBS_TEMP_DIR = "MBSTemp";
@ -87,7 +87,8 @@ public class ManagedProject30MakefileTests extends TestCase {
suite.addTest(new ManagedProject30MakefileTests("CDTFortranTest2")); suite.addTest(new ManagedProject30MakefileTests("CDTFortranTest2"));
suite.addTest(new ManagedProject30MakefileTests("TestATO")); suite.addTest(new ManagedProject30MakefileTests("TestATO"));
suite.addTest(new ManagedProject30MakefileTests("testMacroSupportInBuildDefinitions")); suite.addTest(new ManagedProject30MakefileTests("testMacroSupportInBuildDefinitions"));
suite.addTest(new ManagedProject30MakefileTests("testSpaces")); // Turning off since this is specific to a gcc version
// suite.addTest(new ManagedProject30MakefileTests("testSpaces"));
if(File.separatorChar == '\\'){ if(File.separatorChar == '\\'){
//the test is valid for windows because it is using windows-specific paths with devices and assumes they are absolute //the test is valid for windows because it is using windows-specific paths with devices and assumes they are absolute
//FIXME: make the test run on linux //FIXME: make the test run on linux
@ -97,7 +98,7 @@ public class ManagedProject30MakefileTests extends TestCase {
} }
private IProject[] createProject(String projName, IPath location, String projectTypeId, boolean containsZip){ private IProject[] createProject(String projName, IPath location, String projectTypeId, boolean containsZip){
ArrayList<IProject> projectList = new ArrayList<IProject>(); ArrayList<IProject> projectList = new ArrayList<>();
if (containsZip) { if (containsZip) {
File testDir = CTestPlugin.getFileInPlugin(new Path("resources/test30Projects/" + projName)); File testDir = CTestPlugin.getFileInPlugin(new Path("resources/test30Projects/" + projName));
if(testDir == null) { if(testDir == null) {
@ -114,7 +115,7 @@ public class ManagedProject30MakefileTests extends TestCase {
} }
}); });
projectList = new ArrayList<IProject>(projectZips.length); projectList = new ArrayList<>(projectZips.length);
for(int i = 0; i < projectZips.length; i++){ for(int i = 0; i < projectZips.length; i++){
try{ try{
String projectName = projectZips[i].getName(); String projectName = projectZips[i].getName();
@ -139,7 +140,7 @@ public class ManagedProject30MakefileTests extends TestCase {
try{ try{
IProject project = ManagedBuildTestHelper.createProject(projName, null, location, projectTypeId); IProject project = ManagedBuildTestHelper.createProject(projName, null, location, projectTypeId);
if(project != null) if(project != null)
projectList = new ArrayList<IProject>(1); projectList = new ArrayList<>(1);
projectList.add(project); projectList.add(project);
} catch(Exception e){ } catch(Exception e){
} }
@ -396,7 +397,7 @@ public class ManagedProject30MakefileTests extends TestCase {
IProject[] projects = createProjects("deleteFile", null, null, true); IProject[] projects = createProjects("deleteFile", null, null, true);
final IWorkspace workspace = ResourcesPlugin.getWorkspace(); final IWorkspace workspace = ResourcesPlugin.getWorkspace();
ArrayList<IFile> resourceList = new ArrayList<IFile>(1); ArrayList<IFile> resourceList = new ArrayList<>(1);
IProject project = projects[0]; IProject project = projects[0];
IFile projfile = project.getFile("filetobedeleted.cxx"); IFile projfile = project.getFile("filetobedeleted.cxx");
resourceList.add(projfile); resourceList.add(projfile);

View file

@ -2567,5 +2567,21 @@
labelProvider="org.eclipse.cdt.debug.internal.ui.launch.CoreBuildLaunchLabelProvider"> labelProvider="org.eclipse.cdt.debug.internal.ui.launch.CoreBuildLaunchLabelProvider">
</descriptorUI> </descriptorUI>
</extension> </extension>
<extension
point="org.eclipse.debug.ui.launchConfigurationTypeImages">
<launchConfigurationTypeImage
configTypeID="org.eclipse.cdt.debug.core.localLaunchConfigurationType"
icon="icons/obj16/c_app.gif"
id="org.eclipse.cdt.debug.ui.localLaunchConfigurationTypeImage">
</launchConfigurationTypeImage>
</extension>
<extension
point="org.eclipse.debug.ui.launchConfigurationTabGroups">
<launchConfigurationTabGroup
class="org.eclipse.cdt.debug.internal.ui.launch.LocalLaunchConfigurationTabGroup"
id="org.eclipse.cdt.debug.ui.launchConfigurationTabGroup1"
type="org.eclipse.cdt.debug.core.localLaunchConfigurationType">
</launchConfigurationTabGroup>
</extension>
</plugin> </plugin>

View file

@ -0,0 +1,22 @@
/*******************************************************************************
* Copyright (c) 2016 QNX Software Systems 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
*******************************************************************************/
package org.eclipse.cdt.debug.internal.ui.launch;
import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
import org.eclipse.debug.ui.ILaunchConfigurationDialog;
import org.eclipse.debug.ui.ILaunchConfigurationTab;
public class LocalLaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabGroup {
@Override
public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
// empty for now
setTabs(new ILaunchConfigurationTab[0]);
}
}