rpms
/
eclipse
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 4.7.1a release

This commit is contained in:
Mat Booth 2017-10-19 09:22:06 +01:00
parent 505e54f634
commit 53f7c532a2
5 changed files with 110 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
eclipse-feature-plugins-to-category-ius.patch
View File

@ -2,19 +2,31 @@ diff --git eclipse.jdt/org.eclipse.jdt-feature/feature.xml eclipse.jdt/org.eclip
index 0743586..1cbf404 100644
--- eclipse.jdt/org.eclipse.jdt-feature/feature.xml
+++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml
@@ -19,6 +19,11 @@
@@ -19,6 +19,23 @@
%license
</license>
+ <requires>
+ <import plugin="org.junit" />
+ <import plugin="org.hamcrest.core" />
+ <import plugin="org.junit.jupiter.api" />
+ <import plugin="org.junit.jupiter.engine" />
+ <import plugin="org.junit.jupiter.migrationsupport" />
+ <import plugin="org.junit.jupiter.params" />
+ <import plugin="org.junit.platform.commons" />
+ <import plugin="org.junit.platform.engine" />
+ <import plugin="org.junit.platform.launcher" />
+ <import plugin="org.junit.platform.runner" />
+ <import plugin="org.junit.platform.suite.api" />
+ <import plugin="org.junit.vintage.engine" />
+ <import plugin="org.opentest4j" />
+ <import plugin="org.apiguardian" />
+ </requires>
+
<plugin
id="org.eclipse.jdt"
download-size="0"
@@ -151,19 +156,6 @@
@@ -158,103 +175,6 @@
download-size="0"
install-size="0"
version="0.0.0"
@ -30,6 +42,90 @@ index 0743586..1cbf404 100644
- id="org.hamcrest.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.junit.jupiter.api"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.junit.jupiter.engine"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.junit.jupiter.migrationsupport"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.junit.jupiter.params"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.junit.platform.commons"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.junit.platform.engine"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.junit.platform.launcher"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.junit.platform.runner"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.junit.platform.suite.api"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.junit.vintage.engine"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.opentest4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apiguardian"
- download-size="0"
- install-size="0"
- version="0.0.0"
unpack="false"/>

19
eclipse-fix-tests.patch
View File

@ -59,27 +59,12 @@ diff --git eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
index bc8963d..fbe4da3 100644
--- eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
+++ eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
@@ -10,11 +10,6 @@
# Red Hat Inc. (mistria) - Avoid nested jars
###############################################################################
source.. = src/
-output.. = bin/
-# Don't rebuild apttestprocessors everytime to avoid dirty working tree
-# lib/apttestprocessors.jar considered as a resource set a dev-timeY
-#source.lib/apttestprocessors.jar = processors/
-#jars.compile.order = lib/apttestprocessors.jar,.
bin.includes = about.html,\
plugin.properties,\
test.xml,\
@@ -24,3 +19,9 @@ bin.includes = about.html,\
.
@@ -21,3 +21,6 @@
src.includes = about.html
compilerArg=-proc:none
jars.extra.classpath = java9/java9api.jar
+source.lib/apttestprocessors.jar = processors/
+source.lib/apttestprocessors8.jar = processors/,\
+ processors8/
+jars.compile.order = lib/apttestprocessors.jar,\
+ lib/apttestprocessors8.jar,\
+ .
--- eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties.orig 2016-03-24 14:25:47.076289150 +0000
+++ eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties 2016-03-24 14:26:39.528660802 +0000

9
eclipse.spec
View File

@ -6,7 +6,7 @@
Epoch: 1
%global eb_commit 2ec387778205043124434190b43f747551fd36fc
%global eclipse_tag S4_7_1_RC4
%global eclipse_tag R4_7_1a
%global _jetty_version 9.4.6
%global _lucene_version 6.1.0
@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.1
Release: 6%{?dist}
Release: 7%{?dist}
License: EPL
URL: http://www.eclipse.org/
@ -194,6 +194,8 @@ BuildRequires: lucene-analysis >= %{_lucene_version}
BuildRequires: lucene-queryparser >= %{_lucene_version}
BuildRequires: lucene-analyzers-smartcn >= %{_lucene_version}
BuildRequires: junit >= 4.12
BuildRequires: junit5
BuildRequires: apiguardian
BuildRequires: hamcrest >= 1.3
BuildRequires: sat4j
BuildRequires: objectweb-asm >= 5.0.3-1
@ -1081,6 +1083,9 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
* Wed Oct 18 2017 Mat Booth <mat.booth@redhat.com> - 1:4.7.1-7
- Update to 4.7.1a release
* Mon Oct 02 2017 Mat Booth <mat.booth@redhat.com> - 1:4.7.1-6
- Use the jit on 32bit arm to speed up the build

4
get-eclipse.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
TAG=S4_7_1_RC4
TAG=R4_7_1a
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz
@ -16,7 +16,7 @@ rm -rf production
find . -type d -name ".git" | xargs rm -rf
# Delete pre-built binary artifacts except some test data that cannot be generated
find . ! -path "*/JCL/*" ! -name "rtstubs*.jar" \
find . ! -path "*/JCL/*" ! -name "rtstubs*.jar" ! -name "java9api.jar" \
-type f -name *.jar -delete
find . -type f -name *.class -delete
find . -type f -name *.so -delete

2
sources
View File

@ -1,2 +1,2 @@
SHA512 (org.eclipse.linuxtools.eclipse-build-2ec387778205043124434190b43f747551fd36fc.tar.xz) = ce351ac1658304b9d2661dde73d7f0bd3e7e57c690cfac561bf08f4d14a3db0b7ffe0cac27d75f4ef7b31fefd7ebe65383e68873f8e0083758949dd7ec8f46b0
SHA512 (R4_platform-aggregator-S4_7_1_RC4.tar.xz) = 33fc4ab59e51c086578129499a7562ca29967229705e86910318010d7adfe8b5f04e31d403970d4ecfd8f6ec8ad56fe3bf49ce997562599d6e80ec04266d9911
SHA512 (R4_platform-aggregator-R4_7_1a.tar.xz) = 95c9910d36b3d8b2360d396def359c6c9724eaf77b9df04449367262e45fe5afa637c96eb413293ce9919fc57d7f81e9bc7e72f1f04add2066d49c39b6bce67a