diff --git a/.cvsignore b/.cvsignore index e4e5bcf..d37663f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -17,3 +17,5 @@ eclipse-cdt-fetched-src-autotools-1_0_0.tar.gz eclipse-cdt-fetched-src-CDT_5_0_0.tar.bz2 eclipse-cdt-fetched-src-autotools-1_0_1.tar.gz eclipse-cdt-fetched-src-libhover-1_0_0.tar.gz +eclipse-cdt-fetched-src-autotools-20081106.tar.gz +eclipse-cdt-fetched-src-libhover-20081106.tar.gz diff --git a/eclipse-cdt-managedConfigurations-fix.patch b/eclipse-cdt-managedConfigurations-fix.patch new file mode 100644 index 0000000..3dbb4cb --- /dev/null +++ b/eclipse-cdt-managedConfigurations-fix.patch @@ -0,0 +1,65 @@ +Index: src/org/eclipse/cdt/ui/newui/AbstractPage.java +=================================================================== +RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java,v +retrieving revision 1.63 +diff -u -r1.63 AbstractPage.java +--- src/org/eclipse/cdt/ui/newui/AbstractPage.java 29 May 2008 10:31:51 -0000 1.63 ++++ src/org/eclipse/cdt/ui/newui/AbstractPage.java 6 Nov 2008 00:37:18 -0000 +@@ -68,6 +68,7 @@ + import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation; + import org.eclipse.ui.dialogs.PropertyPage; + ++import org.eclipse.cdt.core.CCorePlugin; + import org.eclipse.cdt.core.model.CoreModel; + import org.eclipse.cdt.core.model.ICElement; + import org.eclipse.cdt.core.model.ICProject; +@@ -79,6 +80,7 @@ + import org.eclipse.cdt.core.settings.model.ICProjectDescription; + import org.eclipse.cdt.core.settings.model.ICResourceDescription; + import org.eclipse.cdt.core.settings.model.MultiItemsHolder; ++import org.eclipse.cdt.core.settings.model.extension.CConfigurationData; + import org.eclipse.cdt.ui.CUIPlugin; + import org.eclipse.cdt.ui.PreferenceConstants; + import org.eclipse.cdt.utils.ui.controls.ControlFactory; +@@ -468,7 +470,7 @@ + * + * @param prj - project description where we'll search (or create) config description + * @param cfg - config description belonging to another project description, +- * it is a sample for search and base for possile creation ++ * it is a sample for search and base for possible creation + * of resulting configuration description. + * + * @return the configuration description (found or created) or null in case of error +@@ -479,11 +481,27 @@ + ICConfigurationDescription c = prj.getConfigurationById(id); + // if there's no cfg found, try to create it + if (c == null) { +- try { +- c = prj.createConfiguration(id, cfg.getName(), cfg); +- c.setDescription(cfg.getDescription()); +- } catch (CoreException e) { +- /* do nothing: c is already null */ ++ // see if this is a configuration that is known to the project description cached by the ++ // CDTPropertyPage (e.g. config has been added via New Configuration Dialog) ++ ICProjectDescription prj2 = CDTPropertyManager.getProjectDescription(AbstractPage.this, getProject()); ++ ICConfigurationDescription c2 = prj2.getConfigurationById(id); ++ if (c2 != null) { ++ // cfg found...let's use the same build system id and create it on the ++ // project description passed in ++ try { ++ CConfigurationData data = cfg.getConfigurationData(); ++ c = prj.createConfiguration(c2.getBuildSystemId(), data); ++ } catch (CoreException e) { ++ /* do nothing: c is already null */ ++ } ++ } else { ++ // not found..let's create it anyway ++ try { ++ CConfigurationData data = cfg.getConfigurationData(); ++ c = prj.createConfiguration(CCorePlugin.DEFAULT_PROVIDER_ID, data); ++ } catch (CoreException e) { ++ /* do nothing: c is already null */ ++ } + } + } + // if creation failed, report an error and return null diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 4ec0a46..d7abdd4 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -20,7 +20,7 @@ Epoch: 1 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: %{majmin}.%{micro} -Release: 10%{?dist} +Release: 11%{?dist} License: EPL and CPL Group: Development/Tools URL: http://www.eclipse.org/cdt diff --git a/sources b/sources index 7e71724..cc0cc3e 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ 5c470fb0777d27541edbfa31443d91f7 eclipse-cdt-cppunit-20061102.tar.gz 2d4ae0a2131ba1efc896d981072cc091 eclipse-cdt-target_filter.gif.gz 8958a138a5d96c9c1fa892e895b29bcd eclipse-cdt-fetched-src-CDT_5_0_0.tar.bz2 -97035338f49f40212ad411ee43065939 eclipse-cdt-fetched-src-autotools-1_0_1.tar.gz -3c0f7f6b7d1686e5aa360762b6c8b379 eclipse-cdt-fetched-src-libhover-1_0_0.tar.gz +7bdfc7cfe88e694903225a858d3442c3 eclipse-cdt-fetched-src-autotools-20081106.tar.gz +621bd568fed245c8368819692a066be9 eclipse-cdt-fetched-src-libhover-20081106.tar.gz