[eclipse-cdt] Additional patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660
Jeff Johnston
jjohnstn at fedoraproject.org
Mon Jul 25 18:40:27 UTC 2011
commit 7593a2ca2606909ec0cb178bde88701bf6bd1251
Author: Jeff Johnston <jjohnstn at redhat.com>
Date: Mon Jul 25 14:39:55 2011 -0400
Additional patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660
eclipse-cdt-autotools-reconfigure.patch2 | 30 ++++++++++++++++++++++++++++++
eclipse-cdt.spec | 9 +++++++--
2 files changed, 37 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-cdt-autotools-reconfigure.patch2 b/eclipse-cdt-autotools-reconfigure.patch2
new file mode 100644
index 0000000..8e6d6b6
--- /dev/null
+++ b/eclipse-cdt-autotools-reconfigure.patch2
@@ -0,0 +1,30 @@
+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 261fef6..ea98501 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
+@@ -1245,6 +1245,16 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
+ IPath buildCommand = buildInfo.getBuildCommand();
+ String defaultBuildCommand = buildCommand.toString();
+ String buildArguments = buildInfo.getBuildArguments();
++
++ // Bug #351660 - reset targets to a single dummy target so that
++ // we will never be able to find any of the new targets we are about to
++ // create and thus avoid an extraneous event notification on a change to
++ // the MakeTarget. The dummy target should have an invalid name for
++ // a normal make target.
++ IMakeTarget dummyTarget = makeTargetManager.createTarget(
++ project, "\ndummyTarget\n", targetBuildID); //$NON-NLS-1$
++ makeTargetManager.setTargets(project, new IMakeTarget[]{dummyTarget});
++
+ for (int i = 0; i < targets.length; i++) {
+ target = targets[i].getTarget();
+ String targetName = target.toString();
+@@ -1264,7 +1274,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
+ makeTarget.setBuildAttribute(IMakeTarget.BUILD_ARGUMENTS, buildArguments);
+ makeTarget.setBuildAttribute(IMakeTarget.BUILD_COMMAND, defaultBuildCommand);
+
+- makeTarget.setBuildAttribute(GENERATED_TARGET, "true");
++ makeTarget.setBuildAttribute(GENERATED_TARGET, "true"); //$NON-NLS-1$
+ makeTarget.setBuildAttribute(IMakeTarget.BUILD_TARGET,
+ targetName);
+
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 28bb5ad..9664660 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: 4%{?dist}
+Release: 5%{?dist}
License: EPL and CPL
Group: Development/Tools
URL: http://www.eclipse.org/cdt
@@ -110,9 +110,10 @@ Patch19: %{name}-autotools-local.patch
# Adds new public API to org.eclipse.cdt.core.ErrorParserManager.java
Patch20: %{name}-addProblemMarker.patch
-# Fix for Autotools reconfiguring stalling
+# Fixes for Autotools reconfiguring stalling
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660
Patch21: %{name}-autotools-reconfigure.patch
+Patch22: %{name}-autotools-reconfigure.patch2
BuildRequires: eclipse-pde >= 1:3.7.0
BuildRequires: eclipse-rse >= 3.2
@@ -212,6 +213,7 @@ pushd autotools
tar -xzf %{SOURCE1}
%patch19 -p0
%patch21 -p2
+%patch22 -p2
pushd org.eclipse.linuxtools.cdt.autotools.core
mkdir macros
pushd macros
@@ -587,6 +589,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Mon Jul 25 2011 Jeff Johnston <jjohnstn at redhat.com> 1:8.0.0-5
+- Additional patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660
+
* Thu Jul 21 2011 Jeff Johnston <jjohnstn at redhat.com> 1:8.0.0-4
- Patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660
More information about the scm-commits
mailing list