Bump to 4.0.0 which integrates CDT 8.4 Luna

mbats · Sep 11, 2014 · f5a5a2e · f5a5a2e
1 parent 61acff9
commit f5a5a2e
Show file tree

Hide file tree

Showing 42 changed files with 448 additions and 429 deletions.
diff --git a/org.buildroot.cdt.toolchain.build/pom.xml b/org.buildroot.cdt.toolchain.build/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.buildroot.cdt.toolchain.parent</groupId>
 	<artifactId>buildroot-parent</artifactId>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Buildroot Toolchain</name>
@@ -49,14 +49,14 @@
 	<repositories>
 	<!-- Common -->
 		<repository>
-			<id>Kepler</id>
+			<id>Luna</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/releases/kepler</url>
+			<url>http://download.eclipse.org/releases/luna</url>
 		</repository>
 		<repository>
 			<id>The Eclipse Project Updates</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/eclipse/updates/4.3</url>
+			<url>http://download.eclipse.org/eclipse/updates/4.4</url>
 		</repository>
 		<repository>
 			<id>Pkg-config Eclipse Support</id>

diff --git a/org.buildroot.cdt.toolchain.feature/feature.xml b/org.buildroot.cdt.toolchain.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.buildroot.cdt.toolchain.feature"
       label="Buildroot Toolchain"
-      version="3.2.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="Buildroot Project">
 
    <description url="https://github.com/mbats/eclipse-buildroot-toolchain-plugin">

diff --git a/org.buildroot.cdt.toolchain.feature/pom.xml b/org.buildroot.cdt.toolchain.feature/pom.xml
@@ -8,11 +8,11 @@
 	<parent>
 		<groupId>org.buildroot.cdt.toolchain.parent</groupId>
 		<artifactId>buildroot-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>../org.buildroot.cdt.toolchain.build</relativePath>
 	</parent>
 
 	<artifactId>org.buildroot.cdt.toolchain.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 </project>
diff --git a/org.buildroot.cdt.toolchain.update/pom.xml b/org.buildroot.cdt.toolchain.update/pom.xml
@@ -8,11 +8,11 @@
 	<parent>
 		<groupId>org.buildroot.cdt.toolchain.parent</groupId>
 		<artifactId>buildroot-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>../org.buildroot.cdt.toolchain.build</relativePath>
 	</parent>
 
 	<artifactId>org.buildroot.cdt.toolchain.update</artifactId>
 	<packaging>eclipse-repository</packaging>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 </project>
diff --git a/org.buildroot.cdt.toolchain/META-INF/MANIFEST.MF b/org.buildroot.cdt.toolchain/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Buildroot Toolchain
 Bundle-SymbolicName: org.buildroot.cdt.toolchain;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.buildroot.cdt.toolchain.BuildrootActivator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/org.buildroot.cdt.toolchain/pom.xml b/org.buildroot.cdt.toolchain/pom.xml
@@ -8,13 +8,13 @@
 	<parent>
 		<groupId>org.buildroot.cdt.toolchain.parent</groupId>
 		<artifactId>buildroot-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>../org.buildroot.cdt.toolchain.build</relativePath>
 	</parent>
 
 	<artifactId>org.buildroot.cdt.toolchain</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 
 
 	<build>

diff --git a/org.eclipse.cdt.autotools.core/.classpath b/org.eclipse.cdt.autotools.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.cdt.autotools.core/.gitignore b/org.eclipse.cdt.autotools.core/.gitignore
@@ -3,3 +3,54 @@ bin
 javaCompiler...args
 build.xml
 target
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
diff --git a/org.eclipse.cdt.autotools.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.cdt.autotools.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF b/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.cdt.autotools.core;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-Activator: org.eclipse.cdt.autotools.core.AutotoolsPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="3.4.0",
@@ -23,11 +23,13 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.4.0",
  org.eclipse.help;bundle-version="3.3.100",
  org.eclipse.core.variables;bundle-version="3.2.100",
  org.eclipse.ui.views;bundle-version="3.3.0",
- org.eclipse.core.filesystem;bundle-version="1.2.0"
+ org.eclipse.core.filesystem;bundle-version="1.2.0",
+ org.eclipse.remote.core;bundle-version="1.0.0",
+ org.eclipse.cdt.remote.core;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %provider
 Export-Package: org.eclipse.cdt.autotools.core,
  org.eclipse.cdt.internal.autotools.core,
- org.eclipse.cdt.internal.autotools.core.configure
-nt: J2SE-1.5
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ org.eclipse.cdt.internal.autotools.core.configure,
+ org.eclipse.cdt.internal.autotools.core.wizards;x-internal:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/org.eclipse.cdt.autotools.core/plugin.xml b/org.eclipse.cdt.autotools.core/plugin.xml
@@ -392,7 +392,7 @@
                cleanCommand="rm -rf"
                errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"
                id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build"
