From a0c550623c8f955ab7e5ef25179dc324838fec47 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Apr 10 2013 22:23:34 +0000 Subject: Update CDT to Kepler M6. - Update libhover to Kepler M6 and use tycho to build it now. - Add new llvm subpackage. --- diff --git a/.gitignore b/.gitignore index d891bde..3b052c1 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,5 @@ eclipse-cdt-fetched-src-autotools-R0_6_0.tar.gz /linuxtools-libhover-parent-1.1.1-src.tar.bz2 /org.eclipse.cdt-CDT_8_1_2.tar.bz2 /linuxtools-libhover-parent-1.2.1-src.tar.bz2 +/org.eclipse.cdt-4d70fc3fd4c20efd657602e8ce65d51d0ffce2a6.tar.gz +/org.eclipse.linuxtools-95aacfe82466cb691f5adf09aae33c361335935b.tar.bz2 diff --git a/eclipse-cdt-dsf-tests.patch b/eclipse-cdt-dsf-tests.patch deleted file mode 100644 index 42d30f1..0000000 --- a/eclipse-cdt-dsf-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF.fix ./dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF ---- ./dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF.fix 2013-03-05 18:49:22.000000000 -0500 -+++ ./dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF 2013-03-05 18:49:51.000000000 -0500 -@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.core.runtime - org.eclipse.cdt.dsf, - org.eclipse.cdt.core, - org.eclipse.cdt.debug.core, -- org.junit4, -+ org.junit;bundle-version="4.8.1", - org.eclipse.debug.core, - org.eclipse.swt, - org.eclipse.cdt.launch;bundle-version="6.1.0", diff --git a/eclipse-cdt-libhover-libstdcxx.patch b/eclipse-cdt-libhover-libstdcxx.patch index 8526938..7353cd1 100644 --- a/eclipse-cdt-libhover-libstdcxx.patch +++ b/eclipse-cdt-libhover-libstdcxx.patch @@ -1,6 +1,6 @@ diff -up ./org.eclipse.linuxtools.cdt.libhover-feature/feature.xml.fix ./org.eclipse.linuxtools.cdt.libhover-feature/feature.xml ---- ./org.eclipse.linuxtools.cdt.libhover.feature/feature.xml.fix 2011-04-12 18:02:28.000000000 -0400 -+++ ./org.eclipse.linuxtools.cdt.libhover.feature/feature.xml 2011-04-12 18:02:50.000000000 -0400 +--- ./org.eclipse.linuxtools.cdt.libhover-feature/feature.xml.fix 2013-04-09 17:55:27.000000000 -0400 ++++ ./org.eclipse.linuxtools.cdt.libhover-feature/feature.xml 2013-04-09 17:55:46.000000000 -0400 @@ -50,4 +50,11 @@ version="0.0.0" unpack="false"/> diff --git a/eclipse-cdt-linuxtools-ant-fix.patch b/eclipse-cdt-linuxtools-ant-fix.patch new file mode 100644 index 0000000..a2023b6 --- /dev/null +++ b/eclipse-cdt-linuxtools-ant-fix.patch @@ -0,0 +1,22 @@ +diff -up ./releng/org.eclipse.linuxtools.releng-site/promoter.xml.fix ./releng/org.eclipse.linuxtools.releng-site/promoter.xml +--- ./releng/org.eclipse.linuxtools.releng-site/promoter.xml.fix 2013-04-10 17:30:32.000000000 -0400 ++++ ./releng/org.eclipse.linuxtools.releng-site/promoter.xml 2013-04-10 17:30:55.000000000 -0400 +@@ -27,17 +27,7 @@ + + + +- +- +- +- +- +- +- +- +- +- +- ++ + + + diff --git a/eclipse-cdt-linuxtools-disable-jacoco.patch b/eclipse-cdt-linuxtools-disable-jacoco.patch new file mode 100644 index 0000000..82f6d46 --- /dev/null +++ b/eclipse-cdt-linuxtools-disable-jacoco.patch @@ -0,0 +1,37 @@ +--- pom.xml.orig 2013-03-26 15:37:54.280998215 +0200 ++++ pom.xml 2013-03-26 15:45:22.456743014 +0200 +@@ -217,34 +217,6 @@ + + + +- +- org.jacoco +- jacoco-maven-plugin +- 0.6.2.201302030002 +- +- +- pre-test +- +- prepare-agent +- +- +- +- ${sonar.jacoco.reportPath} +- +- org.eclipse.linuxtools.* +- +- true +- +- +- +- post-test +- test +- +- report +- +- +- +- + + + diff --git a/eclipse-cdt-linuxtools-remove-parent.patch b/eclipse-cdt-linuxtools-remove-parent.patch new file mode 100644 index 0000000..3d4c545 --- /dev/null +++ b/eclipse-cdt-linuxtools-remove-parent.patch @@ -0,0 +1,14 @@ +--- pom.xml.sav 2012-07-26 22:09:11.000000000 +0300 ++++ pom.xml 2012-07-30 18:28:59.193265704 +0300 +@@ -19,11 +19,6 @@ + + 3.0 + +- +- org.eclipse +- eclipse-parent +- 3 +- + + + org.eclipse.linuxtools diff --git a/eclipse-cdt-tycho-build.patch b/eclipse-cdt-tycho-build.patch index 9ff5d0f..a8dd357 100644 --- a/eclipse-cdt-tycho-build.patch +++ b/eclipse-cdt-tycho-build.patch @@ -1,15 +1,3 @@ -diff --git a/cross/org.eclipse.cdt.launch.remote-feature/pom.xml b/cross/org.ec -index 7ef4eb5..0b4d263 100644 ---- a/cross/org.eclipse.cdt.launch.remote-feature/pom.xml -+++ b/cross/org.eclipse.cdt.launch.remote-feature/pom.xml -@@ -12,6 +12,7 @@ - - - 6.0.0-SNAPSHOT -+ org.eclipse.cdt.feature - org.eclipse.cdt.launch.remote - eclipse-feature - diff --git a/pom.xml b/pom.xml index dd54c31..22c0ceb 100644 --- a/pom.xml diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 411ae61..cb67e3e 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -1,15 +1,17 @@ %global debug_package %{nil} +%global git_version 95aacfe82466cb691f5adf09aae33c361335935b Epoch: 1 %define major 8 -%define minor 1 +%define minor 2 %define majmin %{major}.%{minor} -%define micro 2 +%define micro 0 %define eclipse_base %{_libdir}/eclipse -%define cdt_snapshot org.eclipse.cdt-CDT_8_1_2 -%define build_id 201302132326 -%define libhover_build_id 201302051708 +%define cdt_snapshot org.eclipse.cdt-4d70fc3fd4c20efd657602e8ce65d51d0ffce2a6 +%define linuxtools_snapshot org.eclipse.linuxtools-%{git_version} +%define build_id 201303191012 +%define libhover_build_id 201303200407 %define pdebuild eclipse-pdebuild # All arches line up except i386 -> x86 @@ -26,7 +28,7 @@ Epoch: 1 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: %{majmin}.%{micro} -Release: 1%{?dist} +Release: 0.1.m6%{?dist} License: EPL and CPL Group: Development/Tools URL: http://www.eclipse.org/cdt @@ -34,10 +36,10 @@ Requires: eclipse-platform # The following tarball was fetched via: -# http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/org.eclipse.cdt-CDT_8_1_2.tar.bz2 -Source0: %{cdt_snapshot}.tar.bz2 +# http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/org.eclipse.cdt-4d70fc3fd4c20efd657602e8ce65d51d0ffce2a6.tar.gz +Source0: %{cdt_snapshot}.tar.gz -Source2: http://download.eclipse.org/linuxtools/1.2.1-sources/linuxtools-libhover-parent-1.2.1-src.tar.bz2 +Source2: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/org.eclipse.linuxtools-%{git_version}.tar.bz2 # Script to run the tests in Xvnc Source5: %{name}-runtests.sh @@ -52,17 +54,31 @@ Patch0: %{name}-tycho-build.patch Patch1: %{name}-libhover-local-libstdcxx.patch Patch2: %{name}-libhover-libstdcxx.patch -# Following fixes an org.junit4 reference in the CDT to use org.junit instead -Patch3: %{name}-dsf-tests.patch +# Following removes unused modules from libhover pom.xml +Patch3: %{name}-libhover-pom.patch + +# Following fixes CDT doc plugins to use new format for tycho-extras plugin +Patch4: %{name}-doc-fix.patch + +# Following removes unneeded features from Linux Tools build +Patch5: %{name}-linuxtools-features.patch + +# Following fixes up Linux Tools top-level pom +Patch6: %{name}-linuxtools-remove-parent.patch +Patch7: %{name}-linuxtools-disable-jacoco.patch + +# Following removes some extraneous ant check in Linux Tools promoter.xml +Patch8: %{name}-linuxtools-ant-fix.patch BuildRequires: tycho BuildRequires: tycho-extras BuildRequires: eclipse-pde >= 1:3.8.0 BuildRequires: eclipse-rse >= 3.3 BuildRequires: maven-local -BuildRequires: java-devel >= 1.4.2 +BuildRequires: java-devel >= 1.4.2 BuildRequires: lpg-java-compat BuildRequires: eclipse-platform >= 1:3.8.0 +BuildRequires: exec-maven-plugin Requires: gdb make gcc-c++ autoconf automake libtool Requires: eclipse-platform >= 1:3.8.0 @@ -86,6 +102,15 @@ Requires: lpg-java-compat %description parsers Optional language-variant parsers for the CDT. +%package llvm +Summary: Eclipse C/C++ Development Tools (CDT) LLVM +Group: Text Editors/Integrated Development Environments (IDE) +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: lpg-java-compat + +%description llvm +Optional llvm parsers for the CDT. + %package sdk Summary: Eclipse C/C++ Development Tools (CDT) SDK plugin Group: Text Editors/Integrated Development Environments (IDE) @@ -99,7 +124,7 @@ Source for Eclipse CDT for use within Eclipse. pushd %{cdt_snapshot} %patch0 -p1 -%patch3 -p1 +%patch4 -p1 sed -i -e 's/x86<\/arch>/%{eclipse_arch}<\/arch>/g' pom.xml # Add secondary arch support if we are building there %ifarch %{arm} s390 s390x @@ -135,12 +160,32 @@ popd ## Libhover stuff tar -xaf %{SOURCE2} -pushd linuxtools-libhover-parent-1.2.1-src +pushd %{linuxtools_snapshot} + +%patch5 -p0 +%patch6 -p0 +%patch7 -p0 +%patch8 -p0 + +%pom_disable_module changelog +%pom_disable_module profiling +%pom_disable_module rpmstubby +%pom_disable_module lttng +%pom_disable_module valgrind +%pom_disable_module gcov +%pom_disable_module gprof +%pom_disable_module oprofile +%pom_disable_module systemtap +%pom_disable_module perf +%pom_disable_module rpm +popd +pushd %{linuxtools_snapshot}/libhover # newlib libhover is an optional feature...remove it from CDT base rm -rf org.eclipse.linuxtools.cdt.libhover.newlib rm -rf org.eclipse.linuxtools.cdt.libhover.newlib-feature %patch1 -p0 -%patch2 -p0 +%patch2 +%patch3 -p0 pushd org.eclipse.linuxtools.cdt.libhover.libstdcxx mkdir data pushd data @@ -177,15 +222,25 @@ popd mvn-rpmbuild -o -DskipTychoVersionCheck -Dmaven.test.skip=true -Dtycho.local.keepTarget -DforceContextQualifier=%{build_id} -fae clean install ## Libhover has dependencies on CDT so we must add these to the SDK directory -unzip -o releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo-8.1.1-SNAPSHOT.zip -d $SDK +unzip -o releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip -d $SDK popd ## Libhover build -pushd linuxtools-libhover-parent-1.2.1-src -%{pdebuild} -f org.eclipse.linuxtools.cdt.libhover.feature -a "-DbaseLocation=$SDK -DforceContextQualifier=%{libhover_build_id}" -%{pdebuild} -f org.eclipse.linuxtools.cdt.libhover.devhelp.feature \ --a "-DbaseLocation=$SDK -DjavacSource=1.6 -DjavacTarget=1.6 \ --DforceContextQualifier=%{libhover_build_id}" +pushd %{linuxtools_snapshot} + +mkdir -p .m2/p2/repo-sdk/features +mkdir -p .m2/p2/repo-sdk/plugins +cp -d $SDK/features/*.jar .m2/p2/repo-sdk/features +cp -d $SDK/plugins/*.jar .m2/p2/repo-sdk/plugins + +mvn-rpmbuild -DskiptychoVersionCheck -Dmaven.test.skip=true -DforceContextQualifier=%{libhover_build_id} -fae clean install + +pushd releng/org.eclipse.linuxtools.releng-site/target/repository/features +for f in `ls -1 . | grep jar$`; do + unzip $f -d ${f/.jar//}; + rm -fr $f +done + popd %install @@ -195,13 +250,22 @@ homedir=$(cd home > /dev/null && pwd) installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt parsersInstallDir=${installDir}-parsers +llvmInstallDir=${installDir}-llvm sdkInstallDir=${installDir}-sdk install -d -m755 $installDir install -d -m755 $parsersInstallDir +install -d -m755 $llvmInstallDir install -d -m755 $sdkInstallDir # Unzip contents of the cdt repo, removing all but plugins and features -unzip -q -o %{cdt_snapshot}/releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo-8.1.1-SNAPSHOT.zip \ +unzip -q -o %{cdt_snapshot}/releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip \ +-d $installDir/eclipse + +# Add CDT core tests plugin even though this isn't done upstream +cp %{cdt_snapshot}/core/org.eclipse.cdt.core.tests/target/org.eclipse.cdt.core.tests-*-SNAPSHOT.jar $installDir/eclipse/plugins + +# Libhover install +unzip -q -o %{linuxtools_snapshot}/releng/org.eclipse.linuxtools.releng-site/target/org.eclipse.linuxtools.releng-site.zip \ -d $installDir/eclipse # Unpack all existing feature jars @@ -212,15 +276,6 @@ for x in $installDir/eclipse/features/*.jar; do rm $x done -# Add CDT core tests plugin even though this isn't done upstream -cp %{cdt_snapshot}/core/org.eclipse.cdt.core.tests/target/org.eclipse.cdt.core.tests-*-SNAPSHOT.jar $installDir/eclipse/plugins - -# Libhover install -pushd linuxtools-libhover-parent-1.2.1-src -unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.feature.zip -unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.devhelp.feature.zip -popd - # Remove lpgjavaruntime jar file rm -rf $installDir/eclipse/plugins/net.sourceforge.* @@ -236,6 +291,11 @@ pushd $parsersInstallDir/eclipse/plugins ln -s ../../../../../../share/java/lpgjavaruntime.jar net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar popd +# Move llvm plugins/features to llvm install area. +mkdir -p $llvmInstallDir/eclipse/features $llvmInstallDir/eclipse/plugins +mv $installDir/eclipse/features/*llvm* $llvmInstallDir/eclipse/features +mv $installDir/eclipse/plugins/*llvm* $llvmInstallDir/eclipse/plugins + mkdir -p $sdkInstallDir/eclipse/features $sdkInstallDir/eclipse/plugins mv $installDir/eclipse/features/*source* $sdkInstallDir/eclipse/features mv $installDir/eclipse/plugins/*source* $sdkInstallDir/eclipse/plugins @@ -267,7 +327,17 @@ rm -rf $installDir/eclipse/binary %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/epl-v10.html %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html +%files llvm +%{eclipse_base}/dropins/cdt-llvm +%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/epl-v10.html +%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html + %changelog +* Wed Apr 10 2013 Jeff Johnston - 1:8.2.0-0.1.m6 +- Update CDT to Kepler M6. +- Update libhover to Kepler M6 and use tycho to build it now. +- Add new llvm subpackage. + * Fri Mar 08 2013 Jeff Johnston - 1:8.1.2-1 - Update CDT to Juno SR2 (8.1.2) - Update libhover to Juno SR2 (1.2.1) diff --git a/sources b/sources index 524ab44..8b3af7f 100644 --- a/sources +++ b/sources @@ -1,5 +1,3 @@ 921f3464c4b5a284473ebdad634e5c2d libstdc++-v3.libhover -eb8a39ce88900c9f3ddfed48c20a5676 org.eclipse.cdt-CDT_8_1_1.tar.bz2 -a0a816951a74dd0535ce71fb1c3cf4d1 linuxtools-libhover-parent-1.1.1-src.tar.bz2 -53aeaaff88481e90b9f80866474f4c27 org.eclipse.cdt-CDT_8_1_2.tar.bz2 -95900438eb97a8145dfd5e0add9075bd linuxtools-libhover-parent-1.2.1-src.tar.bz2 +8652da4e48691d55a6b66ff9d89df9a0 org.eclipse.cdt-4d70fc3fd4c20efd657602e8ce65d51d0ffce2a6.tar.gz +6ee56f376e7a4e65f46362cb414739aa org.eclipse.linuxtools-95aacfe82466cb691f5adf09aae33c361335935b.tar.bz2