From 6234116db089d75ea380256316c52e17fd7a6a82 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Oct 07 2015 16:54:22 +0000 Subject: Update to Mars.1 release - Bootstrap mode for secondary arches --- diff --git a/.gitignore b/.gitignore index b1676f5..a357d22 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,3 @@ -eclipse-cdt-autotools-*.tar.gz -eclipse-cdt-fetched-src-CDT_*.tar.bz2 -eclipse-cdt-fetched-src-autotools-*.tar.gz -eclipse-cdt-fetched-src-libhover-*.tar.gz -eclipse-cdt-fetched-src-*.tar.bz2 libstdc++-v3.libhover glibc-2.7-2.libhover acmacros-2.13.xml @@ -11,17 +6,8 @@ acmacros-2.61.xml ammacros-1.4-p6.xml ammacros-1.9.5.xml ammacros-1.9.6.xml -/org.eclipse.cdt-*.tar.gz -/linuxtools-libhover-parent-*-src.tar.bz2 -/org.eclipse.cdt-CDT_*.tar.bz2 -/org.eclipse.cdt-*.tar.gz -/org.eclipse.linuxtools-*.tar.bz2 +/org.eclipse.cdt-CDT_*.tar.xz /eclipse-cdt.desktop /*.src.rpm /.project -/CDT_*.tar.bz2 -/eclipse-cdt-*/ -/136c03435ae0cab39fcd5246b7b1d3c0063d165c.tar.xz -/6c36f7ff864090663713c0f868b72f9be42ab94a.tar.xz -/d13a53c46144740cf751e1d92b4d2af37871b196.tar.xz -/org.eclipse.cdt-CDT_8_7_0.tar.xz +/org.eclipse.cdt-*/ diff --git a/eclipse-cdt-target.patch b/eclipse-cdt-target.patch deleted file mode 100644 index 5dafb7c..0000000 --- a/eclipse-cdt-target.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- ./pom.xml.orig 2014-10-06 16:46:08.449288840 +0100 -+++ ./pom.xml 2014-10-06 16:48:44.255098820 +0100 -@@ -219,8 +219,8 @@ - upc/org.eclipse.cdt.core.parser.upc.tests - xlc/org.eclipse.cdt.core.lrparser.xlc.tests - debug/org.eclipse.cdt.debug.ui.tests ----> - releng/org.eclipse.cdt.target -+--> - releng/org.eclipse.cdt.testing - releng/org.eclipse.cdt.testing-feature - releng/org.eclipse.cdt.testing.repo -@@ -366,14 +366,6 @@ - x86 - - -- -- -- org.eclipse.cdt -- org.eclipse.cdt.target -- ${target-platform} -- 1.0.0 -- -- - - - diff --git a/eclipse-cdt-test-resources.patch b/eclipse-cdt-test-resources.patch deleted file mode 100644 index cd5fe0e..0000000 --- a/eclipse-cdt-test-resources.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up ./core/org.eclipse.cdt.core.tests/build.properties.fix ./core/org.eclipse.cdt.core.tests/build.properties ---- ./core/org.eclipse.cdt.core.tests/build.properties.fix 2015-07-02 15:59:34.707052374 -0400 -+++ ./core/org.eclipse.cdt.core.tests/build.properties 2015-07-02 16:00:05.267565178 -0400 -@@ -18,6 +18,7 @@ bin.includes = plugin.xml,\ - parser/org/eclipse/cdt/internal/pdom/tests/,\ - parser/org/eclipse/cdt/core/parser/tests/ast2/,\ - parser/org/eclipse/cdt/core/parser/tests/scanner/,\ -+ parser/org/eclipse/cdt/core/parser/tests/rewrite/,\ - parser/org/eclipse/cdt/core/parser/tests/prefix/ - - output.. = bin/ -@@ -32,4 +33,4 @@ javacSource=1.7 - javacTarget=1.7 - javacProjectSettings=true - src.includes = about.html -- -\ No newline at end of file -+ -diff -up ./qt/org.eclipse.cdt.qt.tests/build.properties.fix ./qt/org.eclipse.cdt.qt.tests/build.properties ---- ./qt/org.eclipse.cdt.qt.tests/build.properties.fix 2015-07-02 15:53:36.316038589 -0400 -+++ ./qt/org.eclipse.cdt.qt.tests/build.properties 2015-07-02 16:01:41.069172725 -0400 -@@ -1,4 +1,5 @@ - source.. = src/ - output.. = bin/ - bin.includes = META-INF/,\ -+ src/org/eclipse/cdt/qt/tests/,\ - . diff --git a/eclipse-cdt-tycho-build.patch b/eclipse-cdt-tycho-build.patch deleted file mode 100644 index 3254fb9..0000000 --- a/eclipse-cdt-tycho-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -up ./pom.xml.orig ./pom.xml ---- ./pom.xml.orig 2014-06-26 17:12:19.158965411 -0400 -+++ ./pom.xml 2014-06-26 17:14:21.166990242 -0400 -@@ -345,46 +345,6 @@ - gtk - x86 - -- -- linux -- gtk -- x86_64 -- -- -- linux -- gtk -- ppc64 -- -- -- win32 -- win32 -- x86 -- -- -- win32 -- win32 -- x86_64 -- -- -- macosx -- cocoa -- x86 -- -- -- macosx -- cocoa -- x86_64 -- -- -- aix -- gtk -- ppc -- -- -- solaris -- gtk -- sparc -- - - - diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 5382b88..27e10ed 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -7,16 +7,16 @@ # Change following to 0 to default to no container/remote support when building for # first time in a release...this is needed to build eclipse-linuxtools-docker and # eclipse.remote which are circular dependencies of eclipse-cdt -%global _enable_container_and_remote_support 1 +%global _enable_container_and_remote_support 0 Epoch: 1 %define major 8 -%define minor 7 +%define minor 8 %define majmin %{major}.%{minor} %define micro 0 %define eclipse_base %{_libdir}/eclipse -%define cdt_snapshot org.eclipse.cdt-CDT_8_7_0 +%define cdt_snapshot org.eclipse.cdt-CDT_8_8_0 # All arches line up except i386 -> x86 %ifarch %{ix86} @@ -32,7 +32,7 @@ Epoch: 1 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: %{?scl_prefix}eclipse-cdt Version: %{majmin}.%{micro} -Release: 10%{?dist} +Release: 1%{?dist} License: EPL and CPL URL: http://www.eclipse.org/cdt @@ -46,8 +46,6 @@ Source4: cdtdebug.man # Script to run the tests in Xvnc Source5: %{name}-runtests.sh -Patch0: %{name}-tycho-build.patch - # Following adds current directory to autotools tests build.properties Patch1: %{name}-autotools-test.patch @@ -60,29 +58,22 @@ Patch3: %{pkg_name}-config-ini.patch # Following fixes Standalone Debugger README file to refer to /usr/bin/cdtdebug Patch4: %{pkg_name}-cdtdebug-readme.patch -# Following fixes jetty reqs in CDT target -Patch5: %{pkg_name}-target.patch - # Following removes docker launcher plugins from repo Patch6: remove-docker.patch # Following removes autotools and remote plugins from repo Patch7: remove-remote.patch -# Following adds missing java resources to tests -Patch9: %{pkg_name}-test-resources.patch - # Following fixes missing exit code in console bug -Patch10: %{pkg_name}-exit-code.patch +Patch8: %{pkg_name}-exit-code.patch BuildRequires: tycho BuildRequires: tycho-extras BuildRequires: %{?scl_prefix}eclipse-pde >= 1:4.3.0 BuildRequires: eclipse-license -BuildRequires: maven-local BuildRequires: desktop-file-utils -BuildRequires: java-devel >= 1:1.7.0 BuildRequires: %{?scl_prefix}lpg-java-compat +BuildRequires: google-gson BuildRequires: %{?scl_prefix}eclipse-platform >= 1:4.3.0 BuildRequires: %{?scl_prefix}eclipse-tests >= 1:4.3.0 BuildRequires: %{?scl_prefix}eclipse-swtbot @@ -121,6 +112,8 @@ Requires: clang %description llvm Optional llvm parsers for the CDT. +%if %{_enable_container_and_remote_support} == 1 + %package arduino Summary: Arduino C++ Tools Requires: %{name} = %{epoch}:%{version}-%{release} @@ -128,8 +121,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %description arduino Extensions to support Arduino C++ projects in Eclipse. -%if %{_enable_container_and_remote_support} == 1 - %package docker Summary: C/C++ Docker Launcher Requires: %{name} = %{epoch}:%{version}-%{release} @@ -169,20 +160,20 @@ cp %{SOURCE3} desktop mkdir man cp %{SOURCE4} man -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %if %{_enable_container_and_remote_support} == 0 %patch6 -p0 %patch7 -p0 %endif -%patch9 -p0 -%patch10 -p1 +%patch8 -p1 + +TYCHO_ENV="linuxgtk%{eclipse_arch}" +%pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" +%pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" core/org.eclipse.cdt.core.linux -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 aarch64 pushd core @@ -192,9 +183,6 @@ sed -i -e 's/\\(x86\\)/(%{eclipse_arch})/g' plugin.properties popd cp -r org.eclipse.cdt.core.linux.x86 org.eclipse.cdt.core.linux.%{eclipse_arch} rm -fr org.eclipse.cdt.core.linux.x86 -pushd org.eclipse.cdt.core.linux -sed -i -e 's/x86<\/arch>/%{eclipse_arch}<\/arch>/g' pom.xml -popd pushd org.eclipse.cdt.core.linux.%{eclipse_arch} sed -i -e 's/x86/%{eclipse_arch}/g' pom.xml pushd META-INF @@ -217,6 +205,10 @@ pushd core/org.eclipse.cdt.core.linux.%{eclipse_arch} sed -i -e"/Bundle-Localization: plugin/ aEclipse-BundleShape: dir" META-INF/MANIFEST.MF popd +# Don't use the target configuration +%pom_disable_module releng/org.eclipse.cdt.target +%pom_xpath_remove "pom:configuration/pom:target" + # Disable the jgit provider and force default packaging %pom_remove_plugin org.eclipse.tycho:tycho-packaging-plugin %pom_remove_plugin org.jacoco:jacoco-maven-plugin @@ -238,6 +230,9 @@ popd %pom_disable_module cross/org.eclipse.cdt.launch.remote-feature %pom_disable_module remote/org.eclipse.cdt.remote.core %pom_disable_module remote/org.eclipse.cdt.remote-feature +%pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino.core +%pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino.ui +%pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino-feature %endif for b in `ls core/ | grep -P -e 'org.eclipse.cdt.core\.(?!linux\.%{eclipse_arch}$|tests$|linux$|native$)'` ; do @@ -265,9 +260,7 @@ pushd core/org.eclipse.cdt.core.linux/library make JAVA_HOME="%{java_home}" ARCH=%{eclipse_arch} CC='gcc -D_GNU_SOURCE' popd -%{?scl:scl enable %{scl} - <<"EOF"} xmvn -o -Dtycho.local.keepTarget -Dskip-ppc64le -Dmaven.test.skip=true -Dmaven.repo.local=`pwd`/.m2 install -%{?scl:EOF} %install @@ -276,15 +269,14 @@ testInstallDir=${RPM_BUILD_ROOT}/%{_javadir}/eclipse-cdt-tests/plugins parsersInstallDir=${installDir}-parsers %if %{_enable_container_and_remote_support} == 1 dockerInstallDir=${installDir}-docker -%endif arduinoInstallDir=${installDir}-arduino +%endif llvmInstallDir=${installDir}-llvm sdkInstallDir=${installDir}-sdk binInstallDir=${RPM_BUILD_ROOT}/%{_bindir} manInstallDir=${RPM_BUILD_ROOT}/%{_mandir}/man1 install -d -m755 $installDir install -d -m755 $parsersInstallDir -install -d -m755 $arduinoInstallDir install -d -m755 $llvmInstallDir install -d -m755 $sdkInstallDir install -d -m755 $testInstallDir @@ -292,6 +284,7 @@ install -d -m755 $binInstallDir install -d -m755 $manInstallDir %if %{_enable_container_and_remote_support} == 1 install -d -m755 $dockerInstallDir +install -d -m755 $arduinoInstallDir %endif # Unzip contents of the cdt repo, removing all but plugins and features @@ -420,12 +413,12 @@ mkdir -p $llvmInstallDir/eclipse/features $llvmInstallDir/eclipse/plugins mv $installDir/eclipse/features/*llvm* $llvmInstallDir/eclipse/features mv $installDir/eclipse/plugins/*llvm* $llvmInstallDir/eclipse/plugins -# Move arudion plugins/features to arduino install area. +%if %{_enable_container_and_remote_support} == 1 +# Move arudino plugins/features to arduino install area. mkdir -p $arduinoInstallDir/eclipse/features $arduinoInstallDir/eclipse/plugins mv $installDir/eclipse/features/*arduino* $arduinoInstallDir/eclipse/features mv $installDir/eclipse/plugins/*arduino* $arduinoInstallDir/eclipse/plugins -%if %{_enable_container_and_remote_support} == 1 # Move docker launcher plugins/features to docker install area. mkdir -p $dockerInstallDir/eclipse/features $dockerInstallDir/eclipse/plugins mv $installDir/eclipse/features/*docker* $dockerInstallDir/eclipse/features @@ -477,12 +470,12 @@ rm -rf $installDir/eclipse/binary %doc releng/org.eclipse.cdt.releng/epl-v10.html %doc releng/org.eclipse.cdt.releng/notice.html +%if %{_enable_container_and_remote_support} == 1 %files arduino %{eclipse_base}/dropins/cdt-arduino %doc releng/org.eclipse.cdt.releng/epl-v10.html %doc releng/org.eclipse.cdt.releng/notice.html -%if %{_enable_container_and_remote_support} == 1 %files docker %{eclipse_base}/dropins/cdt-docker %doc releng/org.eclipse.cdt.releng/epl-v10.html @@ -490,6 +483,10 @@ rm -rf $installDir/eclipse/binary %endif %changelog +* Wed Oct 07 2015 Mat Booth - 1:8.8.0-1 +- Update to Mars.1 release +- Bootstrap mode for secondary arches + * Mon Sep 21 2015 Jeff Johnston - 1:8.7.0-10 - Fix missing test resources - Fix missing exit code in console diff --git a/remove-remote.patch b/remove-remote.patch index d4ff572..5814aaf 100644 --- a/remove-remote.patch +++ b/remove-remote.patch @@ -1,34 +1,7 @@ -diff -up ./core/org.eclipse.cdt.core.tests/build.properties.fix ./core/org.eclipse.cdt.core.tests/build.properties ---- ./core/org.eclipse.cdt.core.tests/build.properties.fix 2015-07-02 15:59:34.707052374 -0400 -+++ ./core/org.eclipse.cdt.core.tests/build.properties 2015-07-02 16:00:05.267565178 -0400 -@@ -18,6 +18,7 @@ bin.includes = plugin.xml,\ - parser/org/eclipse/cdt/internal/pdom/tests/,\ - parser/org/eclipse/cdt/core/parser/tests/ast2/,\ - parser/org/eclipse/cdt/core/parser/tests/scanner/,\ -+ parser/org/eclipse/cdt/core/parser/tests/rewrite/,\ - parser/org/eclipse/cdt/core/parser/tests/prefix/ - - output.. = bin/ -@@ -32,4 +33,4 @@ javacSource=1.7 - javacTarget=1.7 - javacProjectSettings=true - src.includes = about.html -- -\ No newline at end of file -+ -diff -up ./qt/org.eclipse.cdt.qt.tests/build.properties.fix ./qt/org.eclipse.cdt.qt.tests/build.properties ---- ./qt/org.eclipse.cdt.qt.tests/build.properties.fix 2015-07-02 15:53:36.316038589 -0400 -+++ ./qt/org.eclipse.cdt.qt.tests/build.properties 2015-07-02 16:01:41.069172725 -0400 -@@ -1,4 +1,5 @@ - source.. = src/ - output.. = bin/ - bin.includes = META-INF/,\ -+ src/org/eclipse/cdt/qt/tests/,\ - . -diff -up ./releng/org.eclipse.cdt.repo/category.xml.fix ./releng/org.eclipse.cdt.repo/category.xml ---- ./releng/org.eclipse.cdt.repo/category.xml.fix 2015-07-07 18:44:17.456829932 -0400 -+++ ./releng/org.eclipse.cdt.repo/category.xml 2015-07-07 18:43:23.632926770 -0400 -@@ -44,9 +44,6 @@ +diff -up ./releng/org.eclipse.cdt.repo/category.xml.orig ./releng/org.eclipse.cdt.repo/category.xml +--- ./releng/org.eclipse.cdt.repo/category.xml.orig 2015-09-13 19:40:46.000000000 +0100 ++++ ./releng/org.eclipse.cdt.repo/category.xml 2015-10-07 16:36:15.103331358 +0100 +@@ -45,9 +45,6 @@ @@ -38,7 +11,7 @@ diff -up ./releng/org.eclipse.cdt.repo/category.xml.fix ./releng/org.eclipse.cdt -@@ -59,12 +56,6 @@ +@@ -60,12 +57,6 @@ @@ -51,7 +24,7 @@ diff -up ./releng/org.eclipse.cdt.repo/category.xml.fix ./releng/org.eclipse.cdt -@@ -77,9 +68,6 @@ +@@ -84,16 +69,10 @@ @@ -61,3 +34,10 @@ diff -up ./releng/org.eclipse.cdt.repo/category.xml.fix ./releng/org.eclipse.cdt + + + +- +- +- + diff --git a/sources b/sources index f6c2408..e0fed89 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ da9186b8edfc5f4efaa189ad7c0eb26f eclipse-cdt.desktop -dcdebd4ca23d429b28d42246c7a97aa6 org.eclipse.cdt-CDT_8_7_0.tar.xz +9afb42d7449b4a9e89d41c7f4c99b143 org.eclipse.cdt-CDT_8_8_0.tar.xz