rpms/eclipse-cdt/devel eclipse-cdt-autotools-bug461647.patch, NONE, 1.1 eclipse-cdt.spec, 1.107, 1.108

[Jeff Johnston]

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1149

Modified Files:
	eclipse-cdt.spec 
Added Files:
	eclipse-cdt-autotools-bug461647.patch 
Log Message:

* Tue Sep 09 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.0-6
- Fix for NPE during alteration of Autotools configuration settings.
- Resolves #461647



eclipse-cdt-autotools-bug461647.patch:

--- NEW FILE eclipse-cdt-autotools-bug461647.patch ---
Index: src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
===================================================================
RCS file: /cvs/eclipse/autotools/com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java,v
retrieving revision 1.19
diff -u -r1.19 AutotoolsMakefileBuilder.java
--- src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java	28 Jan 2008 20:45:12 -0000	1.19
+++ src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java	9 Sep 2008 19:16:28 -0000
@@ -50,6 +50,7 @@
 	public static final String BUILDER_ID = AutotoolsPlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$
 	public static final String MANAGED_BUILDER_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$
 	public static final String AUTOTOOLS_CONFIG_ID = AutotoolsPlugin.getUniqueIdentifier() + ".configuration.build"; //$NON-NLS-1$
+	public static final String AUTOTOOLS_PROJECT_TYPE_ID = AutotoolsPlugin.getUniqueIdentifier() + ".projectType"; //$NON-NLS-1$
 	
 	private static final String BUILD_FINISHED = "AutotoolsMakefileBuilder.message.finished";	//$NON-NLS-1$
 	private static final String TYPE_CLEAN = "AutotoolsMakefileBuilder.type.clean";	//$NON-NLS-1$
@@ -76,8 +77,7 @@
 			// then return true.
 			if (project.getNature(ManagedCProjectNature.MNG_NATURE_ID) != null) {
 				IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
-				IConfiguration config = info.getDefaultConfiguration();
-				if (config.getParent().getId().equals(AUTOTOOLS_CONFIG_ID)) {
+				if (info.getManagedProject().getProjectType().getId().equals(AUTOTOOLS_PROJECT_TYPE_ID)) {
 					AutotoolsProjectNature.addAutotoolsBuilder(project, new NullProgressMonitor());
 					AutotoolsPlugin.verifyScannerInfoProvider(project);
 					return true;


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- eclipse-cdt.spec	8 Sep 2008 17:57:59 -0000	1.107
+++ eclipse-cdt.spec	11 Sep 2008 20:12:01 -0000	1.108
@@ -20,7 +20,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -54,11 +54,14 @@
 # Script to run the tests in Xvnc
 Source5: %{name}-runtests.sh
 
+# Don't run the tests as part of the build.  We'll do this ourselves.
+Patch4: %{name}-no-tests-%{version}.patch
+
 # Fix autotools plugin to reference correct project nature.
 Patch5: %{name}-autotools-plugin.patch
 
-# Don't run the tests as part of the build.  We'll do this ourselves.
-Patch4: %{name}-no-tests-%{version}.patch
+# Fix for autotools property settings problem.
+Patch6: %{name}-autotools-bug461647.patch
 
 ## Patch to cppunit code to support double-clicking on file names, classes, and
 ## member names in the Hierarchy and Failure views such that the appropriate
@@ -208,6 +211,7 @@
 tar -xzf %{SOURCE1}
 pushd com.redhat.eclipse.cdt.autotools
 %patch5
+%patch6
 popd
 popd
 
@@ -524,6 +528,10 @@
 %endif
 
 %changelog
+* Tue Sep 09 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.0-6
+- Fix for NPE during alteration of Autotools configuration settings.
+- Resolves #461647
+
 * Thu Sep 04 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.0-5
 - Fix for autotools plugin referencing invalid build nature.
 - Resolves #461201