mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-31 21:05:37 +02:00
Code Issues Wiki Activity

Patch for Sean Evoy:

Browse source 
- Move the managed builder to it's own plugins and feature.
This commit is contained in:
Doug Schaefer 2003-09-15 20:44:43 +00:00
parent c96f650a35
commit d18851f2d7
95 changed files with 2759 additions and 2372 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
build/org.eclipse.cdt.managedbuilder.core/.classpath Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="/org.apache.xerces"/>
<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
<classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
<classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
<classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
<classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
<classpathentry kind="src" path="/org.eclipse.core.resources"/>
<classpathentry kind="src" path="/org.eclipse.core.runtime"/>
<classpathentry kind="src" path="/org.eclipse.core.boot"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>

1
build/org.eclipse.cdt.managedbuilder.core/.cvsignore Normal file
View file

@ -0,0 +1 @@
bin

37
build/org.eclipse.cdt.managedbuilder.core/.project Normal file
View file

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.cdt.managedbuilder.core</name>
<comment></comment>
<projects>
<project>org.apache.xerces</project>
<project>org.eclipse.cdt.core</project>
<project>org.eclipse.cdt.core.linux</project>
<project>org.eclipse.cdt.core.qnx</project>
<project>org.eclipse.cdt.core.solaris</project>
<project>org.eclipse.cdt.core.win32</project>
<project>org.eclipse.core.boot</project>
<project>org.eclipse.core.resources</project>
<project>org.eclipse.core.runtime</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
</natures>
</projectDescription>

10
build/org.eclipse.cdt.managedbuilder.core/ChangeLog Normal file
View file

@ -0,0 +1,10 @@
2003-09-15 Sean Evoy
First submission of code to new project. Moved the managed builder
source code out of the cdt.core project. This includes the code to
implement the build model, along with the shema and extension point
declaration. Moved the builder, scnanaer info provider and managed
nature definitions into the package as well.
There are 2 new classes to handle the externalized strings:
* src/org/eclipse/cdt/managedbuilder/core/ManagedBuilderCorePlugin.java
* src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties

30
build/org.eclipse.cdt.managedbuilder.core/about.html Normal file
View file

@ -0,0 +1,30 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
<html>
<head>
<title>About</title>
<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
<p>10th July, 2002</p>
<h3>License</h3>
<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
Common Public License Version 1.0 (&quot;CPL&quot;). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
<h3>Contributions</h3>
<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
to others under the terms of the Other License. In addition, with regard to Modifications for which you are the copyright holder, you are also
providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
the CPL.</p>
</body>
</html>

1
build/org.eclipse.cdt.managedbuilder.core/build.properties Normal file
View file

@ -0,0 +1 @@
source.New\ Library = src/

2
build/org.eclipse.cdt.managedbuilder.core/plugin.properties Normal file
View file

@ -0,0 +1,2 @@
pluginName=C/C++ Managed Builder Core
providerName=Eclipse.org

68
build/org.eclipse.cdt.managedbuilder.core/plugin.xml Normal file
View file

@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin
id="org.eclipse.cdt.managedbuilder.core"
name="%pluginName"
version="1.0.0"
provider-name="%providerName"
class="org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin">
<runtime>
<library name="mngbuildcore.jar"/>
</runtime>
<requires>
<import plugin="org.apache.xerces"/>
<import plugin="org.eclipse.cdt.core"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.core.runtime"/>
</requires>
<extension-point id="ManagedBuildInfo" name="Managed Build Tools" schema="schema/ManagedBuildTools.exsd"/>
<!-- =================================================================================== -->
<!-- Extension Point: IScannerInfoProvider for the managed Builder -->
<!-- =================================================================================== -->
<extension
id="ManagedBuildManager"
point="org.eclipse.cdt.core.ScannerInfoProvider">
<cextension>
<run
class="org.eclipse.cdt.managedbuilder.core.ManagedBuildManager">
</run>
</cextension>
</extension>
<!-- =================================================================================== -->
<!-- Extension Point: Makefile Generation Builder -->
<!-- =================================================================================== -->
<extension
id="genmakebuilder"
name="%GeneratedMakefileCBuilder.name"
point="org.eclipse.core.resources.builders">
<builder
hasNature="true">
<run
class="org.eclipse.cdt.managedbuilder.internal.core.GeneratedMakefileBuilder">
</run>
</builder>
</extension>
<!-- =================================================================================== -->
<!-- Extension Point: Managed Build Project Nature -->
<!-- =================================================================================== -->
<extension
id="managedBuildNature"
name="%ManagedBuildNature.name"
point="org.eclipse.core.resources.natures">
<requires-nature
id="org.eclipse.cdt.core.cnature">
</requires-nature>
<runtime>
<run
class="org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature">
</run>
</runtime>
<builder
id="org.eclipse.cdt.managedbuilder.core.genmakebuilder">
</builder>
</extension>
</plugin>

0
core/org.eclipse.cdt.core/schema/ManagedBuildTools.exsd → build/org.eclipse.cdt.managedbuilder.core/schema/ManagedBuildTools.exsd
View file

19
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/BuildException.java Normal file
View file

@ -0,0 +1,19 @@
/**********************************************************************
* Copyright (c) 2003 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v10.html
*
* Contributors:
* IBM - Initial API and implementation
**********************************************************************/
package org.eclipse.cdt.managedbuilder.core;
public class BuildException extends Exception {
public BuildException(String msg) {
super(msg);
}
}

2
core/org.eclipse.cdt.core/build/org/eclipse/cdt/core/build/managed/IBuildObject.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IBuildObject.java
View file

