From 54a04fb7a26eca6f5ef380189cee05cfc47d550d Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Jun 03 2014 17:02:32 +0000 Subject: Update to latest I-build --- diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch index 9c0a716..828b5e5 100644 --- a/eclipse-test-support.patch +++ b/eclipse-test-support.patch @@ -292,8 +292,8 @@ -# assuming metacity attaches to "current" display by default (which should have -# already been set by Hudson). We echo its value here just for extra reference/cross-checks. - --echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz):" --wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz" | grep -v egrep) +-echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz|kwin):" +-wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin" | grep -v egrep) -echo "Window Manager processes: $wmpss" -echo - diff --git a/eclipse.spec b/eclipse.spec index 29a50d5..0a59cd8 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -16,7 +16,7 @@ Epoch: 1 %global eclipse_micro 0 %global initialize 1 %global eb_commit 27d9371a79744f02da09de58db140256a6a9b9e7 -%global eclipse_tag I20140525-2000 +%global eclipse_tag I20140602-2000 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro} %global _jetty_version 9.1.3 @@ -41,7 +41,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: %{?scl_prefix}eclipse Version: %{eclipse_version} -Release: 0.25.git201405252000%{?dist} +Release: 0.26.git201406022000%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -988,6 +988,9 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %changelog +* Tue Jun 03 2014 Mat Booth - 1:4.4.0-0.26.git201406022000 +- Update to latest I-build + * Fri May 30 2014 Michael Simacek - 1:4.4.0-0.25.git201405252000 - Rebuild against new jetty diff --git a/get-eclipse.sh b/get-eclipse.sh index 430f726..7a2b670 100755 --- a/get-eclipse.sh +++ b/get-eclipse.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git -TAG=I20140525-2000 +TAG=I20140602-2000 rm -rf R4_platform-aggregator-$TAG rm -rf R4_platform-aggregator-$TAG.tar.xz @@ -16,15 +16,17 @@ git submodule init git submodule update -#comment this line to get a shallow clone. -find . -type d -name ".git" | xargs rm rm -rf +# Comment this line to get a shallow clone. +find . -type d -name ".git" | xargs rm -rf -find . -name *.jar -type f -exec rm -rf {} \; - -find . -type f -name *.class -exec rm -rf {} \; -find . -type f -name *.so -exec rm -rf {} \; -find . -type f -name *.dll -exec rm -rf {} \; -find . -type f -name *.jnilib -exec rm -rf {} \; +# Delete pre-built binary artifacts +# Note: osgi.annotation.jar contains the source for annotations used only at build-time +# we don't actually ship it or it's contents with the platform +find . -type f -name *.jar ! -name osgi.annotation.jar -delete +find . -type f -name *.class -delete +find . -type f -name *.so -delete +find . -type f -name *.dll -delete +find . -type f -name *.jnilib -delete popd diff --git a/sources b/sources index 37f96e2..0b83269 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 6e6b220b067ce4c6ed6e74d302f920c8 org.eclipse.linuxtools.eclipse-build-27d9371a79744f02da09de58db140256a6a9b9e7.tar.bz2 -e6cfe01c0f3168c53b9971dc11a3cb97 R4_platform-aggregator-I20140525-2000.tar.xz +16279dc6ad0ecc228c56000bca6dc83c R4_platform-aggregator-I20140602-2000.tar.xz