-               languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain}"
+               languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain}"
                name="%Configuration.build.name">
             <toolChain
                   archList="all"

diff --git a/org.eclipse.cdt.autotools.core/pom.xml b/org.eclipse.cdt.autotools.core/pom.xml
@@ -8,13 +8,13 @@
 	<parent>
 		<groupId>org.buildroot.cdt.toolchain.parent</groupId>
 		<artifactId>buildroot-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>../org.buildroot.cdt.toolchain.build</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.autotools.core</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.2.0.qualifier</version>
+	<version>1.4.0.qualifier</version>
 
 
 	<build>

diff --git a/...ipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsNewProjectNature.java b/...ipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsNewProjectNature.java
@@ -39,34 +39,42 @@ public class AutotoolsNewProjectNature implements IProjectNature {
 	public static final String AUTOTOOLS_NATURE_ID = "org.eclipse.cdt.autotools.core.autotoolsNatureV2";  //$NON-NLS-1$
 	public static final String OLD_AUTOTOOLS_NATURE_ID = "org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2"; //$NON-NLS-1$
 	public final static String BUILDER_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + ".genmakebuilder"; //$NON-NLS-1$
+	/**
+	 * @since 1.3
+	 */
+	public final static String REMOTE_BUILDER_ID = "org.eclipse.ptp.rdt.sync.cdt.core.SyncBuilder"; // $NON-NLS-1$
 	public final static String OLD_AUTOTOOLS_BUILDER_ID = "org.eclipse.linuxtools.cdt.autotools.genmakebuilder"; //$NON-NLS-1$
 
 	private IProject project;
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.resources.IProjectNature#configure()
 	 */
+	@Override
 	public void configure() throws CoreException {
 		addAutotoolsBuilder(project, new NullProgressMonitor());
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.resources.IProjectNature#deconfigure()
 	 */
+	@Override
 	public void deconfigure() throws CoreException {
 		// TODO remove builder from here
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.resources.IProjectNature#getProject()
 	 */
+	@Override
 	public IProject getProject() {
 		return project;
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.resources.IProjectNature#setProject(org.eclipse.core.resources.IProject)
 	 */
+	@Override
 	public void setProject(IProject project) {
 		this.project = project;
 	}
@@ -91,11 +99,13 @@ public static void addAutotoolsBuilder(IProject project, IProgressMonitor monito
 			/* (non-Javadoc)
 			 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
 			 */
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
 						protected boolean savedAutoBuildingValue;
 
+						@Override
 						public void run(IProgressMonitor monitor) throws CoreException {
 							IWorkspace workspace = ResourcesPlugin.getWorkspace();
 							turnOffAutoBuild(workspace);
@@ -164,7 +174,10 @@ static ICommand[] getBuildCommandsList(IProjectDescription description,
 					newCommand.setBuilderName(BUILDER_ID);
 					command = newCommand;
 				}
-				if (command.getBuilderName().equals(BUILDER_ID)) {
+				// Make sure that the Autotools builder precedes the Managed builder
+				// or the Remote Synchronized builder.
+				if (command.getBuilderName().equals(BUILDER_ID) ||
+						command.getBuilderName().equals(REMOTE_BUILDER_ID)) {
 					// add Autotools Configuration builder just before builder
 					ICommand newCommand = description.newCommand();
 					newCommand.setBuilderName(AutotoolsConfigurationBuilder.BUILDER_ID);
@@ -246,7 +259,7 @@ public static void removeNature(IProject project, String natureId, IProgressMoni
 		String[] prevNatures = description.getNatureIds();
 		List<String> newNatures = new ArrayList<String>(Arrays.asList(prevNatures));
 		newNatures.remove(natureId);
-		description.setNatureIds((String[])newNatures.toArray(new String[newNatures.size()]));
+		description.setNatureIds(newNatures.toArray(new String[newNatures.size()]));
 		project.setDescription(description, monitor);
 	}
 

diff --git a/...lipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsOptionConstants.java b/...lipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsOptionConstants.java
@@ -40,6 +40,10 @@ public class AutotoolsOptionConstants {
 	public final static String CATEGORY_FEATURES = "features"; // $NON-NLS-1$
 	public final static String OPT_ENABLE_MAINTAINER_MODE = "enable-maintainer-mode"; // $NON-NLS-1$
 	public final static String FLAG_CFLAGS = "CFLAGS"; // $NON-NLS-1$
+	/**
+	 * @since 1.4
+	 */
+	public final static String FLAG_CFLAGS_FLAGS = "CFLAGS|CXXFLAGS"; // $NON-NLS-1$
 	public final static String OPT_CFLAGS_DEBUG = "cflags-debug"; // $NON-NLS-1$
 	public final static String OPT_CFLAGS_GPROF = "cflags-gprof"; // $NON-NLS-1$ 
 	public final static String OPT_CFLAGS_GCOV = "cflags-gcov"; // $NON-NLS-1$