[eclipse-cdt/f19] Remove trace-back when spawner library is not found.

Jeff Johnston jjohnstn at fedoraproject.org
Tue Apr 30 22:41:30 UTC 2013 

commit bac666b3583df66f926d3b24c8c43c4a775c66a1
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Tue Apr 30 18:41:07 2013 -0400

    Remove trace-back when spawner library is not found.
    
    - Fix libhover source plugin generation.
    - Add fix for bug 405904 concerning gprof link options.

 eclipse-cdt-bug405904.patch                     |   15 ++++++++++++
 eclipse-cdt-libhover-libstdcxx-properties.patch |    9 +++++++
 eclipse-cdt-libhover-libstdcxx-source.patch     |   27 +++++++++++++++++++++++
 eclipse-cdt-spawner-issue.patch                 |   12 ++++++++++
 eclipse-cdt.spec                                |   21 +++++++++++++++++-
 5 files changed, 83 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-cdt-bug405904.patch b/eclipse-cdt-bug405904.patch
new file mode 100644
index 0000000..e99e1a7
--- /dev/null
+++ b/eclipse-cdt-bug405904.patch
@@ -0,0 +1,15 @@
+diff -up ./build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java.fix ./build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
+--- ./build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java.fix	2013-04-22 13:57:32.000000000 -0400
++++ ./build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java	2013-04-22 14:00:39.000000000 -0400
+@@ -2585,6 +2585,11 @@ public class Tool extends HoldsOptions i
+ 					!(applicabilityCalculator instanceof BooleanExpressionApplicabilityCalculator)) {
+ 					if (option.getSuperClass() != null)
+ 						option = getOptionBySuperClassId(option.getSuperClass().getId());
++					// bug #405904 - if the option is an extension element (first time we build),
++					// use the option id as a superclass id, otherwise we won't find the option we may have just
++					// set and will end up with the default setting
++					else if (option.isExtensionElement())
++						option = getOptionBySuperClassId(option.getId());
+ 					else
+ 						option = getOptionById(option.getId());
+ 				}
diff --git a/eclipse-cdt-libhover-libstdcxx-properties.patch b/eclipse-cdt-libhover-libstdcxx-properties.patch
new file mode 100644
index 0000000..0f99571
--- /dev/null
+++ b/eclipse-cdt-libhover-libstdcxx-properties.patch
@@ -0,0 +1,9 @@
+diff -up ./libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties.fix ./libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties
+--- ./libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties.fix	2013-04-11 18:43:40.000000000 -0400
++++ ./libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties	2013-04-11 18:44:04.000000000 -0400
+@@ -1,3 +1,5 @@
++source.. = src/
++output.. = bin/
+ bin.includes = META-INF/,\
+                plugin.xml,\
+                toc.xml,\
diff --git a/eclipse-cdt-libhover-libstdcxx-source.patch b/eclipse-cdt-libhover-libstdcxx-source.patch
new file mode 100644
index 0000000..effedf8
--- /dev/null
+++ b/eclipse-cdt-libhover-libstdcxx-source.patch
@@ -0,0 +1,27 @@
+diff -up ./libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/pom.xml.fix ./libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/pom.xml
+--- ./libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/pom.xml.fix	2013-04-11 18:06:51.000000000 -0400
++++ ./libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/pom.xml	2013-04-11 18:07:13.000000000 -0400
+@@ -22,4 +22,23 @@
+   <packaging>eclipse-plugin</packaging>
+ 
+   <name>Linux Tools libstdc++ Libhover Plug-in</name>
++
++  <build>
++     <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
++     <resources>
++      <resource>
++        <directory>src</directory>
++        <excludes>
++          <exclude>**/*.java</exclude>
++        </excludes>
++      </resource>
++    </resources>
++    <plugins>
++      <plugin>
++        <groupId>org.eclipse.tycho</groupId>
++        <artifactId>tycho-source-plugin</artifactId>
++      </plugin>
++    </plugins>
++  </build>
++
+ </project>
diff --git a/eclipse-cdt-spawner-issue.patch b/eclipse-cdt-spawner-issue.patch
new file mode 100644
index 0000000..71f90de
--- /dev/null
+++ b/eclipse-cdt-spawner-issue.patch
@@ -0,0 +1,12 @@
+diff -up ./core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java.fix ./core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java
+--- ./core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java.fix	2013-04-30 16:30:52.000000000 -0400
++++ ./core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java	2013-04-30 16:31:09.000000000 -0400
+@@ -42,7 +42,7 @@ public class ProcessFactory {
+ 		} catch (SecurityException e) {
+ 			e.printStackTrace();
+ 		} catch (UnsatisfiedLinkError e) {
+-			e.printStackTrace();
++			// e.printStackTrace();
+ 		}
+ 	}
+ 
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index e2a1f66..0bb17d6 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -28,7 +28,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        0.3.m6%{?dist}
+Release:        0.4.m6%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -70,6 +70,16 @@ Patch7: %{name}-linuxtools-disable-jacoco.patch
 # Following removes some extraneous ant check in Linux Tools promoter.xml
 Patch8: %{name}-linuxtools-ant-fix.patch
 
+# Following patches adds fix for generating libstdcxx source plugin
+Patch9: %{name}-libhover-libstdcxx-source.patch
+Patch10: %{name}-libhover-libstdcxx-properties.patch
+
+# Following fixes Bug 405904 regarding gprof link options
+Patch11: %{name}-bug405904.patch
+
+# Following removes a print stack trace from ProcessFactory spawner look-up
+Patch12: %{name}-spawner-issue.patch
+
 BuildRequires: tycho
 BuildRequires: tycho-extras
 BuildRequires: eclipse-pde >= 1:3.8.0
@@ -126,6 +136,8 @@ Source for Eclipse CDT for use within Eclipse.
 pushd %{cdt_snapshot}
 %patch0 -p1
 %patch4 -p1
+%patch11 -p1
+%patch12 -p1
 sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
 # Add secondary arch support if we are building there
 %ifarch %{arm} s390 s390x
@@ -167,6 +179,8 @@ pushd %{linuxtools_snapshot}
 %patch6 -p0
 %patch7 -p0
 %patch8 -p0
+%patch9 -p0
+%patch10 -p0
 
 %pom_disable_module changelog
 %pom_disable_module profiling
@@ -334,6 +348,11 @@ rm -rf $installDir/eclipse/binary
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
 
 %changelog
+* Tue Apr 30 2013 Alexander Kurtakov <akurtako at redhat.com> 1:8.2.0-0.4.m6
+- Remove trace-back when spawner library is not found.
+- Fix libhover source plugin generation.
+- Add fix for bug 405904 concerning gprof link options.
+
 * Tue Apr 23 2013 Alexander Kurtakov <akurtako at redhat.com> 1:8.2.0-0.3.m6
 - llvm subpackage without clang is useless.

More information about the scm-commits mailing list