[eclipse-cdt/f15] Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660
Jeff Johnston
jjohnstn at fedoraproject.org
Thu Jul 21 18:53:30 UTC 2011
commit e179a79e355241f7ccf5c8e28d2a609ec55a514c
Author: Jeff Johnston <jjohnstn at redhat.com>
Date: Thu Jul 21 14:53:10 2011 -0400
Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660
eclipse-cdt-autotools-reconfigure.patch | 21 +++++++++++++++++++++
eclipse-cdt.spec | 12 ++++++++++--
2 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-cdt-autotools-reconfigure.patch b/eclipse-cdt-autotools-reconfigure.patch
new file mode 100644
index 0000000..a421aad
--- /dev/null
+++ b/eclipse-cdt-autotools-reconfigure.patch
@@ -0,0 +1,21 @@
+diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
+index 2676526..261fef6 100644
+--- a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
++++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
+@@ -1251,10 +1251,12 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
+ if (!isValidTarget(targetName, makeTargetManager))
+ continue;
+ try {
+- IMakeTarget makeTarget = makeTargetManager.findTarget(project, targetName);
+- if (makeTarget == null)
+- makeTarget = makeTargetManager.createTarget(
+- project, targetName, targetBuildID);
++ // Bug #351660 - always create a new MakeTarget because an
++ // existing MakeTarget will cause events to occur on every
++ // modification whereas a new MakeTarget not yet added will
++ // not cause this delay.
++ IMakeTarget makeTarget = makeTargetManager.createTarget(
++ project, targetName, targetBuildID);
+ makeTarget.setContainer(project);
+ makeTarget.setStopOnError(isStopOnError);
+ makeTarget.setRunAllBuilders(false);
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 06c72a8..cfad29d 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -22,7 +22,7 @@ Epoch: 1
Summary: Eclipse C/C++ Development Tools (CDT) plugin
Name: eclipse-cdt
Version: %{majmin}.%{micro}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: EPL and CPL
Group: Development/Tools
URL: http://www.eclipse.org/cdt
@@ -103,7 +103,11 @@ Patch17: %{name}-ppc64-add_xopen_source-include.patch
# in the plugin.
Patch19: %{name}-autotools-local.patch
-BuildRequires: eclipse-pde >= 3.6.2
+# Patch for autotools reconfiguring delay issue
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660
+Patch20: %{name}-autotools-reconfigure.patch
+
+BuildRequires: eclipse-pde >= 1:3.6.2
BuildRequires: eclipse-rse >= 3.1.1
BuildRequires: java-devel >= 1.4.2
BuildRequires: objectweb-asm >= 3.2
@@ -198,6 +202,7 @@ mkdir autotools
pushd autotools
tar -xzf %{SOURCE1}
%patch19 -p0
+%patch20 -p2
pushd org.eclipse.linuxtools.cdt.autotools.core
mkdir macros
pushd macros
@@ -564,6 +569,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Thu Jul 21 2011 Jeff Johnston <jjohnstn at redhat.com> 1:7.0.2-2
+- Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660
+
* Fri May 06 2011 Jeff Johnston <jjohnstn at redhat.com> 1:7.0.2-1
- Rebase CDT to 7.0.2
- Rebase Autotools and Libhover to use tarballs from git repo.
More information about the scm-commits
mailing list