@ -8,7 +8,7 @@
* Contributors: * Contributors:
* IBM - Initial API and implementation * IBM - Initial API and implementation
**********************************************************************/ **********************************************************************/
package org.eclipse.cdt.core.build.managed; package org.eclipse.cdt.managedbuilder.core;
public interface IBuildObject { public interface IBuildObject {
// Schema element names // Schema element names

2
core/org.eclipse.cdt.core/build/org/eclipse/cdt/core/build/managed/IConfiguration.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IConfiguration.java
View file

@ -8,7 +8,7 @@
* Contributors: * Contributors:
* IBM - Initial API and implementation * IBM - Initial API and implementation
**********************************************************************/ **********************************************************************/
package org.eclipse.cdt.core.build.managed; package org.eclipse.cdt.managedbuilder.core;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;

2
core/org.eclipse.cdt.core/build/org/eclipse/cdt/core/build/managed/IManagedBuildInfo.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IManagedBuildInfo.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.core.build.managed; package org.eclipse.cdt.managedbuilder.core;
import java.util.List; import java.util.List;

2
core/org.eclipse.cdt.core/build/org/eclipse/cdt/core/build/managed/IOption.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IOption.java
View file

@ -8,7 +8,7 @@
* Contributors: * Contributors:
* IBM - Initial API and implementation * IBM - Initial API and implementation
**********************************************************************/ **********************************************************************/
package org.eclipse.cdt.core.build.managed; package org.eclipse.cdt.managedbuilder.core;
/** /**
* *

2
core/org.eclipse.cdt.core/build/org/eclipse/cdt/core/build/managed/IOptionCategory.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IOptionCategory.java
View file

@ -8,7 +8,7 @@
* Contributors: * Contributors:
* IBM - Initial API and implementation * IBM - Initial API and implementation
**********************************************************************/ **********************************************************************/
package org.eclipse.cdt.core.build.managed; package org.eclipse.cdt.managedbuilder.core;
/** /**
* *

2
core/org.eclipse.cdt.core/build/org/eclipse/cdt/core/build/managed/ITarget.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ITarget.java
View file

@ -8,7 +8,7 @@
* Contributors: * Contributors:
* IBM - Initial API and implementation * IBM - Initial API and implementation
**********************************************************************/ **********************************************************************/
package org.eclipse.cdt.core.build.managed; package org.eclipse.cdt.managedbuilder.core;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;

2
core/org.eclipse.cdt.core/build/org/eclipse/cdt/core/build/managed/ITool.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ITool.java
View file

@ -8,7 +8,7 @@
* Contributors: * Contributors:
* IBM - Initial API and implementation * IBM - Initial API and implementation
**********************************************************************/ **********************************************************************/
package org.eclipse.cdt.core.build.managed; package org.eclipse.cdt.managedbuilder.core;
/** /**
* *

22
core/org.eclipse.cdt.core/build/org/eclipse/cdt/core/build/managed/ManagedBuildManager.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
View file

@ -8,7 +8,7 @@
* Contributors: * Contributors:
* IBM - Initial API and implementation * IBM - Initial API and implementation
**********************************************************************/ **********************************************************************/
package org.eclipse.cdt.core.build.managed; package org.eclipse.cdt.managedbuilder.core;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@ -29,11 +29,10 @@ import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.Serializer; import org.apache.xml.serialize.Serializer;
import org.apache.xml.serialize.SerializerFactory; import org.apache.xml.serialize.SerializerFactory;
import org.eclipse.cdt.core.AbstractCExtension; import org.eclipse.cdt.core.AbstractCExtension;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.parser.*; import org.eclipse.cdt.core.parser.*;
import org.eclipse.cdt.internal.core.build.managed.Configuration; import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
import org.eclipse.cdt.internal.core.build.managed.ManagedBuildInfo; import org.eclipse.cdt.managedbuilder.internal.core.ManagedBuildInfo;
import org.eclipse.cdt.internal.core.build.managed.Target; import org.eclipse.cdt.managedbuilder.internal.core.Target;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
@ -52,11 +51,11 @@ import org.w3c.dom.Node;
*/ */
public class ManagedBuildManager extends AbstractCExtension implements IScannerInfoProvider { public class ManagedBuildManager extends AbstractCExtension implements IScannerInfoProvider {
private static final QualifiedName buildInfoProperty = new QualifiedName(CCorePlugin.PLUGIN_ID, "managedBuildInfo"); private static final QualifiedName buildInfoProperty = new QualifiedName(ManagedBuilderCorePlugin.getUniqueIdentifier(), "managedBuildInfo");
private static final String ROOT_ELEM_NAME = "ManagedProjectBuildInfo"; //$NON-NLS-1$ private static final String ROOT_ELEM_NAME = "ManagedProjectBuildInfo"; //$NON-NLS-1$
private static final String FILE_NAME = ".cdtbuild"; //$NON-NLS-1$ private static final String FILE_NAME = ".cdtbuild"; //$NON-NLS-1$
private static final ITarget[] emptyTargets = new ITarget[0]; private static final ITarget[] emptyTargets = new ITarget[0];
public static final String INTERFACE_IDENTITY = CCorePlugin.PLUGIN_ID + "." + "ManagedBuildManager"; //$NON-NLS-1$ public static final String INTERFACE_IDENTITY = ManagedBuilderCorePlugin.getUniqueIdentifier() + "." + "ManagedBuildManager"; //$NON-NLS-1$
public static final String EXTENSION_POINT_ID = "ManagedBuildInfo"; //$NON-NLS-1$ public static final String EXTENSION_POINT_ID = "ManagedBuildInfo"; //$NON-NLS-1$
// Targets defined by extensions (i.e., not associated with a resource) // Targets defined by extensions (i.e., not associated with a resource)
@ -83,8 +82,9 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI
// To Do // To Do
// Create the array and copy the elements over // Create the array and copy the elements over
int size = extensionTargets.size() int size = extensionTargets != null ?
+ (definedTargets != null ? definedTargets.size() : 0); extensionTargets.size() + (definedTargets != null ? definedTargets.size() : 0) :
0;
ITarget[] targets = new ITarget[size]; ITarget[] targets = new ITarget[size];
@ -340,7 +340,7 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI
ITarget parentTarget = parentConfig.getTarget(); ITarget parentTarget = parentConfig.getTarget();
// Get the extension point information // Get the extension point information
IExtensionPoint extensionPoint = CCorePlugin.getDefault().getDescriptor().getExtensionPoint(EXTENSION_POINT_ID); IExtensionPoint extensionPoint = ManagedBuilderCorePlugin.getDefault().getDescriptor().getExtensionPoint(EXTENSION_POINT_ID);
IExtension[] extensions = extensionPoint.getExtensions(); IExtension[] extensions = extensionPoint.getExtensions();
for (int i = 0; i < extensions.length; ++i) { for (int i = 0; i < extensions.length; ++i) {
IExtension extension = extensions[i]; IExtension extension = extensions[i];
@ -402,7 +402,7 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI
return; return;
extensionTargetsLoaded = true; extensionTargetsLoaded = true;
IExtensionPoint extensionPoint = CCorePlugin.getDefault().getDescriptor().getExtensionPoint(EXTENSION_POINT_ID); IExtensionPoint extensionPoint = ManagedBuilderCorePlugin.getDefault().getDescriptor().getExtensionPoint(EXTENSION_POINT_ID);
IExtension[] extensions = extensionPoint.getExtensions(); IExtension[] extensions = extensionPoint.getExtensions();
for (int i = 0; i < extensions.length; ++i) { for (int i = 0; i < extensions.length; ++i) {
IExtension extension = extensions[i]; IExtension extension = extensions[i];

80
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuilderCorePlugin.java Normal file
View file

@ -0,0 +1,80 @@
package org.eclipse.cdt.managedbuilder.core;
/**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v0.5
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v05.html
*
* Contributors:
* IBM Rational Software - Initial API and implementation
* **********************************************************************/
import java.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import org.eclipse.core.runtime.IPluginDescriptor;
import org.eclipse.core.runtime.Plugin;
public class ManagedBuilderCorePlugin extends Plugin {
//The shared instance.
private static ManagedBuilderCorePlugin plugin;
//Resource bundle.
private static ResourceBundle resourceBundle;
/**
* @param descriptor
*/
public ManagedBuilderCorePlugin(IPluginDescriptor descriptor) {
super(descriptor);
plugin = this;
try {
resourceBundle = ResourceBundle.getBundle("org.eclipse.cdt.managedbuilder.internal.core.PluginResources"); //$NON-NLS-1$
} catch (MissingResourceException x) {
resourceBundle = null;
}
}
/**
* Returns the shared instance.
*/
public static ManagedBuilderCorePlugin getDefault() {
return plugin;
}
public static String getResourceString(String key) {
try {
return resourceBundle.getString(key);
} catch (MissingResourceException e) {
return "!" + key + "!";
} catch (NullPointerException e) {
return "#" + key + "#";
}
}
public static String getFormattedString(String key, String arg) {
return MessageFormat.format(getResourceString(key), new String[] { arg });
}
public static String getFormattedString(String key, String[] args) {
return MessageFormat.format(getResourceString(key), args);
}
/**
* Convenience method which returns the unique identifier of this plugin.
*/
public static String getUniqueIdentifier() {
if (getDefault() == null) {
// If the default instance is not yet initialized,
// return a static identifier. This identifier must
// match the plugin id defined in plugin.xml
return "org.eclipse.cdt.managedbuilder.core"; //$NON-NLS-1$
}
return getDefault().getDescriptor().getUniqueIdentifier();
}
}

10
core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ManagedCProjectNature.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedCProjectNature.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.core; package org.eclipse.cdt.managedbuilder.core;
/********************************************************************** /**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others. * Copyright (c) 2002,2003 Rational Software Corporation and others.
@ -26,9 +26,9 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Plugin;
public class ManagedCProjectNature implements IProjectNature { public class ManagedCProjectNature implements IProjectNature {
public static final String BUILDER_NAME= "genmakebuilder"; public static final String BUILDER_NAME = "genmakebuilder";
public static final String BUILDER_ID= CCorePlugin.PLUGIN_ID + "." + BUILDER_NAME; public static final String BUILDER_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + "." + BUILDER_NAME;
private static final String MNG_NATURE_ID = CCorePlugin.PLUGIN_ID + ".managedBuildNature"; private static final String MNG_NATURE_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + ".managedBuildNature";
private IProject project; private IProject project;
/** /**
@ -109,7 +109,7 @@ public class ManagedCProjectNature implements IProjectNature {
* Get the correct builderID * Get the correct builderID
*/ */
public static String getBuilderID() { public static String getBuilderID() {
Plugin plugin = (Plugin)CCorePlugin.getDefault(); Plugin plugin = (Plugin)ManagedBuilderCorePlugin.getDefault();
IPluginDescriptor descriptor = plugin.getDescriptor(); IPluginDescriptor descriptor = plugin.getDescriptor();
if (descriptor.getExtension(BUILDER_NAME) != null) { if (descriptor.getExtension(BUILDER_NAME) != null) {
return descriptor.getUniqueIdentifier() + "." + BUILDER_NAME; return descriptor.getUniqueIdentifier() + "." + BUILDER_NAME;

27
core/org.eclipse.cdt.core/build/org/eclipse/cdt/internal/core/build/managed/BuildObject.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuildObject.java
View file

@ -1,19 +1,18 @@
/* package org.eclipse.cdt.managedbuilder.internal.core;
* Created on Apr 9, 2003
*
* To change the template for this generated file go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
package org.eclipse.cdt.internal.core.build.managed;
import org.eclipse.cdt.core.build.managed.IBuildObject; /**********************************************************************
* Copyright (c) 2003 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v10.html
*
* Contributors:
* IBM - Initial API and implementation
**********************************************************************/
import org.eclipse.cdt.managedbuilder.core.IBuildObject;
/**
* @author dschaefe
*
* To change the template for this generated type comment go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
public class BuildObject implements IBuildObject { public class BuildObject implements IBuildObject {
protected String id; protected String id;

12
core/org.eclipse.cdt.core/build/org/eclipse/cdt/internal/core/build/managed/Configuration.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
View file

@ -8,17 +8,17 @@
* Contributors: * Contributors:
* IBM - Initial API and implementation * IBM - Initial API and implementation
**********************************************************************/ **********************************************************************/
package org.eclipse.cdt.internal.core.build.managed; package org.eclipse.cdt.managedbuilder.internal.core;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import org.eclipse.cdt.core.build.managed.BuildException; import org.eclipse.cdt.managedbuilder.core.BuildException;
import org.eclipse.cdt.core.build.managed.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.core.build.managed.IOption; import org.eclipse.cdt.managedbuilder.core.IOption;
import org.eclipse.cdt.core.build.managed.ITarget; import org.eclipse.cdt.managedbuilder.core.ITarget;
import org.eclipse.cdt.core.build.managed.ITool; import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IConfigurationElement;
import org.w3c.dom.Document; import org.w3c.dom.Document;

19
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/GeneratedMakefileBuilder.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.internal.core; package org.eclipse.cdt.managedbuilder.internal.core;
/********************************************************************** /**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others. * Copyright (c) 2002,2003 Rational Software Corporation and others.
@ -24,8 +24,9 @@ import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.CommandLauncher; import org.eclipse.cdt.core.CommandLauncher;
import org.eclipse.cdt.core.ConsoleOutputStream; import org.eclipse.cdt.core.ConsoleOutputStream;
import org.eclipse.cdt.core.ErrorParserManager; import org.eclipse.cdt.core.ErrorParserManager;
import org.eclipse.cdt.core.build.managed.IManagedBuildInfo; import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
import org.eclipse.cdt.core.build.managed.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
import org.eclipse.cdt.core.model.ICModelMarker; import org.eclipse.cdt.core.model.ICModelMarker;
import org.eclipse.cdt.core.resources.ACBuilder; import org.eclipse.cdt.core.resources.ACBuilder;
import org.eclipse.cdt.core.resources.IConsole; import org.eclipse.cdt.core.resources.IConsole;
@ -93,7 +94,7 @@ public class GeneratedMakefileBuilder extends ACBuilder {
* @see org.eclipse.core.internal.events.InternalBuilder#build(int, java.util.Map, org.eclipse.core.runtime.IProgressMonitor) * @see org.eclipse.core.internal.events.InternalBuilder#build(int, java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
*/ */
protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException { protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException {
String statusMsg = CCorePlugin.getFormattedString(START, getProject().getName()); String statusMsg = ManagedBuilderCorePlugin.getFormattedString(START, getProject().getName());
if (statusMsg != null) { if (statusMsg != null) {
monitor.subTask(statusMsg); monitor.subTask(statusMsg);
} }
@ -170,7 +171,7 @@ public class GeneratedMakefileBuilder extends ACBuilder {
} }
// Need to report status to the user // Need to report status to the user
String statusMsg = CCorePlugin.getFormattedString(REBUILD, currentProject.getName()); String statusMsg = ManagedBuilderCorePlugin.getFormattedString(REBUILD, currentProject.getName());
monitor.subTask(statusMsg); monitor.subTask(statusMsg);
// Regenerate the makefiles for this project // Regenerate the makefiles for this project
@ -256,7 +257,7 @@ public class GeneratedMakefileBuilder extends ACBuilder {
if (monitor == null) { if (monitor == null) {
monitor = new NullProgressMonitor(); monitor = new NullProgressMonitor();
} }
statusMsg = CCorePlugin.getFormattedString(INCREMENTAL, currentProject.getName()); statusMsg = ManagedBuilderCorePlugin.getFormattedString(INCREMENTAL, currentProject.getName());
monitor.subTask(statusMsg); monitor.subTask(statusMsg);
// Ask the makefile generator to generate any makefiles needed to build delta // Ask the makefile generator to generate any makefiles needed to build delta
@ -296,7 +297,7 @@ public class GeneratedMakefileBuilder extends ACBuilder {
String[] msgs = new String[2]; String[] msgs = new String[2];
msgs[0] = info.getMakeCommand(); msgs[0] = info.getMakeCommand();
msgs[1] = currentProject.getName(); msgs[1] = currentProject.getName();
String statusMsg = CCorePlugin.getFormattedString(MAKE, msgs); String statusMsg = ManagedBuilderCorePlugin.getFormattedString(MAKE, msgs);
if (statusMsg != null) { if (statusMsg != null) {
monitor.subTask(statusMsg); monitor.subTask(statusMsg);
} }
@ -384,14 +385,14 @@ public class GeneratedMakefileBuilder extends ACBuilder {
// Report either the success or failure of our mission // Report either the success or failure of our mission
StringBuffer buf = new StringBuffer(); StringBuffer buf = new StringBuffer();
if (errMsg != null && errMsg.length() > 0) { if (errMsg != null && errMsg.length() > 0) {
String errorDesc = CCorePlugin.getResourceString(BUILD_ERROR); String errorDesc = ManagedBuilderCorePlugin.getResourceString(BUILD_ERROR);
buf.append(errorDesc); buf.append(errorDesc);
buf.append(System.getProperty("line.separator", "\n")); buf.append(System.getProperty("line.separator", "\n"));
buf.append("(").append(errMsg).append(")"); buf.append("(").append(errMsg).append(")");
} }
else { else {
// Report a successful build // Report a successful build
String successMsg = CCorePlugin.getFormattedString(BUILD_FINISHED, currentProject.getName()); String successMsg = ManagedBuilderCorePlugin.getFormattedString(BUILD_FINISHED, currentProject.getName());
buf.append(successMsg); buf.append(successMsg);
buf.append(System.getProperty("line.separator", "\n")); buf.append(System.getProperty("line.separator", "\n"));
} }

27
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/MakefileGenerator.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/MakefileGenerator.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.internal.core; package org.eclipse.cdt.managedbuilder.internal.core;
/********************************************************************** /**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others. * Copyright (c) 2002,2003 Rational Software Corporation and others.
@ -17,9 +17,10 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.ListIterator; import java.util.ListIterator;
import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.build.managed.IManagedBuildInfo;
import org.eclipse.cdt.core.build.managed.ManagedBuildManager;
import org.eclipse.cdt.core.search.ICSearchConstants; import org.eclipse.cdt.core.search.ICSearchConstants;
import org.eclipse.cdt.internal.core.model.Util; import org.eclipse.cdt.internal.core.model.Util;
import org.eclipse.cdt.internal.core.sourcedependency.DependencyManager; import org.eclipse.cdt.internal.core.sourcedependency.DependencyManager;
@ -220,7 +221,7 @@ public class MakefileGenerator {
// Create the buffer to hold the output for the module and a dep calculator // Create the buffer to hold the output for the module and a dep calculator
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
buffer.append(CCorePlugin.getResourceString(AUTO_DEP) + NEWLINE); buffer.append(ManagedBuilderCorePlugin.getResourceString(AUTO_DEP) + NEWLINE);
DependencyManager dependencyManager = CCorePlugin.getDefault().getCoreModel().getDependencyManager(); DependencyManager dependencyManager = CCorePlugin.getDefault().getCoreModel().getDependencyManager();
/* /*
@ -278,7 +279,7 @@ public class MakefileGenerator {
buffer.append("RM := "); buffer.append("RM := ");
buffer.append(info.getCleanCommand() + NEWLINE + NEWLINE); buffer.append(info.getCleanCommand() + NEWLINE + NEWLINE);
buffer.append(CCorePlugin.getResourceString(SRC_LISTS) + NEWLINE); buffer.append(ManagedBuilderCorePlugin.getResourceString(SRC_LISTS) + NEWLINE);
buffer.append("C_SRCS := " + NEWLINE); buffer.append("C_SRCS := " + NEWLINE);
buffer.append("CC_SRCS := " + NEWLINE + NEWLINE); buffer.append("CC_SRCS := " + NEWLINE + NEWLINE);
@ -294,7 +295,7 @@ public class MakefileGenerator {
protected StringBuffer addModules() { protected StringBuffer addModules() {
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
// Add the comment // Add the comment
buffer.append(CCorePlugin.getResourceString(MOD_LIST) + NEWLINE); buffer.append(ManagedBuilderCorePlugin.getResourceString(MOD_LIST) + NEWLINE);
buffer.append("MODULES := " + LINEBREAK + NEWLINE); buffer.append("MODULES := " + LINEBREAK + NEWLINE);
// Get all the module names // Get all the module names
@ -312,7 +313,7 @@ public class MakefileGenerator {
// Now add the makefile instruction to include all the subdirectory makefile fragments // Now add the makefile instruction to include all the subdirectory makefile fragments
buffer.append(NEWLINE); buffer.append(NEWLINE);
buffer.append(CCorePlugin.getResourceString(MOD_INCL) + NEWLINE); buffer.append(ManagedBuilderCorePlugin.getResourceString(MOD_INCL) + NEWLINE);
buffer.append("include ${patsubst %, %/module.mk, $(MODULES)}" + NEWLINE); buffer.append("include ${patsubst %, %/module.mk, $(MODULES)}" + NEWLINE);
buffer.append(NEWLINE + NEWLINE); buffer.append(NEWLINE + NEWLINE);
@ -338,10 +339,10 @@ public class MakefileGenerator {
cBuffer.append("${addprefix $(ROOT)/" + relativePath + "," + LINEBREAK + NEWLINE); cBuffer.append("${addprefix $(ROOT)/" + relativePath + "," + LINEBREAK + NEWLINE);
StringBuffer ccBuffer = new StringBuffer("CC_SRCS += \\" + NEWLINE); StringBuffer ccBuffer = new StringBuffer("CC_SRCS += \\" + NEWLINE);
ccBuffer.append("${addprefix $(ROOT)/" + relativePath + "," + LINEBREAK + NEWLINE); ccBuffer.append("${addprefix $(ROOT)/" + relativePath + "," + LINEBREAK + NEWLINE);
StringBuffer ruleBuffer = new StringBuffer(CCorePlugin.getResourceString(MOD_RULES) + NEWLINE); StringBuffer ruleBuffer = new StringBuffer(ManagedBuilderCorePlugin.getResourceString(MOD_RULES) + NEWLINE);
// Put the comment in // Put the comment in
buffer.append(CCorePlugin.getResourceString(SRC_LISTS) + NEWLINE); buffer.append(ManagedBuilderCorePlugin.getResourceString(SRC_LISTS) + NEWLINE);
// Visit the resources in this folder // Visit the resources in this folder
IResource[] resources = module.members(); IResource[] resources = module.members();
@ -429,7 +430,7 @@ public class MakefileGenerator {
buffer.append(TAB + "$(RM)" + WHITESPACE + "${addprefix ., $(CC_SRCS:$(ROOT)%.cpp=%.o)} ${addprefix ., $(C_SRCS:$(ROOT)%.c=%.o)}" + WHITESPACE + outputPrefix + target + NEWLINE); buffer.append(TAB + "$(RM)" + WHITESPACE + "${addprefix ., $(CC_SRCS:$(ROOT)%.cpp=%.o)} ${addprefix ., $(C_SRCS:$(ROOT)%.c=%.o)}" + WHITESPACE + outputPrefix + target + NEWLINE);
buffer.append(NEWLINE); buffer.append(NEWLINE);
buffer.append(NEWLINE + CCorePlugin.getResourceString(DEP_INCL) + NEWLINE); buffer.append(NEWLINE + ManagedBuilderCorePlugin.getResourceString(DEP_INCL) + NEWLINE);
buffer.append("include ${patsubst %, %/module.dep, $(MODULES)}" + NEWLINE); buffer.append("include ${patsubst %, %/module.dep, $(MODULES)}" + NEWLINE);
buffer.append(NEWLINE); buffer.append(NEWLINE);
@ -550,7 +551,7 @@ public class MakefileGenerator {
// There may be nothing to regenerate and no content changes that require a rebuild // There may be nothing to regenerate and no content changes that require a rebuild
if (getModifiedList().isEmpty() && !shouldRunBuild()) { if (getModifiedList().isEmpty() && !shouldRunBuild()) {
// There is nothing to build // There is nothing to build
IStatus status = new Status(IStatus.INFO, CCorePlugin.PLUGIN_ID, GeneratedMakefileBuilder.EMPTY_PROJECT_BUILD_ERROR, "", null); IStatus status = new Status(IStatus.INFO, ManagedBuilderCorePlugin.getUniqueIdentifier(), GeneratedMakefileBuilder.EMPTY_PROJECT_BUILD_ERROR, "", null);
throw new CoreException(status); throw new CoreException(status);
} }
@ -562,7 +563,7 @@ public class MakefileGenerator {
project.accept(resourceVisitor, IResource.NONE); project.accept(resourceVisitor, IResource.NONE);
if (getSubdirList().isEmpty()) { if (getSubdirList().isEmpty()) {
// There is nothing to build (but we should never throw this exception) // There is nothing to build (but we should never throw this exception)
IStatus status = new Status(IStatus.INFO, CCorePlugin.PLUGIN_ID, GeneratedMakefileBuilder.EMPTY_PROJECT_BUILD_ERROR, "", null); IStatus status = new Status(IStatus.INFO, ManagedBuilderCorePlugin.getUniqueIdentifier(), GeneratedMakefileBuilder.EMPTY_PROJECT_BUILD_ERROR, "", null);
throw new CoreException(status); throw new CoreException(status);
} }
checkCancel(); checkCancel();
@ -788,7 +789,7 @@ public class MakefileGenerator {
project.accept(visitor, IResource.NONE); project.accept(visitor, IResource.NONE);
if (getSubdirList().isEmpty()) { if (getSubdirList().isEmpty()) {
// There is nothing to build // There is nothing to build
IStatus status = new Status(IStatus.INFO, CCorePlugin.PLUGIN_ID, GeneratedMakefileBuilder.EMPTY_PROJECT_BUILD_ERROR, "", null); IStatus status = new Status(IStatus.INFO, ManagedBuilderCorePlugin.getUniqueIdentifier(), GeneratedMakefileBuilder.EMPTY_PROJECT_BUILD_ERROR, "", null);
throw new CoreException(status); throw new CoreException(status);
} }

14
core/org.eclipse.cdt.core/build/org/eclipse/cdt/internal/core/build/managed/ManagedBuildInfo.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.internal.core.build.managed; package org.eclipse.cdt.managedbuilder.internal.core;
/********************************************************************** /**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others. * Copyright (c) 2002,2003 Rational Software Corporation and others.
@ -19,12 +19,12 @@ import java.util.List;
import java.util.ListIterator; import java.util.ListIterator;
import java.util.Map; import java.util.Map;
import org.eclipse.cdt.core.build.managed.BuildException; import org.eclipse.cdt.managedbuilder.core.BuildException;
import org.eclipse.cdt.core.build.managed.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.core.build.managed.IManagedBuildInfo; import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
import org.eclipse.cdt.core.build.managed.IOption; import org.eclipse.cdt.managedbuilder.core.IOption;
import org.eclipse.cdt.core.build.managed.ITarget; import org.eclipse.cdt.managedbuilder.core.ITarget;
import org.eclipse.cdt.core.build.managed.ITool; import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.cdt.core.parser.IScannerInfo; import org.eclipse.cdt.core.parser.IScannerInfo;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
import org.w3c.dom.Document; import org.w3c.dom.Document;

12
core/org.eclipse.cdt.core/build/org/eclipse/cdt/internal/core/build/managed/Option.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java
View file

@ -8,18 +8,18 @@
* Contributors: * Contributors:
* IBM - Initial API and implementation * IBM - Initial API and implementation
**********************************************************************/ **********************************************************************/
package org.eclipse.cdt.internal.core.build.managed; package org.eclipse.cdt.managedbuilder.internal.core;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.eclipse.cdt.core.build.managed.BuildException; import org.eclipse.cdt.managedbuilder.core.BuildException;
import org.eclipse.cdt.core.build.managed.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.core.build.managed.IOption; import org.eclipse.cdt.managedbuilder.core.IOption;
import org.eclipse.cdt.core.build.managed.IOptionCategory; import org.eclipse.cdt.managedbuilder.core.IOptionCategory;
import org.eclipse.cdt.core.build.managed.ITool; import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IConfigurationElement;
/** /**

10
core/org.eclipse.cdt.core/build/org/eclipse/cdt/internal/core/build/managed/OptionCategory.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionCategory.java
View file

@ -8,15 +8,15 @@
* Contributors: * Contributors:
* IBM - Initial API and implementation * IBM - Initial API and implementation
**********************************************************************/ **********************************************************************/
package org.eclipse.cdt.internal.core.build.managed; package org.eclipse.cdt.managedbuilder.internal.core;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.eclipse.cdt.core.build.managed.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.core.build.managed.IOption; import org.eclipse.cdt.managedbuilder.core.IOption;
import org.eclipse.cdt.core.build.managed.IOptionCategory; import org.eclipse.cdt.managedbuilder.core.IOptionCategory;
import org.eclipse.cdt.core.build.managed.ITool; import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IConfigurationElement;
/** /**

10
core/org.eclipse.cdt.core/build/org/eclipse/cdt/internal/core/build/managed/OptionReference.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionReference.java
View file

@ -8,17 +8,17 @@
* Contributors: * Contributors:
* IBM - Initial API and implementation * IBM - Initial API and implementation
**********************************************************************/ **********************************************************************/
package org.eclipse.cdt.internal.core.build.managed; package org.eclipse.cdt.managedbuilder.internal.core;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.ListIterator; import java.util.ListIterator;
import org.eclipse.cdt.core.build.managed.BuildException; import org.eclipse.cdt.managedbuilder.core.BuildException;
import org.eclipse.cdt.core.build.managed.IOption; import org.eclipse.cdt.managedbuilder.core.IOption;
import org.eclipse.cdt.core.build.managed.IOptionCategory; import org.eclipse.cdt.managedbuilder.core.IOptionCategory;
import org.eclipse.cdt.core.build.managed.ITool; import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IConfigurationElement;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element; import org.w3c.dom.Element;

24
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties Normal file
View file

@ -0,0 +1,24 @@
##########################################################################
# Copyright (c) 2002,2003 Rational Software Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Common Public License v0.5
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/cpl-v05.html
#
# Contributors:
# IBM Rational Software - Initial API and implementation
##########################################################################
# Generated makefile builder messages
MakeBuilder.message.starting = Starting the build for project {0}
MakeBuilder.message.rebuild = Regenerating makefiles for project {0}
MakeBuilder.message.incremental = Updating makefiles for project {0}
MakeBuilder.message.make = Calling {0} for project {1}
MakeBuilder.message.error = Build error
MakeBuilder.message.finished = Build complete for project {0}
MakeBuilder.comment.module.list = # Every subdirectory with source files must be described here
MakeBuilder.comment.source.list = # Each subdirectory must contribute its source files here
MakeBuilder.comment.build.rule = # Each subdirectory must supply rules for building sources it contributes
MakeBuilder.comment.module.make.includes = # Include the makefiles for each source subdirectory
MakeBuilder.comment.module.dep.includes = # Include automatically-generated dependency list:
MakeBuilder.comment.autodeps = # Automatically-generated dependency list:

12
core/org.eclipse.cdt.core/build/org/eclipse/cdt/internal/core/build/managed/Target.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Target.java
View file

@ -8,18 +8,18 @@
* Contributors: * Contributors:
* IBM - Initial API and implementation * IBM - Initial API and implementation
**********************************************************************/ **********************************************************************/
package org.eclipse.cdt.internal.core.build.managed; package org.eclipse.cdt.managedbuilder.internal.core;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.eclipse.cdt.core.build.managed.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.core.build.managed.IManagedBuildInfo; import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
import org.eclipse.cdt.core.build.managed.ITarget; import org.eclipse.cdt.managedbuilder.core.ITarget;
import org.eclipse.cdt.core.build.managed.ITool; import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.cdt.core.build.managed.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IConfigurationElement;
import org.w3c.dom.Document; import org.w3c.dom.Document;

14
core/org.eclipse.cdt.core/build/org/eclipse/cdt/internal/core/build/managed/Tool.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
View file

@ -8,7 +8,7 @@
* Contributors: * Contributors:
* IBM - Initial API and implementation * IBM - Initial API and implementation
**********************************************************************/ **********************************************************************/
package org.eclipse.cdt.internal.core.build.managed; package org.eclipse.cdt.managedbuilder.internal.core;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@ -17,12 +17,12 @@ import java.util.ListIterator;
import java.util.Map; import java.util.Map;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.eclipse.cdt.core.build.managed.BuildException; import org.eclipse.cdt.managedbuilder.core.BuildException;
import org.eclipse.cdt.core.build.managed.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.core.build.managed.IOption; import org.eclipse.cdt.managedbuilder.core.IOption;
import org.eclipse.cdt.core.build.managed.IOptionCategory; import org.eclipse.cdt.managedbuilder.core.IOptionCategory;
import org.eclipse.cdt.core.build.managed.ITarget; import org.eclipse.cdt.managedbuilder.core.ITarget;
import org.eclipse.cdt.core.build.managed.ITool; import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IConfigurationElement;
/** /**

14
core/org.eclipse.cdt.core/build/org/eclipse/cdt/internal/core/build/managed/ToolReference.java → build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolReference.java
View file

@ -8,18 +8,18 @@
* Contributors: * Contributors:
* IBM - Initial API and implementation * IBM - Initial API and implementation
**********************************************************************/ **********************************************************************/
package org.eclipse.cdt.internal.core.build.managed; package org.eclipse.cdt.managedbuilder.internal.core;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.eclipse.cdt.core.build.managed.BuildException; import org.eclipse.cdt.managedbuilder.core.BuildException;
import org.eclipse.cdt.core.build.managed.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.core.build.managed.IOption; import org.eclipse.cdt.managedbuilder.core.IOption;
import org.eclipse.cdt.core.build.managed.IOptionCategory; import org.eclipse.cdt.managedbuilder.core.IOptionCategory;
import org.eclipse.cdt.core.build.managed.ITarget; import org.eclipse.cdt.managedbuilder.core.ITarget;
import org.eclipse.cdt.core.build.managed.ITool; import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IConfigurationElement;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element; import org.w3c.dom.Element;

17
build/org.eclipse.cdt.managedbuilder.ui/.classpath Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="/org.eclipse.core.resources"/>
<classpathentry kind="src" path="/org.eclipse.ui"/>
<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
<classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
<classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
<classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
<classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
<classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
<classpathentry kind="src" path="/org.eclipse.cdt.managedbuilder.core"/>
<classpathentry kind="src" path="/org.eclipse.core.boot"/>
<classpathentry kind="src" path="/org.eclipse.core.runtime"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>

1
build/org.eclipse.cdt.managedbuilder.ui/.cvsignore Normal file
View file

@ -0,0 +1 @@
bin

39
build/org.eclipse.cdt.managedbuilder.ui/.project Normal file
View file

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.cdt.managedbuilder.ui</name>
<comment></comment>
<projects>
<project>org.eclipse.cdt.core</project>
<project>org.eclipse.cdt.core.linux</project>
<project>org.eclipse.cdt.core.qnx</project>
<project>org.eclipse.cdt.core.solaris</project>
<project>org.eclipse.cdt.core.win32</project>
<project>org.eclipse.cdt.managedbuilder.core</project>
<project>org.eclipse.cdt.ui</project>
<project>org.eclipse.core.boot</project>
<project>org.eclipse.core.resources</project>
<project>org.eclipse.core.runtime</project>
<project>org.eclipse.ui</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
</natures>
</projectDescription>

15
build/org.eclipse.cdt.managedbuilder.ui/ChangeLog Normal file
View file

@ -0,0 +1,15 @@
2003-09-15 Sean Evoy
First submission of code to new project. Moved all the managed
builder-specific UI elements out of the cdt.ui project. This
includes the icons, and externalized strings.
There are 2 new classes to handle the externalized strings and image
files:
* src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
* src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuilderUIPlugin.java
* src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuilderUIImages.java
The property pages have been modified to use a mix of externalized
strings from the CUIPlugin and ManagedBuilderUIPlugin. The new project
wizard has been reimplemented using the new C project classes added by
QNX September 12, 2003. The UI itself has not changed.

30
build/org.eclipse.cdt.managedbuilder.ui/about.html Normal file
View file

@ -0,0 +1,30 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
<html>
<head>
<title>About</title>
<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
<p>10th July, 2002</p>
<h3>License</h3>
<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
Common Public License Version 1.0 (&quot;CPL&quot;). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
<h3>Contributions</h3>
<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
to others under the terms of the Other License. In addition, with regard to Modifications for which you are the copyright holder, you are also
providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
the CPL.</p>
</body>
</html>

1
build/org.eclipse.cdt.managedbuilder.ui/build.properties Normal file
View file

@ -0,0 +1 @@
source.mgdbuildui.jar = src/

BIN
build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/action-buildconfig.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 940 B

BIN
build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/action-deleteconfig.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 936 B

BIN
build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/action-editconfig.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 942 B

BIN
build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/action-newconfig.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 941 B

BIN
build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/build_configs.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 940 B

BIN
build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-category.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 902 B

BIN
build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-compiler.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 157 B

BIN
build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-debug.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 166 B

BIN
build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-librarian.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 171 B

BIN
build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-linker.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 130 B

BIN
build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-preprocessor.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 167 B

BIN
build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-profile.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 193 B

BIN
build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-release.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 166 B

BIN
build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-tool.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 891 B

BIN
build/org.eclipse.cdt.managedbuilder.ui/icons/full/wizban/newmngc_app.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 416 B

BIN
build/org.eclipse.cdt.managedbuilder.ui/icons/full/wizban/newmngcc_app.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 425 B

24
build/org.eclipse.cdt.managedbuilder.ui/plugin.properties Normal file
View file

@ -0,0 +1,24 @@
pluginName=C/C++ Managed Builder UI
providerName=Eclipse.org
# The Wizards
MngCWizard.name=Managed Make C Project
MngCWizard.description=Create a new C project and let Eclipse create and manage the makefile
MngCCWizard.name=Managed Make C++ Project
MngCCWizard.description=Create a new C++ project and let Eclipse create and manage the makefile
# Build Model Names
ConfigName.Rel=Release
ConfigName.Dbg=Debug
ToolName.preprocessor = Preprocessor
ToolName.compiler = Compiler
ToolName.archiver = Archiver
ToolName.linker = Linker
OptionCategory.Preproc = Preprocessor
OptionCategory.Dirs = Directories
OptionCategory.General = General
OptionCategory.Optimize=Optimization
OptionCategory.Debug=Debugging
OptionCategory.Warn=Warnings
OptionCategory.Misc=Miscellaneous
OptionCategory.Libs=Libraries

1530
build/org.eclipse.cdt.managedbuilder.ui/plugin.xml Normal file
View file

File diff suppressed because it is too large Load diff

112
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuilderUIImages.java Normal file
View file

@ -0,0 +1,112 @@
package org.eclipse.cdt.managedbuilder.internal.ui;
/**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v0.5
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v05.html
*
* Contributors:
* IBM Rational Software - Initial API and implementation
* **********************************************************************/
import java.net.MalformedURLException;
import java.net.URL;
import org.eclipse.cdt.ui.*;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.swt.graphics.Image;
/**
* Bundle of all images used by the C plugin.
*/
public class ManagedBuilderUIImages {
// The plugin registry
private static ImageRegistry imageRegistry = new ImageRegistry();
// Subdirectory (under the package containing this class) where 16 color images are
private static URL fgIconBaseURL;
static {
try {
fgIconBaseURL= new URL(ManagedBuilderUIPlugin.getDefault().getDescriptor().getInstallURL(), "icons/" );
} catch (MalformedURLException e) {
CUIPlugin.getDefault().log(e);
}
}
private static final String NAME_PREFIX= ManagedBuilderUIPlugin.getUniqueIdentifier() + '.';
private static final int NAME_PREFIX_LENGTH= NAME_PREFIX.length();
private static final String T= "full/";
public static final String T_BUILD= T + "build16/";
// For the managed build images
public static final String IMG_BUILD_CONFIG = NAME_PREFIX + "build_configs.gif";
public static final ImageDescriptor DESC_BUILD_CONFIG = createManaged(T_BUILD, IMG_BUILD_CONFIG);
public static final String IMG_BUILD_COMPILER = NAME_PREFIX + "config-compiler.gif";
public static final ImageDescriptor DESC_BUILD_COMPILER = createManaged(T_BUILD, IMG_BUILD_COMPILER);
public static final String IMG_BUILD_LINKER = NAME_PREFIX + "config-linker.gif";
public static final ImageDescriptor DESC_BUILD_LINKER = createManaged(T_BUILD, IMG_BUILD_LINKER);
public static final String IMG_BUILD_LIBRARIAN = NAME_PREFIX + "config-librarian.gif";
public static final ImageDescriptor DESC_BUILD_LIBRARIAN = createManaged(T_BUILD, IMG_BUILD_LIBRARIAN);
public static final String IMG_BUILD_COMMAND = NAME_PREFIX + "config-command.gif";
public static final ImageDescriptor DESC_BUILD_COMMAND = createManaged(T_BUILD, IMG_BUILD_COMMAND);
public static final String IMG_BUILD_PREPROCESSOR = NAME_PREFIX + "config-preprocessor.gif";
public static final ImageDescriptor DESC_BUILD_PREPROCESSOR = createManaged(T_BUILD, IMG_BUILD_PREPROCESSOR);
public static final String IMG_BUILD_TOOL = NAME_PREFIX + "config-tool.gif";
public static final ImageDescriptor DESC_BUILD_TOOL = createManaged(T_BUILD, IMG_BUILD_TOOL);
public static final String IMG_BUILD_CAT = NAME_PREFIX + "config-category.gif";
public static final ImageDescriptor DESC_BUILD_CAT = createManaged(T_BUILD, IMG_BUILD_CAT);
private static ImageDescriptor createManaged(String prefix, String name) {
return createManaged(imageRegistry, prefix, name);
}
private static ImageDescriptor createManaged(ImageRegistry registry, String prefix, String name) {
ImageDescriptor result= ImageDescriptor.createFromURL(makeIconFileURL(prefix, name.substring(NAME_PREFIX_LENGTH)));
registry.put(name, result);
return result;
}
public static Image get(String key) {
return imageRegistry.get(key);
}
private static ImageDescriptor create(String prefix, String name) {
return ImageDescriptor.createFromURL(makeIconFileURL(prefix, name));
}
private static URL makeIconFileURL(String prefix, String name) {
StringBuffer buffer= new StringBuffer(prefix);
buffer.append(name);
try {
return new URL(fgIconBaseURL, buffer.toString());
} catch (MalformedURLException e) {
CUIPlugin.getDefault().log(e);
return null;
}
}
/**
* Sets all available image descriptors for the given action.
*/
public static void setImageDescriptors(IAction action, String type, String relPath) {
relPath= relPath.substring(NAME_PREFIX_LENGTH);
action.setDisabledImageDescriptor(create(T + "d" + type, relPath));
action.setHoverImageDescriptor(create(T + "c" + type, relPath));
action.setImageDescriptor(create(T + "e" + type, relPath));
}
/**
* Helper method to access the image registry from the JavaPlugin class.
*/
static ImageRegistry getImageRegistry() {
return imageRegistry;
}
}

79
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuilderUIPlugin.java Normal file
View file

@ -0,0 +1,79 @@
package org.eclipse.cdt.managedbuilder.internal.ui;
/**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v0.5
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v05.html
*
* Contributors:
* IBM Rational Software - Initial API and implementation
* **********************************************************************/
import java.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import org.eclipse.core.runtime.IPluginDescriptor;
import org.eclipse.core.runtime.Plugin;
public class ManagedBuilderUIPlugin extends Plugin {
//The shared instance.
private static ManagedBuilderUIPlugin plugin;
//Resource bundle.
private static ResourceBundle resourceBundle;
/**
* @param descriptor
*/
public ManagedBuilderUIPlugin(IPluginDescriptor descriptor) {
super(descriptor);
plugin = this;
try {
resourceBundle = ResourceBundle.getBundle("org.eclipse.cdt.managedbuilder.internal.ui.PluginResources"); //$NON-NLS-1$
} catch (MissingResourceException x) {
resourceBundle = null;
}
}
/**
* Returns the shared instance.
*/
public static ManagedBuilderUIPlugin getDefault() {
return plugin;
}
public static String getResourceString(String key) {
try {
return resourceBundle.getString(key);
} catch (MissingResourceException e) {
return "!" + key + "!";
} catch (NullPointerException e) {
return "#" + key + "#";
}
}
public static String getFormattedString(String key, String arg) {
return MessageFormat.format(getResourceString(key), new String[] { arg });
}
public static String getFormattedString(String key, String[] args) {
return MessageFormat.format(getResourceString(key), args);
}
/**
* Convenience method which returns the unique identifier of this plugin.
*/
public static String getUniqueIdentifier() {
if (getDefault() == null) {
// If the default instance is not yet initialized,
// return a static identifier. This identifier must
// match the plugin id defined in plugin.xml
return "org.eclipse.cdt.managedbuilder.ui"; //$NON-NLS-1$
}
return getDefault().getDescriptor().getUniqueIdentifier();
}
}

35
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedProjectOptionBlock.java Normal file
View file

@ -0,0 +1,35 @@
package org.eclipse.cdt.managedbuilder.internal.ui;
/**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v0.5
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v05.html
*
* Contributors:
* IBM Rational Software - Initial API and implementation
* **********************************************************************/
import org.eclipse.cdt.ui.dialogs.ICOptionContainer;
import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock;
public class ManagedProjectOptionBlock extends TabFolderOptionBlock {
/**
* @param parent
*/
public ManagedProjectOptionBlock(ICOptionContainer parent) {
super(parent);
// TODO Auto-generated constructor stub
}
/* (non-Javadoc)
* @see org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock#addTabs()
*/
protected void addTabs() {
// TODO Auto-generated method stub
}
}

57
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties Normal file
View file

@ -0,0 +1,57 @@
#########################################
# (c) Copyright IBM Corp. 2000, 2001.
# All Rights Reserved.
#########################################
# ------- NewProjectCreationPluginPage-------
MngMakeProjectWizard.op_error=Managed Make Error
MngMakeProjectWizard.title=Managed Make Project
MngMakeProjectWizard.description=Create a new Managed Make project.
#MngMakeProjectWizardSettings.title=Managed Make Settings
#MngMakeProjectWizardSettings.description=Define the Managed Make build settings.
MngMakeProjectWizard.message.add_nature=Adding Managed Nature
MngMakeProjectWizard.message.add_builder=Adding Makefile Generator
MngMakeProjectWizard.message.save=Saving new build options
MngCWizard.title=Managed Make C Project
MngCWizard.description=Create a new Managed Make C project.
MngCWizardSettings.title=Managed Make C Settings
MngCWizardSettings.description=Define the Managed Make C build settings.
MngCCWizard.title=Managed Make C++ Project
MngCCWizard.description=Create a new Managed Make C++ Project.
MngCCWizard.message.creating=Creating a new C++ Project with a makefile generator
MngCCWizardSettings.title=Managed Make C++ Settings
MngCCWizardSettings.description=Define the Managed Make C++ build settings.
# -- Strings for the platform selection page --
MngMakeProjectWizard.config.title=Select a Target
MngMakeProjectWizard.config.desc=Select the platform and configurations you wish to deploy on
PlatformBlock.label.platform=Platform:
PlatformBlock.label.configs=Configurations:
# -- Strings for the additional options tab
MngMakeProjectWizard.options.title=Additional Project Settings
MngMakeProjectWizard.options.desc=Defined the binary parser and inter-project dependencies, if any.
# ----------- Configuration Selection Page -----------
BuildPropertyPage.label.Platform=Platform:
BuildPropertyPage.label.Configuration=Configuration:
BuildPropertyPage.label.Active=Active configuration
BuildPropertyPage.label.Settings=Configuration settings
BuildPropertyPage.label.AddConfButton=Manage...
BuildPropertyPage.label.ToolTree=Tools
BuildPropertyPage.label.ToolOptions=Options
BuildPropertyPage.tip.platform=Select a platform for the project
BuildPropertyPage.tip.config=Select the configuration to edit
BuildPropertyPage.tip.addconf=Add configurations for the platform
BuildPropertyPage.tip.remconf=Remove configurations for the platform
BuildPropertyPage.manage.title=Manage Configurations
# ----------- New Configuration -----------
NewConfiguration.label.name=Configuration name:
NewConfiguration.label.copy=Copy settings from:
NewConfiguration.error.title=Error
NewConfiguration.error.duplicateName=A configuration named "{0}" already exists.

10
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/properties/BrowseEntryDialog.java → build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BrowseEntryDialog.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.ui.build.properties; package org.eclipse.cdt.managedbuilder.ui.properties;
/********************************************************************** /**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others. * Copyright (c) 2002,2003 Rational Software Corporation and others.
@ -21,7 +21,13 @@ import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.*; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
public class BrowseEntryDialog extends Dialog { public class BrowseEntryDialog extends Dialog {
// String constants // String constants

2
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/properties/BuildOptionComboFieldEditor.java → build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionComboFieldEditor.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.ui.build.properties; package org.eclipse.cdt.managedbuilder.ui.properties;
/********************************************************************** /**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others. * Copyright (c) 2002,2003 Rational Software Corporation and others.

2
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/properties/BuildOptionListFieldEditor.java → build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionListFieldEditor.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.ui.build.properties; package org.eclipse.cdt.managedbuilder.ui.properties;
/********************************************************************** /**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others. * Copyright (c) 2002,2003 Rational Software Corporation and others.

32
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/properties/BuildPropertyPage.java → build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildPropertyPage.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.ui.build.properties; package org.eclipse.cdt.managedbuilder.ui.properties;
/********************************************************************** /**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others. * Copyright (c) 2002,2003 Rational Software Corporation and others.
@ -17,12 +17,12 @@ import java.util.List;
import java.util.ListIterator; import java.util.ListIterator;
import java.util.Map; import java.util.Map;
import org.eclipse.cdt.core.build.managed.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.core.build.managed.IManagedBuildInfo; import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
import org.eclipse.cdt.core.build.managed.IOptionCategory; import org.eclipse.cdt.managedbuilder.core.IOptionCategory;
import org.eclipse.cdt.core.build.managed.ITarget; import org.eclipse.cdt.managedbuilder.core.ITarget;
import org.eclipse.cdt.core.build.managed.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIPlugin;
import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.cdt.utils.ui.controls.ControlFactory;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.jface.preference.IPreferencePageContainer; import org.eclipse.jface.preference.IPreferencePageContainer;
@ -162,7 +162,7 @@ public class BuildPropertyPage extends PropertyPage implements IWorkbenchPropert
GridData gd; GridData gd;
// Add a config selection area // Add a config selection area
Group configGroup = ControlFactory.createGroup(composite, CUIPlugin.getResourceString(ACTIVE_LABEL), 1); Group configGroup = ControlFactory.createGroup(composite, ManagedBuilderUIPlugin.getResourceString(ACTIVE_LABEL), 1);
gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL); gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
gd.grabExcessHorizontalSpace = true; gd.grabExcessHorizontalSpace = true;
configGroup.setLayoutData(gd); configGroup.setLayoutData(gd);
@ -172,24 +172,24 @@ public class BuildPropertyPage extends PropertyPage implements IWorkbenchPropert
form.marginWidth = 5; form.marginWidth = 5;
configGroup.setLayout(form); configGroup.setLayout(form);
Label platformLabel = ControlFactory.createLabel(configGroup, CUIPlugin.getResourceString(PLATFORM_LABEL)); Label platformLabel = ControlFactory.createLabel(configGroup, ManagedBuilderUIPlugin.getResourceString(PLATFORM_LABEL));
targetSelector = ControlFactory.createSelectCombo(configGroup, getPlatformNames(), null); targetSelector = ControlFactory.createSelectCombo(configGroup, getPlatformNames(), null);
targetSelector.addListener(SWT.Selection, new Listener () { targetSelector.addListener(SWT.Selection, new Listener () {
public void handleEvent(Event e) { public void handleEvent(Event e) {
handleTargetSelection(); handleTargetSelection();
} }
}); });
targetSelector.setToolTipText(CUIPlugin.getResourceString(PLAT_TIP)); targetSelector.setToolTipText(ManagedBuilderUIPlugin.getResourceString(PLAT_TIP));
Label configLabel = ControlFactory.createLabel(configGroup, CUIPlugin.getResourceString(CONFIG_LABEL)); Label configLabel = ControlFactory.createLabel(configGroup, ManagedBuilderUIPlugin.getResourceString(CONFIG_LABEL));
configSelector = new Combo(configGroup, SWT.READ_ONLY|SWT.DROP_DOWN); configSelector = new Combo(configGroup, SWT.READ_ONLY|SWT.DROP_DOWN);
configSelector.addListener(SWT.Selection, new Listener () { configSelector.addListener(SWT.Selection, new Listener () {
public void handleEvent(Event e) { public void handleEvent(Event e) {
handleConfigSelection(); handleConfigSelection();
} }
}); });
configSelector.setToolTipText(CUIPlugin.getResourceString(CONF_TIP)); configSelector.setToolTipText(ManagedBuilderUIPlugin.getResourceString(CONF_TIP));
manageConfigs = ControlFactory.createPushButton(configGroup, CUIPlugin.getResourceString(ADD_CONF)); manageConfigs = ControlFactory.createPushButton(configGroup, ManagedBuilderUIPlugin.getResourceString(ADD_CONF));
manageConfigs.setToolTipText(CUIPlugin.getResourceString(ADD_TIP)); manageConfigs.setToolTipText(ManagedBuilderUIPlugin.getResourceString(ADD_TIP));
manageConfigs.addSelectionListener(new SelectionAdapter() { manageConfigs.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
handleManageConfig(); handleManageConfig();
@ -221,7 +221,7 @@ public class BuildPropertyPage extends PropertyPage implements IWorkbenchPropert
configSelector.setLayoutData(fd); configSelector.setLayoutData(fd);
// Create the sash form // Create the sash form
sashGroup = ControlFactory.createGroup(composite, CUIPlugin.getResourceString(SETTINGS_LABEL), 1); sashGroup = ControlFactory.createGroup(composite, ManagedBuilderUIPlugin.getResourceString(SETTINGS_LABEL), 1);
sashGroup.setLayoutData(new GridData(GridData.FILL_BOTH)); sashGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
sashForm = new SashForm(sashGroup, SWT.NONE); sashForm = new SashForm(sashGroup, SWT.NONE);
sashForm.setOrientation(SWT.HORIZONTAL); sashForm.setOrientation(SWT.HORIZONTAL);
@ -413,7 +413,7 @@ public class BuildPropertyPage extends PropertyPage implements IWorkbenchPropert
// Event handler for the manage configuration button event // Event handler for the manage configuration button event
private void handleManageConfig () { private void handleManageConfig () {
ManageConfigDialog manageDialog = new ManageConfigDialog(getShell(), CUIPlugin.getResourceString(MANAGE_TITLE), selectedTarget); ManageConfigDialog manageDialog = new ManageConfigDialog(getShell(), ManagedBuilderUIPlugin.getResourceString(MANAGE_TITLE), selectedTarget);
if (manageDialog.open() == ManageConfigDialog.OK) { if (manageDialog.open() == ManageConfigDialog.OK) {
// Check to see if any configurations have to be deleted // Check to see if any configurations have to be deleted
ArrayList deleteMe = manageDialog.getDeletedConfigs(); ArrayList deleteMe = manageDialog.getDeletedConfigs();

12
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/properties/BuildToolSettingsPage.java → build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java
View file

@ -1,10 +1,10 @@
package org.eclipse.cdt.ui.build.properties; package org.eclipse.cdt.managedbuilder.ui.properties;
import org.eclipse.cdt.core.build.managed.BuildException; import org.eclipse.cdt.managedbuilder.core.BuildException;
import org.eclipse.cdt.core.build.managed.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.core.build.managed.IOption; import org.eclipse.cdt.managedbuilder.core.IOption;
import org.eclipse.cdt.core.build.managed.IOptionCategory; import org.eclipse.cdt.managedbuilder.core.IOptionCategory;
import org.eclipse.cdt.core.build.managed.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore;

16
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/properties/BuildToolsSettingsStore.java → build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolsSettingsStore.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.ui.build.properties; package org.eclipse.cdt.managedbuilder.ui.properties;
/********************************************************************** /**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others. * Copyright (c) 2002,2003 Rational Software Corporation and others.
@ -16,15 +16,15 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.eclipse.cdt.core.build.managed.BuildException; import org.eclipse.cdt.managedbuilder.core.BuildException;
import org.eclipse.cdt.core.build.managed.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.core.build.managed.IOption; import org.eclipse.cdt.managedbuilder.core.IOption;
import org.eclipse.cdt.core.build.managed.IOptionCategory; import org.eclipse.cdt.managedbuilder.core.IOptionCategory;
import org.eclipse.cdt.core.build.managed.ITool; import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.jface.util.ListenerList;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.ListenerList;
import org.eclipse.jface.util.PropertyChangeEvent;
public class BuildToolsSettingsStore implements IPreferenceStore { public class BuildToolsSettingsStore implements IPreferenceStore {
public static final String DEFAULT_SEPERATOR = ";"; public static final String DEFAULT_SEPERATOR = ";";

8
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/properties/ManageConfigDialog.java → build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ManageConfigDialog.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.ui.build.properties; package org.eclipse.cdt.managedbuilder.ui.properties;
/********************************************************************** /**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others. * Copyright (c) 2002,2003 Rational Software Corporation and others.
@ -15,9 +15,9 @@ import java.util.ArrayList;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.TreeMap; import java.util.TreeMap;
import org.eclipse.cdt.core.build.managed.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.core.build.managed.ITarget; import org.eclipse.cdt.managedbuilder.core.ITarget;
import org.eclipse.cdt.core.build.managed.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.cdt.utils.ui.controls.ControlFactory;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;

16
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/properties/NewConfigurationDialog.java → build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewConfigurationDialog.java
View file

@ -1,8 +1,8 @@
package org.eclipse.cdt.ui.build.properties; package org.eclipse.cdt.managedbuilder.ui.properties;
import org.eclipse.cdt.core.build.managed.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.core.build.managed.ITarget; import org.eclipse.cdt.managedbuilder.core.ITarget;
import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIPlugin;
import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.cdt.utils.ui.controls.ControlFactory;
import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogConstants;
@ -109,7 +109,7 @@ public class NewConfigurationDialog extends Dialog {
GridData gd; GridData gd;
// Add a label and a text widget // Add a label and a text widget
Label nameLabel = ControlFactory.createLabel(composite, CUIPlugin.getResourceString(NAME)); Label nameLabel = ControlFactory.createLabel(composite, ManagedBuilderUIPlugin.getResourceString(NAME));
gd = new GridData(); gd = new GridData();
gd.horizontalSpan = 1; gd.horizontalSpan = 1;
nameLabel.setLayoutData(gd); nameLabel.setLayoutData(gd);
@ -124,7 +124,7 @@ public class NewConfigurationDialog extends Dialog {
}); });
// Add a label and combo box to select the base config // Add a label and combo box to select the base config
Label configLabel = ControlFactory.createLabel(composite, CUIPlugin.getResourceString(COPY)); Label configLabel = ControlFactory.createLabel(composite, ManagedBuilderUIPlugin.getResourceString(COPY));
gd = new GridData(); gd = new GridData();
gd.horizontalSpan = 1; gd.horizontalSpan = 1;
configLabel.setLayoutData(gd); configLabel.setLayoutData(gd);
@ -198,8 +198,8 @@ public class NewConfigurationDialog extends Dialog {
// Make sure the name is not a duplicate // Make sure the name is not a duplicate
if (isDuplicateName(currentName)) { if (isDuplicateName(currentName)) {
MessageDialog.openError(getShell(), MessageDialog.openError(getShell(),
CUIPlugin.getResourceString(TITLE), ManagedBuilderUIPlugin.getResourceString(TITLE),
CUIPlugin.getFormattedString(DUPLICATE, currentName)); //$NON-NLS-1$ ManagedBuilderUIPlugin.getFormattedString(DUPLICATE, currentName)); //$NON-NLS-1$
return false; return false;
} }
// TODO make sure there are no invalid chars in name // TODO make sure there are no invalid chars in name

4
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/properties/SummaryFieldEditor.java → build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/SummaryFieldEditor.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.ui.build.properties; package org.eclipse.cdt.managedbuilder.ui.properties;
/********************************************************************** /**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others. * Copyright (c) 2002,2003 Rational Software Corporation and others.
@ -11,7 +11,7 @@ package org.eclipse.cdt.ui.build.properties;
* IBM Rational Software - Initial API and implementation * IBM Rational Software - Initial API and implementation
***********************************************************************/ ***********************************************************************/
import org.eclipse.cdt.core.build.managed.ITool; import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.jface.preference.FieldEditor; import org.eclipse.jface.preference.FieldEditor;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridData;

8
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/properties/ToolListContentProvider.java → build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListContentProvider.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.ui.build.properties; package org.eclipse.cdt.managedbuilder.ui.properties;
/********************************************************************** /**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others. * Copyright (c) 2002,2003 Rational Software Corporation and others.
@ -12,9 +12,9 @@ package org.eclipse.cdt.ui.build.properties;
* IBM Rational Software * IBM Rational Software
* *********************************************************************/ * *********************************************************************/
import org.eclipse.cdt.core.build.managed.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.core.build.managed.IOptionCategory; import org.eclipse.cdt.managedbuilder.core.IOptionCategory;
import org.eclipse.cdt.core.build.managed.ITool; import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.Viewer;

10
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/properties/ToolListLabelProvider.java → build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListLabelProvider.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.ui.build.properties; package org.eclipse.cdt.managedbuilder.ui.properties;
/********************************************************************** /**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others. * Copyright (c) 2002,2003 Rational Software Corporation and others.
@ -11,14 +11,14 @@ package org.eclipse.cdt.ui.build.properties;
* IBM Rational Software - Initial API and implementation * IBM Rational Software - Initial API and implementation
* **********************************************************************/ * **********************************************************************/
import org.eclipse.cdt.core.build.managed.IOptionCategory; import org.eclipse.cdt.managedbuilder.core.IOptionCategory;
import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIImages;
import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Image;
class ToolListLabelProvider extends LabelProvider { class ToolListLabelProvider extends LabelProvider {
private final Image IMG_TOOL = CPluginImages.get(CPluginImages.IMG_BUILD_TOOL); private final Image IMG_TOOL = ManagedBuilderUIImages.get(ManagedBuilderUIImages.IMG_BUILD_TOOL);
private final Image IMG_CAT = CPluginImages.get(CPluginImages.IMG_BUILD_CAT); private final Image IMG_CAT = ManagedBuilderUIImages.get(ManagedBuilderUIImages.IMG_BUILD_CAT);
private static final String TREE_LABEL = "BuildPropertyPage.label.ToolTree"; //$NON-NLS-1$ private static final String TREE_LABEL = "BuildPropertyPage.label.ToolTree"; //$NON-NLS-1$
public Image getImage(Object element) { public Image getImage(Object element) {

23
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/wizards/CProjectPlatformPage.java → build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectPlatformPage.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.ui.build.wizards; package org.eclipse.cdt.managedbuilder.ui.wizards;
/********************************************************************** /**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others. * Copyright (c) 2002,2003 Rational Software Corporation and others.
@ -15,11 +15,10 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.ListIterator; import java.util.ListIterator;
import org.eclipse.cdt.core.build.managed.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.core.build.managed.ITarget; import org.eclipse.cdt.managedbuilder.core.ITarget;
import org.eclipse.cdt.core.build.managed.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIPlugin;
import org.eclipse.cdt.ui.wizards.CProjectWizard;
import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.cdt.utils.ui.controls.ControlFactory;
import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.CheckboxTableViewer;
import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionChangedListener;
@ -39,7 +38,7 @@ public class CProjectPlatformPage extends WizardPage {
/* /*
* Bookeeping variables * Bookeeping variables
*/ */
private CProjectWizard wizard; // private CProjectWizard wizard;
private ArrayList selectedConfigurations; private ArrayList selectedConfigurations;
protected ITarget selectedTarget; protected ITarget selectedTarget;
protected String[] targetNames; protected String[] targetNames;
@ -62,10 +61,10 @@ public class CProjectPlatformPage extends WizardPage {
* @param wizard * @param wizard
* @param pageName * @param pageName
*/ */
public CProjectPlatformPage(CProjectWizard wizard, String pageName) { public CProjectPlatformPage(/*CProjectWizard wizard,*/ String pageName) {
super(pageName); super(pageName);
setPageComplete(false); setPageComplete(false);
this.wizard = wizard; // this.wizard = wizard;
populateTargets(); populateTargets();
selectedTarget = null; selectedTarget = null;
selectedConfigurations = new ArrayList(0); selectedConfigurations = new ArrayList(0);
@ -86,11 +85,11 @@ public class CProjectPlatformPage extends WizardPage {
Composite composite = ControlFactory.createComposite(parent, 6); Composite composite = ControlFactory.createComposite(parent, 6);
// Create the platform selection label and combo widgets // Create the platform selection label and combo widgets
Label platformLabel = ControlFactory.createLabel(composite, CUIPlugin.getResourceString(PLATFORM_LABEL)); Label platformLabel = ControlFactory.createLabel(composite, ManagedBuilderUIPlugin.getResourceString(PLATFORM_LABEL));
platformLabel.setLayoutData(new GridData()); platformLabel.setLayoutData(new GridData());
platformSelection = ControlFactory.createSelectCombo(composite, targetNames, null); platformSelection = ControlFactory.createSelectCombo(composite, targetNames, null);
platformSelection.setToolTipText(CUIPlugin.getResourceString(PLATFORM_TIP)); platformSelection.setToolTipText(ManagedBuilderUIPlugin.getResourceString(PLATFORM_TIP));
platformSelection.addListener(SWT.Selection, new Listener() { platformSelection.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event e) { public void handleEvent(Event e) {
handleTargetSelection(); handleTargetSelection();
@ -101,7 +100,7 @@ public class CProjectPlatformPage extends WizardPage {
platformSelection.setLayoutData(gd); platformSelection.setLayoutData(gd);
// Create a check box table of valid configurations // Create a check box table of valid configurations
Label configLabel = ControlFactory.createLabel(composite, CUIPlugin.getResourceString(CONFIG_LABEL)); Label configLabel = ControlFactory.createLabel(composite, ManagedBuilderUIPlugin.getResourceString(CONFIG_LABEL));
configLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); configLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
Table table = new Table(composite, SWT.CHECK | SWT.BORDER | SWT.MULTI Table table = new Table(composite, SWT.CHECK | SWT.BORDER | SWT.MULTI
| SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL); | SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL);

6
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/wizards/ConfigurationContentProvider.java → build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ConfigurationContentProvider.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.ui.build.wizards; package org.eclipse.cdt.managedbuilder.ui.wizards;
/********************************************************************** /**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others. * Copyright (c) 2002,2003 Rational Software Corporation and others.
@ -11,8 +11,8 @@ package org.eclipse.cdt.ui.build.wizards;
* IBM Rational Software - Initial API and implementation * IBM Rational Software - Initial API and implementation
***********************************************************************/ ***********************************************************************/
import org.eclipse.cdt.core.build.managed.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.core.build.managed.ITarget; import org.eclipse.cdt.managedbuilder.core.ITarget;
import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.Viewer;

8
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/wizards/ConfigurationLabelProvider.java → build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ConfigurationLabelProvider.java
View file

@ -1,4 +1,4 @@
package org.eclipse.cdt.ui.build.wizards; package org.eclipse.cdt.managedbuilder.ui.wizards;
/********************************************************************** /**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others. * Copyright (c) 2002,2003 Rational Software Corporation and others.
@ -11,15 +11,15 @@ package org.eclipse.cdt.ui.build.wizards;
* IBM Rational Software - Initial API and implementation * IBM Rational Software - Initial API and implementation
***********************************************************************/ ***********************************************************************/
import org.eclipse.cdt.core.build.managed.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIImages;
import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Image;
public class ConfigurationLabelProvider extends LabelProvider implements ITableLabelProvider { public class ConfigurationLabelProvider extends LabelProvider implements ITableLabelProvider {
private final Image IMG_CFG = private final Image IMG_CFG =
CPluginImages.get(CPluginImages.IMG_BUILD_CONFIG); ManagedBuilderUIImages.get(ManagedBuilderUIImages.IMG_BUILD_CONFIG);
// //
public String getColumnText(Object obj, int index) { public String getColumnText(Object obj, int index) {

54
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedCCProjectWizard.java Normal file
View file

@ -0,0 +1,54 @@
package org.eclipse.cdt.managedbuilder.ui.wizards;
/**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v0.5
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v05.html
*
* Contributors:
* IBM Rational Software - Initial API and implementation
* **********************************************************************/
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.SubProgressMonitor;
public class NewManagedCCProjectWizard extends NewManagedProjectWizard {
private static final String WZ_TITLE = "MngCCWizard.title"; //$NON-NLS-1$
private static final String WZ_DESC = "MngCCWizard.description"; //$NON-NLS-1$
private static final String SETTINGS_TITLE = "MngCCWizardSettings.title"; //$NON-NLS-1$
private static final String SETTINGS_DESC = "MngCCWizardSettings.description"; //$NON-NLS-1$
private static final String MSG_CREATE = "MngCCWizard.message.creating"; //$NON-NLS-1$
public NewManagedCCProjectWizard() {
this(ManagedBuilderUIPlugin.getResourceString(WZ_TITLE), ManagedBuilderUIPlugin.getResourceString(WZ_DESC));
}
public NewManagedCCProjectWizard(String title, String desc) {
super(title, desc);
}
public void addPages() {
// Add the default page for all new managed projects
super.addPages();
}
protected void doRun(IProgressMonitor monitor) throws CoreException {
if (monitor == null) {
monitor = new NullProgressMonitor();
}
monitor.beginTask(ManagedBuilderUIPlugin.getResourceString(MSG_CREATE), 8); //$NON-NLS-1$
super.doRun(new SubProgressMonitor(monitor, 7));
// Add C++ Nature.
if (newProject != null) {
// Add C++ Nature to the newly created project.
CCorePlugin.getDefault().convertProjectFromCtoCC(newProject, new SubProgressMonitor(monitor, 1));
}
monitor.done();
}
}

36
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedCProjectWizard.java Normal file
View file

@ -0,0 +1,36 @@
package org.eclipse.cdt.managedbuilder.ui.wizards;
/**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v0.5
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v05.html
*
* Contributors:
* IBM Rational Software - Initial API and implementation
* **********************************************************************/
import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIPlugin;
public class NewManagedCProjectWizard extends NewManagedProjectWizard {
// String constants
private static final String WZ_TITLE = "MngCWizard.title";
private static final String WZ_DESC = "MngCWizard.description";
private static final String SETTINGS_TITLE= "MngCWizardSettings.title"; //$NON-NLS-1$
private static final String SETTINGS_DESC= "MngCWizardSettings.description"; //$NON-NLS-1$
public NewManagedCProjectWizard() {
this(ManagedBuilderUIPlugin.getResourceString(WZ_TITLE), ManagedBuilderUIPlugin.getResourceString(WZ_DESC));
}
public NewManagedCProjectWizard(String title, String description) {
super(title, description);
}
public void addPages() {
// Add the default page for all new managed projects
super.addPages();
}
}

59
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectOptionPage.java Normal file
View file

@ -0,0 +1,59 @@
package org.eclipse.cdt.managedbuilder.ui.wizards;
/**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v0.5
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v05.html
*
* Contributors:
* IBM Rational Software - Initial API and implementation
* **********************************************************************/
import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
import org.eclipse.cdt.managedbuilder.internal.ui.ManagedProjectOptionBlock;
import org.eclipse.cdt.ui.dialogs.BinaryParserBlock;
import org.eclipse.cdt.ui.dialogs.ICOptionContainer;
import org.eclipse.cdt.ui.dialogs.ReferenceBlock;
import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock;
import org.eclipse.cdt.ui.wizards.NewCProjectWizard;
import org.eclipse.cdt.ui.wizards.NewCProjectWizardOptionPage;
import org.eclipse.core.resources.IProject;
public class NewManagedProjectOptionPage extends NewCProjectWizardOptionPage {
public class ManagedWizardOptionBlock extends ManagedProjectOptionBlock {
public ManagedWizardOptionBlock(ICOptionContainer parent) {
super(parent);
}
protected void addTabs() {
addTab(new ReferenceBlock());
addTab(new BinaryParserBlock(ManagedBuilderCorePlugin.getDefault().getPluginPreferences()));
}
}
/**
* @param pageName
*/
public NewManagedProjectOptionPage(String pageName) {
super(pageName);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.ui.wizards.NewCProjectWizardOptionPage#createOptionBlock()
*/
protected TabFolderOptionBlock createOptionBlock() {
return new ManagedWizardOptionBlock(this);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.ui.dialogs.ICOptionContainer#getProject()
*/
public IProject getProject() {
return ((NewCProjectWizard)getWizard()).getNewProject();
}
}

168
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectWizard.java Normal file
View file

@ -0,0 +1,168 @@
package org.eclipse.cdt.managedbuilder.ui.wizards;
/**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v0.5
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v05.html
*
* Contributors:
* IBM Rational Software - Initial API and implementation
* **********************************************************************/
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.ICDescriptor;
import org.eclipse.cdt.managedbuilder.core.BuildException;
import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.ITarget;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIPlugin;
import org.eclipse.cdt.ui.wizards.NewCProjectWizard;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.SubProgressMonitor;
public class NewManagedProjectWizard extends NewCProjectWizard {
/* (non-Javadoc)
* String constants
*/
protected static final String PREFIX = "MngMakeProjectWizard"; //$NON-NLS-1$
protected static final String OP_ERROR = PREFIX + ".op_error"; //$NON-NLS-1$
protected static final String WZ_TITLE = PREFIX + ".title"; //$NON-NLS-1$
protected static final String WZ_DESC = PREFIX + ".description"; //$NON-NLS-1$
protected static final String CONF_TITLE = PREFIX + ".config.title"; //$NON-NLS-1$
protected static final String CONF_DESC = PREFIX + ".config.desc"; //$NON-NLS-1$
protected static final String OPTIONS_TITLE = PREFIX + ".options.title"; //$NON-NLS-1$
protected static final String OPTIONS_DESC = PREFIX + ".options.desc"; //$NON-NLS-1$
protected static final String MSG_ADD_NATURE = PREFIX + ".message.add_nature"; //$NON-NLS-1$
protected static final String MSG_ADD_BUILDER = PREFIX + ".message.add_builder"; //$NON-NLS-1$
protected static final String MSG_SAVE = PREFIX + ".message.save"; //$NON-NLS-1$
protected static final String SETTINGS_TITLE = "MngMakeWizardSettings.title"; //$NON-NLS-1$
protected static final String SETTINGS_DESC = "MngMakeWizardSettings.description"; //$NON-NLS-1$
// Wizard pages
protected CProjectPlatformPage targetConfigurationPage;
protected NewManagedProjectOptionPage optionPage;
public NewManagedProjectWizard() {
this(ManagedBuilderUIPlugin.getResourceString(WZ_TITLE), ManagedBuilderUIPlugin.getResourceString(WZ_DESC));
}
public NewManagedProjectWizard(String title, String description) {
super(title, description);
}
public void addPages() {
// Add the default page for all new projects
super.addPages();
// Add the configuration selection page
targetConfigurationPage = new CProjectPlatformPage(PREFIX);
targetConfigurationPage.setTitle(ManagedBuilderUIPlugin.getResourceString(CONF_TITLE));
targetConfigurationPage.setDescription(ManagedBuilderUIPlugin.getResourceString(CONF_DESC));
addPage(targetConfigurationPage);
// Add the options (tabbed) page
optionPage = new NewManagedProjectOptionPage(PREFIX);
optionPage.setTitle(ManagedBuilderUIPlugin.getResourceString(OPTIONS_TITLE));
optionPage.setDescription(ManagedBuilderUIPlugin.getResourceString(OPTIONS_DESC));
addPage(optionPage);
}
protected void doRun(IProgressMonitor monitor) throws CoreException {
if (monitor == null) {
monitor = new NullProgressMonitor();
}
// super.doRun() just creates the project and does not assign a builder to it.
super.doRun(new SubProgressMonitor(monitor, 5));
// Add the managed build nature
try {
monitor.subTask(ManagedBuilderUIPlugin.getResourceString(MSG_ADD_NATURE));
ManagedCProjectNature.addManagedNature(newProject, new SubProgressMonitor(monitor, 1));
} catch (CoreException e) {
// Bail out of the project creation
}
// Add the builder
try {
monitor.subTask(ManagedBuilderUIPlugin.getResourceString(MSG_ADD_BUILDER));
ManagedCProjectNature.addManagedBuilder(newProject, new SubProgressMonitor(monitor, 1));
} catch (CoreException e) {
// Bail out of the project creation
}
// Modify the project settings
if (newProject != null) {
optionPage.performApply(new SubProgressMonitor(monitor, 2));
}
// Add the target to the project
try {
ITarget parent = targetConfigurationPage.getSelectedTarget();
ITarget newTarget = ManagedBuildManager.createTarget(newProject, parent);
if (newTarget != null) {
// TODO add name entry field to project
String artifactName = newProject.getName();
artifactName += parent.getDefaultExtension().length() == 0 ? "" : "." + parent.getDefaultExtension();
newTarget.setBuildArtifact(artifactName);
IConfiguration [] selectedConfigs = targetConfigurationPage.getSelectedConfigurations();
for (int i = 0; i < selectedConfigs.length; i++) {
IConfiguration config = selectedConfigs[i];
newTarget.createConfiguration(config, config.getId() + "." + i);
}
// Now add the first config in the list as the default
IConfiguration[] newConfigs = newTarget.getConfigurations();
if (newConfigs.length > 0) {
ManagedBuildManager.setDefaultConfiguration(newProject, newConfigs[0]);
}
}
} catch (BuildException e) {
// TODO Flag the error to the user
}
// Associate the project with the managed builder so the clients can get proper information
try {
ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(newProject);
desc.remove(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID);
desc.create(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID, ManagedBuildManager.INTERFACE_IDENTITY);
} catch (CoreException e) {
// TODO Flag the error to the user
}
// Save the build options
monitor.subTask(ManagedBuilderUIPlugin.getResourceString(MSG_SAVE));
ManagedBuildManager.saveBuildInfo(newProject);
monitor.done();
}
/* (non-Javadoc)
* @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#doRunPrologue(org.eclipse.core.runtime.IProgressMonitor)
*/
protected void doRunPrologue(IProgressMonitor monitor) {
// Auto-generated method stub
}
/* (non-Javadoc)
* @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#doRunEpilogue(org.eclipse.core.runtime.IProgressMonitor)
*/
protected void doRunEpilogue(IProgressMonitor monitor) {
// Auto-generated method stub
}
/* (non-Javadoc)
* @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#getProjectID()
*/
public String getProjectID() {
return "org.eclipse.cdt.make.core.make";
// return ManagedBuilderCorePlugin.getUniqueIdentifier() + ".make"; //$NON-NLS-1$
}
}

7
core/org.eclipse.cdt.core.tests/.classpath
View file

@ -12,11 +12,16 @@
<classpathentry kind="src" path="/org.eclipse.core.resources"/> <classpathentry kind="src" path="/org.eclipse.core.resources"/>
<classpathentry kind="src" path="/org.eclipse.core.runtime"/> <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
<classpathentry kind="src" path="/org.eclipse.cdt.core"/> <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
<classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
<classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
<classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
<classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
<classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
<classpathentry kind="src" path="/org.eclipse.swt"/> <classpathentry kind="src" path="/org.eclipse.swt"/>
<classpathentry kind="src" path="/org.eclipse.ui"/> <classpathentry kind="src" path="/org.eclipse.ui"/>
<classpathentry kind="src" path="/org.junit"/> <classpathentry kind="src" path="/org.junit"/>
<classpathentry kind="src" path="/org.eclipse.core.boot"/> <classpathentry kind="src" path="/org.eclipse.core.boot"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="/org.eclipse.cdt.ui"/> <classpathentry kind="src" path="/org.eclipse.cdt.managedbuilder.core"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

5
core/org.eclipse.cdt.core.tests/.project
View file

@ -5,6 +5,11 @@
<projects> <projects>
<project>org.apache.xerces</project> <project>org.apache.xerces</project>
<project>org.eclipse.cdt.core</project> <project>org.eclipse.cdt.core</project>
<project>org.eclipse.cdt.core.linux</project>
<project>org.eclipse.cdt.core.qnx</project>
<project>org.eclipse.cdt.core.solaris</project>
<project>org.eclipse.cdt.core.win32</project>
<project>org.eclipse.cdt.managedbuilder.core</project>
<project>org.eclipse.cdt.ui</project> <project>org.eclipse.cdt.ui</project>
<project>org.eclipse.core.boot</project> <project>org.eclipse.core.boot</project>
<project>org.eclipse.core.resources</project> <project>org.eclipse.core.resources</project>

20
core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/ManagedBuildTests.java
View file

@ -20,19 +20,19 @@ import junit.framework.TestSuite;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.ICDescriptor; import org.eclipse.cdt.core.ICDescriptor;
import org.eclipse.cdt.core.ManagedCProjectNature;
import org.eclipse.cdt.core.build.managed.BuildException;
import org.eclipse.cdt.core.build.managed.IConfiguration;
import org.eclipse.cdt.core.build.managed.IManagedBuildInfo;
import org.eclipse.cdt.core.build.managed.IOption;
import org.eclipse.cdt.core.build.managed.IOptionCategory;
import org.eclipse.cdt.core.build.managed.ITarget;
import org.eclipse.cdt.core.build.managed.ITool;
import org.eclipse.cdt.core.build.managed.ManagedBuildManager;
import org.eclipse.cdt.core.parser.IScannerInfo; import org.eclipse.cdt.core.parser.IScannerInfo;
import org.eclipse.cdt.core.parser.IScannerInfoChangeListener; import org.eclipse.cdt.core.parser.IScannerInfoChangeListener;
import org.eclipse.cdt.core.parser.IScannerInfoProvider; import org.eclipse.cdt.core.parser.IScannerInfoProvider;
import org.eclipse.cdt.internal.core.build.managed.ToolReference; import org.eclipse.cdt.managedbuilder.core.BuildException;
import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
import org.eclipse.cdt.managedbuilder.core.IOption;
import org.eclipse.cdt.managedbuilder.core.IOptionCategory;
import org.eclipse.cdt.managedbuilder.core.ITarget;
import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
import org.eclipse.cdt.managedbuilder.internal.core.ToolReference;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;

3
core/org.eclipse.cdt.core.tests/plugin.xml
View file

@ -19,13 +19,14 @@
<import plugin="org.eclipse.swt"/> <import plugin="org.eclipse.swt"/>
<import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.ui"/>
<import plugin="org.junit"/> <import plugin="org.junit"/>
<import plugin="org.eclipse.cdt.managedbuilder.core"/>
</requires> </requires>
<extension <extension
id="buildTest" id="buildTest"
name="Tools for Build Test" name="Tools for Build Test"
point="org.eclipse.cdt.core.ManagedBuildInfo"> point="org.eclipse.cdt.managedbuilder.core.ManagedBuildInfo">
<target <target
makeFlags="-k" makeFlags="-k"
isTest="true" isTest="true"

21
core/org.eclipse.cdt.core/build/org/eclipse/cdt/core/build/managed/BuildException.java
View file

@ -1,21 +0,0 @@
/*
* Created on Apr 9, 2003
*
* To change the template for this generated file go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
package org.eclipse.cdt.core.build.managed;
/**
* @author dschaefe
*
* To change the template for this generated type comment go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
public class BuildException extends Exception {
public BuildException(String msg) {
super(msg);
}
}

4
core/org.eclipse.cdt.core/plugin.properties
View file

@ -16,8 +16,4 @@ makeproject.name=Make Project
genericmake.name=Generic Make genericmake.name=Generic Make
makebuildmodel.name=Make Builder makebuildmodel.name=Make Builder
ManagedBuildNature.name=Managed C/C++ Build Nature
GeneratedMakefileCBuilder.name=Generated Makefile C/C++ Builder
CTaskName=C/C++ Task CTaskName=C/C++ Task

51
core/org.eclipse.cdt.core/plugin.xml
View file

@ -69,7 +69,6 @@
<extension-point id="CTool" name="C/C++ Tool" schema="schema/CTool.exsd"/> <extension-point id="CTool" name="C/C++ Tool" schema="schema/CTool.exsd"/>
<extension-point id="CBuildVariable" name="C/C++ Build Variable" schema="schema/CBuildVariable.exsd"/> <extension-point id="CBuildVariable" name="C/C++ Build Variable" schema="schema/CBuildVariable.exsd"/>
<extension-point id="CToolType" name="C/C++ Tool Type" schema="schema/CToolType.exsd"/> <extension-point id="CToolType" name="C/C++ Tool Type" schema="schema/CToolType.exsd"/>
<extension-point id="ManagedBuildInfo" name="Managed Build Tools" schema="schema/ManagedBuildTools.exsd"/>
<extension-point id="ScannerInfoProvider" name="Scanner Information Provider"/> <extension-point id="ScannerInfoProvider" name="Scanner Information Provider"/>
@ -219,22 +218,6 @@
</builder> </builder>
</extension> </extension>
<!-- =================================================================================== -->
<!-- Extension Point: ???????????????? -->
<!-- =================================================================================== -->
<extension
id="genmakebuilder"
name="%GeneratedMakefileCBuilder.name"
point="org.eclipse.core.resources.builders">
<builder
hasNature="true">
<run
class="org.eclipse.cdt.internal.core.GeneratedMakefileBuilder">
</run>
</builder>
</extension>
<!-- =================================================================================== --> <!-- =================================================================================== -->
<!-- CDT customized problem markers: C Problem markers --> <!-- CDT customized problem markers: C Problem markers -->
<!-- =================================================================================== --> <!-- =================================================================================== -->
@ -281,26 +264,6 @@
</runtime> </runtime>
</extension> </extension>
<!-- =================================================================================== -->
<!-- Extension Point: ???????????????? -->
<!-- =================================================================================== -->
<extension
id="managedBuildNature"
name="%ManagedBuildNature.name"
point="org.eclipse.core.resources.natures">
<requires-nature
id="org.eclipse.cdt.core.cnature">
</requires-nature>
<runtime>
<run
class="org.eclipse.cdt.core.ManagedCProjectNature">
</run>
</runtime>
<builder
id="org.eclipse.cdt.core.genmakebuilder">
</builder>
</extension>
<!-- =================================================================================== --> <!-- =================================================================================== -->
<!-- Deprecated Make default command, will be removed. --> <!-- Deprecated Make default command, will be removed. -->
@ -431,20 +394,6 @@
</ignore> </ignore>
</extension> </extension>
<!-- =================================================================================== -->
<!-- Extension Point(Note:Temporary): IScannerInfoProvider for the managed Builder -->
<!-- =================================================================================== -->
<extension
id="ManagedBuildManager"
point="org.eclipse.cdt.core.ScannerInfoProvider">
<cextension>
<run
class="org.eclipse.cdt.core.build.managed.ManagedBuildManager">
</run>
</cextension>
</extension>
<!-- =================================================================================== --> <!-- =================================================================================== -->
<!-- Extension Point(Note:Temporary): IScannerInfoProvider for the standard Builder --> <!-- Extension Point(Note:Temporary): IScannerInfoProvider for the standard Builder -->
<!-- =================================================================================== --> <!-- =================================================================================== -->

14
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePluginResources.properties
View file

@ -5,17 +5,3 @@
# #
################################################ ################################################
CBuilder.build_error= Build Error CBuilder.build_error= Build Error
# Generated makefile builder messages
MakeBuilder.message.starting = Starting the build for project {0}
MakeBuilder.message.rebuild = Regenerating makefiles for project {0}
MakeBuilder.message.incremental = Updating makefiles for project {0}
MakeBuilder.message.make = Calling {0} for project {1}
MakeBuilder.message.error = Build error
MakeBuilder.message.finished = Build complete for project {0}
MakeBuilder.comment.module.list = # Every subdirectory with source files must be described here
MakeBuilder.comment.source.list = # Each subdirectory must contribute its source files here
MakeBuilder.comment.build.rule = # Each subdirectory must supply rules for building sources it contributes
MakeBuilder.comment.module.make.includes = # Include the makefiles for each source subdirectory
MakeBuilder.comment.module.dep.includes = # Include automatically-generated dependency list:
MakeBuilder.comment.autodeps = # Automatically-generated dependency list:

1
core/org.eclipse.cdt.ui/.classpath
View file

@ -2,7 +2,6 @@
<classpath> <classpath>
<classpathentry kind="src" path="src/"/> <classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="utils.ui/"/> <classpathentry kind="src" path="utils.ui/"/>
<classpathentry kind="src" path="build"/>
<classpathentry kind="src" path="/org.eclipse.ui"/> <classpathentry kind="src" path="/org.eclipse.ui"/>
<classpathentry kind="src" path="/org.eclipse.core.resources"/> <classpathentry kind="src" path="/org.eclipse.core.resources"/>
<classpathentry kind="src" path="/org.apache.xerces"/> <classpathentry kind="src" path="/org.apache.xerces"/>

181
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/wizards/ConfigurationBlock.java
View file

@ -1,181 +0,0 @@
package org.eclipse.cdt.ui.build.wizards;
/**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v0.5
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v05.html
*
* Contributors:
* Rational Software - Initial API and implementation
***********************************************************************/
import org.eclipse.cdt.core.CProjectNature;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.wizards.IWizardTab;
import org.eclipse.cdt.utils.ui.controls.ControlFactory;
import org.eclipse.cdt.utils.ui.controls.RadioButtonsArea;
import org.eclipse.cdt.utils.ui.swt.IValidation;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
public class ConfigurationBlock implements IWizardTab {
/* (non-Javadoc)
* String constants
*/
private static final String PREFIX = "ConfigurationBlock"; //$NON-NLS-1$
private static final String TYPE = PREFIX + ".type"; //$NON-NLS-1$
private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$
private static final String APP = TYPE + ".app"; //$NON-NLS-1$
private static final String DLL = TYPE + ".shared"; //$NON-NLS-1$
private static final String LIB = TYPE + ".static"; //$NON-NLS-1$
private static final String BUILD = PREFIX + ".build"; //$NON-NLS-1$
private static final String BUILD_LABEL = BUILD + ".label"; //$NON-NLS-1$
private static final String CONT = BUILD + ".continue"; //$NON-NLS-1$
private static final String STOP = BUILD + ".stop"; //$NON-NLS-1$
/* (non-Javadoc)
* Bookeeping variables
*/
private IValidation page;
private ManagedProjectWizard fWizard;
/* (non-Javadoc)
* Widgets used on the tab
*/
protected Composite composite;
protected GridData gd;
protected RadioButtonsArea typeRadioButtons;
private String [][] types;
private static final String APP_ARG = "exe"; //$NON-NLS-1$
private static final String DLL_ARG = "dll"; //$NON-NLS-1$
private static final String LIB_ARG = "lib"; //$NON-NLS-1$
protected RadioButtonsArea optRadioButtons;
private String [][] opts;
private static final String CONT_ARG = "cont"; //$NON-NLS-1$
private static final String STOP_ARG = "stop"; //$NON-NLS-1$
public ConfigurationBlock(IValidation valid, ManagedProjectWizard wizard) {
page = valid;
fWizard = wizard;
}
/**
* @see org.eclipse.cdt.ui.wizards.IWizardTab#getLabel()
*/
public String getLabel() {
return CUIPlugin.getResourceString(LABEL);
}
/**
* @see org.eclipse.cdt.ui.wizards.IWizardTab#getImage()
*/
public Image getImage() {
// return CPluginImages.get(CPluginImages.IMG_BUILD_CONFIG);
return null;
}
/**
* @see org.eclipse.cdt.ui.wizards.IWizardTab#getControl(org.eclipse.swt.widgets.Composite)
*/
public Composite getControl(Composite parent) {
// Create the composite control for the tab
composite = ControlFactory.createComposite(parent, 2);
// Create the application type selection area and select the application option
types = new String [][] {
{CUIPlugin.getResourceString(APP), APP_ARG},
{CUIPlugin.getResourceString(DLL), DLL_ARG},
{CUIPlugin.getResourceString(LIB), LIB_ARG}
};
typeRadioButtons = new RadioButtonsArea(composite, CUIPlugin.getResourceString(TYPE), 1, types);
typeRadioButtons.addListener(SWT.Selection, new Listener () {
public void handleEvent(Event e) {
page.setComplete(isValid());
}
});
gd = new GridData();
gd.horizontalSpan = 2;
gd.horizontalAlignment = GridData.FILL;
gd.grabExcessHorizontalSpace = true;
typeRadioButtons.setLayoutData(gd);
// Create the build option buttons
opts = new String [][] {
{CUIPlugin.getResourceString(CONT), CONT_ARG},
{CUIPlugin.getResourceString(STOP), STOP_ARG}
};
optRadioButtons = new RadioButtonsArea(composite, CUIPlugin.getResourceString(BUILD_LABEL), 1, opts);
gd = new GridData();
gd.horizontalSpan = 2;
gd.horizontalAlignment = GridData.FILL;
gd.grabExcessHorizontalSpace = true;
optRadioButtons.setLayoutData(gd);
// Return the widget
return composite;
}
/**
* @see org.eclipse.cdt.ui.wizards.IWizardTab#isValid()
*/
public boolean isValid() {
return true;
}
/**
* @see org.eclipse.cdt.ui.wizards.IWizardTab#setVisible(boolean)
*/
public void setVisible(boolean visible) {
// Set the executable radio button by default
typeRadioButtons.setSelectedButton(0);
// Set the build option radio button based on the platform default
optRadioButtons.setSelectedButton(0);
}
/**
* @see org.eclipse.cdt.ui.wizards.IWizardTab#doRun(org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IProgressMonitor)
*/
public void doRun(IProject project, IProgressMonitor monitor) {
try {
if (monitor == null) {
monitor = new NullProgressMonitor();
}
monitor.beginTask("Configuration", 1);
// Get the project nature;
CProjectNature nature = (CProjectNature) project.getNature(CProjectNature.C_NATURE_ID);
// Set the build options on the project nature
if (nature != null) {
nature.setStopOnError(isStopOnError());
}
}
catch (CoreException e) {
}
}
/**
* Method isStopOnError.
* @return boolean
*/
private boolean isStopOnError() {
if (optRadioButtons != null) {
return (optRadioButtons.getSelectedValue() == STOP_ARG);
}
return false;
}
}

66
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/wizards/ManagedCCWizard.java
View file

@ -1,66 +0,0 @@
package org.eclipse.cdt.ui.build.wizards;
/**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v0.5
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v05.html
*
* Contributors:
* Rational Software - Initial API and implementation
***********************************************************************/
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.swt.widgets.TabFolder;
/**
* Wizard that creates a new C++ project that uses the managed make system
*/
public class ManagedCCWizard extends ManagedProjectWizard {
private static final String WZ_TITLE = "MngCCWizard.title";
private static final String WZ_DESC = "MngCCWizard.description";
private static final String SETTINGS_TITLE= "MngCCWizardSettings.title"; //$NON-NLS-1$
private static final String SETTINGS_DESC= "MngCCWizardSettings.description"; //$NON-NLS-1$
public ManagedCCWizard() {
this(CUIPlugin.getResourceString(WZ_TITLE), CUIPlugin.getResourceString(WZ_DESC));
}
public ManagedCCWizard(String title, String desc) {
super(title, desc);
}
public void addTabItems(TabFolder folder) {
super.addTabItems(folder);
fTabFolderPage.setTitle(CUIPlugin.getResourceString(SETTINGS_TITLE));
fTabFolderPage.setDescription(CUIPlugin.getResourceString(SETTINGS_DESC));
}
protected void doRun(IProgressMonitor monitor) throws CoreException {
monitor.beginTask("Creating Generated C++ Make Project", 4);
super.doRun(monitor);
// Add C++ and managed build natures
if (newProject != null) {
if (monitor == null) {
monitor = new NullProgressMonitor();
}
// Add C++ Nature to the newly created project.
monitor.subTask("Adding C++ Nature");
CCorePlugin.getDefault().convertProjectFromCtoCC(newProject, monitor);
monitor.worked(1);
// Add the managed build nature to the project
monitor.subTask("Adding makefile generator");
addManagedBuildNature(newProject, monitor);
monitor.worked(1);
monitor.done();
}
}
}

61
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/wizards/ManagedCWizard.java
View file

@ -1,61 +0,0 @@
package org.eclipse.cdt.ui.build.wizards;
/**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v0.5
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v05.html
*
* Contributors:
* Rational Software - Initial API and implementation
***********************************************************************/
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.swt.widgets.TabFolder;
/**
* Wizard to create a new C project that uses the managed make system.
*/
public class ManagedCWizard extends ManagedProjectWizard {
private static final String WZ_TITLE = "MngCWizard.title";
private static final String WZ_DESC = "MngCWizard.description";
private static final String SETTINGS_TITLE= "MngCWizardSettings.title"; //$NON-NLS-1$
private static final String SETTINGS_DESC= "MngCWizardSettings.description"; //$NON-NLS-1$
public ManagedCWizard() {
this(CUIPlugin.getResourceString(WZ_TITLE), CUIPlugin.getResourceString(WZ_DESC));
}
public ManagedCWizard(String title, String desc) {
super(title, desc);
}
public void addTabItems(TabFolder folder) {
super.addTabItems(folder);
fTabFolderPage.setTitle(CUIPlugin.getResourceString(SETTINGS_TITLE));
fTabFolderPage.setDescription(CUIPlugin.getResourceString(SETTINGS_DESC));
}
protected void doRun(IProgressMonitor monitor) throws CoreException {
// Let the super class create and populate the standard project
super.doRun(monitor);
// Add the managed build nature
if (newProject != null) {
if (monitor == null) {
monitor = new NullProgressMonitor();
}
monitor.beginTask("Creating Generated C Make Project", 3);
// Add the managed build nature to the project
addManagedBuildNature(newProject, monitor);
monitor.done();
}
}
}

214
core/org.eclipse.cdt.ui/build/org/eclipse/cdt/ui/build/wizards/ManagedProjectWizard.java
View file

@ -1,214 +0,0 @@
package org.eclipse.cdt.ui.build.wizards;
/**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v0.5
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v05.html
*
* Contributors:
* Rational Software - Initial API and implementation
***********************************************************************/
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.ICDescriptor;
import org.eclipse.cdt.core.ManagedCProjectNature;
import org.eclipse.cdt.core.build.managed.BuildException;
import org.eclipse.cdt.core.build.managed.IConfiguration;
import org.eclipse.cdt.core.build.managed.ITarget;
import org.eclipse.cdt.core.build.managed.ManagedBuildManager;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.wizards.BinaryParserBlock;
import org.eclipse.cdt.ui.wizards.CProjectWizard;
import org.eclipse.cdt.ui.wizards.CProjectWizardPage;
import org.eclipse.cdt.ui.wizards.ReferenceBlock;
import org.eclipse.cdt.ui.wizards.TabFolderPage;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
public abstract class ManagedProjectWizard extends CProjectWizard {
/* (non-Javadoc)
* String constants
*/
protected static final String PREFIX = "MngMakeProjectWizard"; //$NON-NLS-1$
protected static final String OP_ERROR= PREFIX + ".op_error"; //$NON-NLS-1$
protected static final String WZ_TITLE= PREFIX + ".title"; //$NON-NLS-1$
protected static final String WZ_DESC= PREFIX + ".description"; //$NON-NLS-1$
protected static final String SETTINGS_TITLE= "MngMakeWizardSettings.title"; //$NON-NLS-1$
protected static final String SETTINGS_DESC= "MngMakeWizardSettings.description"; //$NON-NLS-1$
/* (non-Javadoc)
* Wizard has a page inherited from super class for setting project
* location, one for choosing the platform and a tabbed page to set
* configuration options
*/
protected CProjectPlatformPage targetConfigurationPage;
protected ConfigurationBlock configBlock;
protected ReferenceBlock referenceBlock;
protected BinaryParserBlock binaryParserBlock;
/**
* Default Constructor
*/
public ManagedProjectWizard() {
this(CUIPlugin.getResourceString(WZ_TITLE), CUIPlugin.getResourceString(WZ_DESC));
}
/**
* @see org.eclipse.cdt.ui.wizards.CProjectWizard#CProjectWizard(java.lang.String, java.lang.String)
*/
public ManagedProjectWizard(String title, String desc) {
super(title,desc);
}
public void addManagedBuildNature (IProject project, IProgressMonitor monitor) {
// Add the managed build nature
try {
monitor.subTask("Adding Managed Nature");
ManagedCProjectNature.addManagedNature(project, monitor);
monitor.worked(1);
} catch (CoreException e) {
e.printStackTrace();
}
// Add the builder
try {
monitor.subTask("Adding Makefile Generator");
ManagedCProjectNature.addManagedBuilder(project, monitor);
monitor.worked(1);
} catch (CoreException e) {
// TODO: handle exception
}
// Add the target to the project
try {
ITarget parent = targetConfigurationPage.getSelectedTarget();
ITarget newTarget = ManagedBuildManager.createTarget(project, parent);
if (newTarget != null) {
// TODO add name entry field to project
String artifactName = project.getName();
artifactName += parent.getDefaultExtension().length() == 0 ? "" : "." + parent.getDefaultExtension();
newTarget.setBuildArtifact(artifactName);
IConfiguration [] selectedConfigs = targetConfigurationPage.getSelectedConfigurations();
for (int i = 0; i < selectedConfigs.length; i++) {
IConfiguration config = selectedConfigs[i];
newTarget.createConfiguration(config, config.getId() + "." + i);
}
// Now add the first config in the list as the default
IConfiguration[] newConfigs = newTarget.getConfigurations();
if (newConfigs.length > 0) {
ManagedBuildManager.setDefaultConfiguration(project, newConfigs[0]);
}
}
} catch (BuildException e) {
e.printStackTrace();
}
// Associate the project with the managed builder so the clients can get proper information
try {
ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(project);
desc.remove(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID);
desc.create(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID, ManagedBuildManager.INTERFACE_IDENTITY);
} catch (CoreException e) {
// TODO Flag the error to the user
}
// Save the build options
monitor.subTask("Saving new build options.");
ManagedBuildManager.saveBuildInfo(project);
monitor.worked(1);
}
/**
* @see Wizard#createPages
*/
public void addPages() {
// Add the page to name the project and set the location
fMainPage= new CProjectWizardPage(this, new String());
fMainPage.setTitle(CUIPlugin.getResourceString(WZ_TITLE));
fMainPage.setDescription(CUIPlugin.getResourceString(WZ_DESC));
addPage(fMainPage);
// Add a page to chose the build platform
targetConfigurationPage = new CProjectPlatformPage(this, new String());
targetConfigurationPage.setTitle(CUIPlugin.getResourceString(WZ_TITLE));
targetConfigurationPage.setDescription(CUIPlugin.getResourceString(WZ_DESC));
addPage(targetConfigurationPage);
// Add the tab container
fTabFolderPage = new TabFolderPage(this);
addPage(fTabFolderPage);
}
/**
* @see org.eclipse.cdt.ui.wizards.CProjectWizard#addTabItems(org.eclipse.swt.widgets.TabFolder)
*/
public void addTabItems(TabFolder folder) {
fTabFolderPage.setTitle(CUIPlugin.getResourceString(SETTINGS_TITLE));
fTabFolderPage.setDescription(CUIPlugin.getResourceString(SETTINGS_DESC));
// Add the tab to set the project dependencies
referenceBlock = new ReferenceBlock(getValidation());
TabItem item2 = new TabItem(folder, SWT.NONE);
item2.setText(referenceBlock.getLabel());
Image img2 = referenceBlock.getImage();
if (img2 != null)
item2.setImage(img2);
item2.setData(referenceBlock);
item2.setControl(referenceBlock.getControl(folder));
addTabItem(referenceBlock);
// add the tab to select which parser to use for binaries
binaryParserBlock = new BinaryParserBlock(getValidation());
TabItem item3 = new TabItem(folder, SWT.NONE);
item3.setText(binaryParserBlock.getLabel());
Image img3 = binaryParserBlock.getImage();
if (img3 != null)
item3.setImage(img3);
item3.setData(binaryParserBlock);
item3.setControl(binaryParserBlock.getControl(folder));
addTabItem(binaryParserBlock);
}
protected void doRunPrologue(IProgressMonitor monitor) {
}
protected void doRunEpilogue(IProgressMonitor monitor) {
}
protected void doRun(IProgressMonitor monitor) throws CoreException {
// super.doRun() just creates the project and does not assign a builder to it.
super.doRun(monitor);
// Modify the project based on what the user has selected
if (newProject != null) {
if (monitor == null) {
monitor = new NullProgressMonitor();
}
// Update the referenced project if provided.
monitor.subTask("Adding project references");
if (referenceBlock != null) {
referenceBlock.doRun(newProject, new SubProgressMonitor(monitor, 1));
}
monitor.worked(1);
// Update the binary parser
monitor.subTask("Setting binary parser");
if (binaryParserBlock != null) {
binaryParserBlock.doRun(newProject, new SubProgressMonitor(monitor, 1));
}
monitor.worked(1);
}
}
public String getProjectID() {
return CCorePlugin.PLUGIN_ID + ".make";
}
}

20
core/org.eclipse.cdt.ui/plugin.properties
View file

@ -18,15 +18,11 @@ MakeView.name=Make Targets
newCWizardsCategory.name=C newCWizardsCategory.name=C
StdCWizard.name=Standard Make C Project StdCWizard.name=Standard Make C Project
StdCWizard.description=Create a new C project and let me create and manage the makefile StdCWizard.description=Create a new C project and let me create and manage the makefile
MngCWizard.name=Managed Make C Project
MngCWizard.description=Create a new C project and let Eclipse create and manage the makefile
# C++ # C++
newCCWizardsCategory.name=C++ newCCWizardsCategory.name=C++
StdCCWizard.name=Standard Make C++ Project StdCCWizard.name=Standard Make C++ Project
StdCCWizard.description=Create a new C++ project and let me create and manage the makefile StdCCWizard.description=Create a new C++ project and let me create and manage the makefile
MngCCWizard.name=Managed Make C++ Project
MngCCWizard.description=Create a new C++ project and let Eclipse create and manage the makefile
#Project Conversion #Project Conversion
ConversionWizard.name=Convert a project's nature ConversionWizard.name=Convert a project's nature
@ -87,22 +83,6 @@ CFolderActionSet.description=C Folder Action Set
# Task Action # Task Action
DeleteTaskAction.label=Delete C/C++ Markers DeleteTaskAction.label=Delete C/C++ Markers
# Build Model Names
ConfigName.Rel=Release
ConfigName.Dbg=Debug
ToolName.preprocessor = Preprocessor
ToolName.compiler = Compiler
ToolName.archiver = Archiver
ToolName.linker = Linker
OptionCategory.Preproc = Preprocessor
OptionCategory.Dirs = Directories
OptionCategory.General = General
OptionCategory.Optimize=Optimization
OptionCategory.Debug=Debugging
OptionCategory.Warn=Warnings
OptionCategory.Misc=Miscellaneous
OptionCategory.Libs=Libraries
# C/C++ Search # C/C++ Search
CSearchPage.label= C/C++ Search CSearchPage.label= C/C++ Search
openCSearchPageAction.label= &C/C++... openCSearchPageAction.label= &C/C++...

1504
core/org.eclipse.cdt.ui/plugin.xml
View file

File diff suppressed because it is too large Load diff

19
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
View file

@ -35,7 +35,6 @@ public class CPluginImages {
private static final int NAME_PREFIX_LENGTH= NAME_PREFIX.length(); private static final int NAME_PREFIX_LENGTH= NAME_PREFIX.length();
private static final String T= "full/"; private static final String T= "full/";
public static final String T_BUILD= T + "build16/";
public static final String T_OBJ= T + "obj16/"; public static final String T_OBJ= T + "obj16/";
public static final String T_WIZBAN= T + "wizban/"; public static final String T_WIZBAN= T + "wizban/";
public static final String T_LCL= "lcl16/"; public static final String T_LCL= "lcl16/";
@ -148,24 +147,6 @@ public class CPluginImages {
public static final String IMG_OBJS_BUILD= NAME_PREFIX + "build_menu.gif"; public static final String IMG_OBJS_BUILD= NAME_PREFIX + "build_menu.gif";
public static final ImageDescriptor DESC_BUILD_MENU = createManaged(T_OBJ, IMG_OBJS_BUILD); public static final ImageDescriptor DESC_BUILD_MENU = createManaged(T_OBJ, IMG_OBJS_BUILD);
// For the managed build images
public static final String IMG_BUILD_CONFIG = NAME_PREFIX + "build_configs.gif";
public static final ImageDescriptor DESC_BUILD_CONFIG = createManaged(T_BUILD, IMG_BUILD_CONFIG);
public static final String IMG_BUILD_COMPILER = NAME_PREFIX + "config-compiler.gif";
public static final ImageDescriptor DESC_BUILD_COMPILER = createManaged(T_BUILD, IMG_BUILD_COMPILER);
public static final String IMG_BUILD_LINKER = NAME_PREFIX + "config-linker.gif";
public static final ImageDescriptor DESC_BUILD_LINKER = createManaged(T_BUILD, IMG_BUILD_LINKER);
public static final String IMG_BUILD_LIBRARIAN = NAME_PREFIX + "config-librarian.gif";
public static final ImageDescriptor DESC_BUILD_LIBRARIAN = createManaged(T_BUILD, IMG_BUILD_LIBRARIAN);
public static final String IMG_BUILD_COMMAND = NAME_PREFIX + "config-command.gif";
public static final ImageDescriptor DESC_BUILD_COMMAND = createManaged(T_BUILD, IMG_BUILD_COMMAND);
public static final String IMG_BUILD_PREPROCESSOR = NAME_PREFIX + "config-preprocessor.gif";
public static final ImageDescriptor DESC_BUILD_PREPROCESSOR = createManaged(T_BUILD, IMG_BUILD_PREPROCESSOR);
public static final String IMG_BUILD_TOOL = NAME_PREFIX + "config-tool.gif";
public static final ImageDescriptor DESC_BUILD_TOOL = createManaged(T_BUILD, IMG_BUILD_TOOL);
public static final String IMG_BUILD_CAT = NAME_PREFIX + "config-category.gif";
public static final ImageDescriptor DESC_BUILD_CAT = createManaged(T_BUILD, IMG_BUILD_CAT);
//for search //for search
public static final String IMG_OBJS_SEARCH_REF = NAME_PREFIX + "search_ref_obj.gif"; public static final String IMG_OBJS_SEARCH_REF = NAME_PREFIX + "search_ref_obj.gif";
public static final String IMG_OBJS_SEARCH_DECL = NAME_PREFIX + "search_decl_obj.gif"; public static final String IMG_OBJS_SEARCH_DECL = NAME_PREFIX + "search_decl_obj.gif";

22
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties
View file

@ -329,20 +329,6 @@ CreateFolderAction.text = F&older
# ------- Drag and Drop Message Text ----------- # ------- Drag and Drop Message Text -----------
CViewDragNDrop.txt = already exists. Would you like to overwrite it? CViewDragNDrop.txt = already exists. Would you like to overwrite it?
# ----------- Build Property Page -----------
BuildPropertyPage.label.Platform=Platform:
BuildPropertyPage.label.Configuration=Configuration:
BuildPropertyPage.label.Active=Active configuration
BuildPropertyPage.label.Settings=Configuration settings
BuildPropertyPage.label.AddConfButton=Manage...
BuildPropertyPage.label.ToolTree=Tools
BuildPropertyPage.label.ToolOptions=Options
BuildPropertyPage.tip.platform=Select a platform for the project
BuildPropertyPage.tip.config=Select the configuration to edit
BuildPropertyPage.tip.addconf=Add configurations for the platform
BuildPropertyPage.tip.remconf=Remove configurations for the platform
BuildPropertyPage.manage.title=Manage Configurations
# ----------- Build Property Common ----------- # ----------- Build Property Common -----------
BuildPropertyCommon.label.title=Enter Value BuildPropertyCommon.label.title=Enter Value
BuildPropertyCommon.label.new=New... BuildPropertyCommon.label.new=New...
@ -353,10 +339,4 @@ BuildPropertyCommon.label.editVar=Edit
BuildPropertyCommon.label.addVar=Add BuildPropertyCommon.label.addVar=Add
BuildPropertyCommon.label.message=Value: BuildPropertyCommon.label.message=Value:
BuildPropertyCommon.label.browse=Browse... BuildPropertyCommon.label.browse=Browse...
BuildPropertyCommon.label.configs=Defined configurations: BuildPropertyCommon.label.configs=Defined configurations:
# ----------- New Configuration -----------
NewConfiguration.label.name=Configuration name:
NewConfiguration.label.copy=Copy settings from:
NewConfiguration.error.title=Error
NewConfiguration.error.duplicateName=A configuration named "{0}" already exists.