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

Merge branch 'master' into f22

This commit is contained in:
Mat Booth 2015-10-05 16:07:19 +01:00
parent 9b95fdbb48 8fcf627b49
commit ae86da2d2c
15 changed files with 2615 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -3,7 +3,6 @@ eclipse-*-src.tar.bz2
eclipse-build-*.tar.gz eclipse-build-*.tar.gz
eclipse-build-*.tar.xz eclipse-build-*.tar.xz
eclipse-3.8.0-*-src.tar.bz2 eclipse-3.8.0-*-src.tar.bz2
eclipse-4.2.0-I20120405-1114-src.tar.bz2
/R4_platform-aggregator-* /R4_platform-aggregator-*
/eclipse-source.tar.bz2 /eclipse-source.tar.bz2
/eclipse-jdtpdeupdatesite.tar.bz2 /eclipse-jdtpdeupdatesite.tar.bz2
@ -13,5 +12,5 @@ eclipse-4.2.0-I20120405-1114-src.tar.bz2
/.xmvn /.xmvn
/.build-*.log /.build-*.log
/org.eclipse.linuxtools.eclipse-build-*.tar.bz2 /org.eclipse.linuxtools.eclipse-build-*.tar.bz2
/org.eclipse.linuxtools.eclipse-build-*.tar.xz
/org.eclipse.linuxtools.eclipse-build-*/ /org.eclipse.linuxtools.eclipse-build-*/
/org.eclipse.linuxtools.eclipse-build-da55ff01f3de743f70197a9addb386a6d2183b60.tar.xz

26
eclipse-adjust-droplets.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
index 12e4d89..77945ef 100644
--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
@@ -156,7 +156,20 @@ public class SimpleConfiguratorUtils {
}
continue;
}
- File[] listFiles = extension.listFiles();
+
+ // Support the additional 'eclipse' directory if it exists.
+ File[] extensionFiles = extension.listFiles(new FilenameFilter() {
+ public boolean accept(File dir, String name) {
+ return name.equals("eclipse");
+ }
+ });
+
+ File[] listFiles;
+ if (extensionFiles.length == 1) {
+ listFiles = extensionFiles[0].listFiles();
+ } else {
+ listFiles = extension.listFiles();
+ }
// new magic - multiple info files, f.e.
// egit.info (git feature)
// cdt.link (properties file containing link=path) to other info file

14
eclipse-change-build-packagings.patch
View File

@ -1,23 +1,23 @@
--- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig 2014-04-08 15:47:19.927087084 +0100 --- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig 2014-04-08 15:47:19.927087084 +0100
+++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml 2014-04-08 15:48:00.045367311 +0100 +++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml 2014-04-08 15:48:00.045367311 +0100
@@ -19,7 +19,7 @@ @@ -59,7 +59,7 @@
%license id="org.eclipse.help.source"
</license> version="0.0.0"/>
- <requires> - <requires>
+ <!--requires> + <!--requires>
<import feature="org.eclipse.emf.common.source" version="2.7.0" match="compatible"/> <import feature="org.eclipse.emf.common.source" version="2.7.0" match="compatible"/>
<import feature="org.eclipse.emf.ecore.source" version="2.7.0" match="compatible"/> <import feature="org.eclipse.emf.ecore.source" version="2.7.0" match="compatible"/>
<import feature="org.eclipse.ecf.core.source.feature" version="1.1.0" match="compatible"/>
@@ -29,7 +29,7 @@ @@ -68,7 +68,7 @@
<import feature="org.eclipse.ecf.filetransfer.httpclient4.source.feature" version="3.8.0" match="compatible"/> <import feature="org.eclipse.ecf.filetransfer.httpclient4.source.feature" version="3.8.0" match="compatible"/>
<import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature" version="1.0.0" match="compatible"/> <import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature" version="1.0.0" match="compatible"/>
<import feature="org.eclipse.ecf.filetransfer.ssl.source.feature" version="1.0.0" match="compatible"/> <import feature="org.eclipse.ecf.filetransfer.ssl.source.feature" version="1.0.0" match="compatible"/>
- </requires> - </requires>
+ </requires--> + </requires-->
<plugin
id="org.eclipse.sdk"
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml.orig 2015-03-31 10:28:54.530277349 +0100 --- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml.orig 2015-03-31 10:28:54.530277349 +0100
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml 2015-03-31 10:29:46.232519773 +0100 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml 2015-03-31 10:29:46.232519773 +0100
@@ -4,18 +4,12 @@ @@ -4,18 +4,12 @@

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

@ -199,7 +199,7 @@ index c6d5da0..e76f33f 100644
+ <import plugin="javax.servlet" /> + <import plugin="javax.servlet" />
+ <import plugin="javax.servlet.jsp" /> + <import plugin="javax.servlet.jsp" />
+ <import plugin="org.apache.commons.logging" /> + <import plugin="org.apache.commons.logging" />
+ <import plugin="org.apache.lucene.analysis" /> + <import plugin="org.apache.lucene.analyzers-common" />
+ <import plugin="org.apache.lucene.core" /> + <import plugin="org.apache.lucene.core" />
+ <import plugin="org.eclipse.jetty.continuation" /> + <import plugin="org.eclipse.jetty.continuation" />
+ <import plugin="org.eclipse.jetty.http" /> + <import plugin="org.eclipse.jetty.http" />
@ -354,7 +354,7 @@ index 8176831..c97bab0 100644
+ <import plugin="org.apache.felix.gogo.command" /> + <import plugin="org.apache.felix.gogo.command" />
+ <import plugin="org.apache.felix.gogo.runtime" /> + <import plugin="org.apache.felix.gogo.runtime" />
+ <import plugin="org.apache.felix.gogo.shell" /> + <import plugin="org.apache.felix.gogo.shell" />
+ <import plugin="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" /> + <import plugin="javax.annotation-api" />
+ <import plugin="org.w3c.dom.svg" /> + <import plugin="org.w3c.dom.svg" />
+ <import plugin="org.w3c.css.sac" /> + <import plugin="org.w3c.css.sac" />
+ <import plugin="javax.inject" /> + <import plugin="javax.inject" />
@ -385,7 +385,7 @@ index 6f6526b..c05d703 100644
+ <bundle id="javax.servlet-api" /> + <bundle id="javax.servlet-api" />
+ <bundle id="javax.servlet.jsp" /> + <bundle id="javax.servlet.jsp" />
+ <bundle id="org.apache.commons.logging" /> + <bundle id="org.apache.commons.logging" />
+ <bundle id="org.apache.lucene.analysis" /> + <bundle id="org.apache.lucene.analyzers-common" />
+ <bundle id="org.apache.lucene.core" /> + <bundle id="org.apache.lucene.core" />
+ <bundle id="org.eclipse.jetty.continuation" /> + <bundle id="org.eclipse.jetty.continuation" />
+ <bundle id="org.eclipse.jetty.http" /> + <bundle id="org.eclipse.jetty.http" />
@ -404,7 +404,7 @@ index 6f6526b..c05d703 100644
+ <bundle id="org.apache.felix.gogo.command" /> + <bundle id="org.apache.felix.gogo.command" />
+ <bundle id="org.apache.felix.gogo.runtime" /> + <bundle id="org.apache.felix.gogo.runtime" />
+ <bundle id="org.apache.felix.gogo.shell" /> + <bundle id="org.apache.felix.gogo.shell" />
+ <bundle id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" /> + <bundle id="javax.annotation-api" />
+ <bundle id="org.w3c.dom.svg" /> + <bundle id="org.w3c.dom.svg" />
+ <bundle id="org.w3c.css.sac" /> + <bundle id="org.w3c.css.sac" />
+ <bundle id="javax.inject" /> + <bundle id="javax.inject" />

115
eclipse-fix-tests.patch Normal file
View File

@ -0,0 +1,115 @@
diff --git eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionPersistenceTests.java eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionPersistenceTests.java
index 945bafa..21dbc62 100644
--- eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionPersistenceTests.java
+++ eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionPersistenceTests.java
@@ -73,7 +73,7 @@ public class TargetDefinitionPersistenceTests extends TestCase {
*/
protected IPath getJdtFeatureLocation() {
IPath path = new Path(TargetPlatform.getDefaultLocation());
- path = path.append("features");
+ path = path.append("dropins").append("jdt").append("features");
File dir = path.toFile();
assertTrue("Missing features directory", dir.exists() && !dir.isFile());
String[] files = dir.list();
@@ -668,4 +668,4 @@ public class TargetDefinitionPersistenceTests extends TestCase {
assertTrue(iubc.getIncludeSource());
}
-}
\ No newline at end of file
+}
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
index f1f38f0..f9111e6 100644
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
@@ -217,7 +217,7 @@ public class AbstractReconcilerTest extends AbstractProvisioningTest {
File[] children = parent.listFiles(new FileFilter() {
public boolean accept(File pathname) {
String name = pathname.getName();
- return name.startsWith("eclipse-platform-");
+ return name.startsWith("eclipse-SDK-");
}
});
if (children != null && children.length == 1)
diff --git eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java
index 0245d89..e95ff8f 100644
--- eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java
+++ eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java
@@ -4416,6 +4416,10 @@ public void test434297() {
public void test436542() throws Exception {
String jreDirectory = Util.getJREDirectory();
String jfxJar = Util.toNativePath(jreDirectory + "/lib/ext/jfxrt.jar");
+ File file = new File(jfxJar);
+ if (!file.exists()) {
+ return;
+ }
this.runConformTest(
new String[] {
"Utility.java",
diff --git eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java
index 1a0cbcc..ddad62f 100644
--- eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java
+++ eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java
@@ -6781,6 +6781,10 @@ public void testBug434582a() {
public void test443467() throws Exception {
String jreDirectory = Util.getJREDirectory();
String jfxJar = Util.toNativePath(jreDirectory + "/lib/ext/jfxrt.jar");
+ File file = new File(jfxJar);
+ if (!file.exists()) {
+ return;
+ }
this.runNegativeTestWithExtraLibs(
new String[] {
"BuildIdeMain.java",
diff --git eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
index 376daa6..1742a8d 100644
--- eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
+++ eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
@@ -14,6 +14,7 @@ bin.includes = .,\
resources/,\
lib/
src.includes = about.html
-jars.compile.order = .
+jars.compile.order = .,\
+ lib/annotations.jar
source.. = src/
-output.. = bin/
+source.lib/annotations.jar = src/
diff --git eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
index f34ae40..0f9877d 100644
--- eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
+++ eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
@@ -21,4 +21,6 @@ bin.includes = plugin.xml,\
plugin.properties
src.includes = about.html
src.excludes = src-resources/
-jars.compile.order = aptext.jar,apt.jar,.
+jars.compile.order = aptext.jar,apt.jar,.,\
+ resources/question.jar
+source.resources/question.jar = src-resources/
diff --git eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties 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,\
.
src.includes = about.html
compilerArg=-proc:none
+source.lib/apttestprocessors.jar = processors/
+source.lib/apttestprocessors8.jar = processors/,\
+ processors8/
+jars.compile.order = lib/apttestprocessors.jar,\
+ lib/apttestprocessors8.jar,\
+ .

64
eclipse-lucene-4.patch
View File

@ -1,21 +1,3 @@
From f93bcfb45708895f90396552677f11881f342dc9 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Wed, 4 Mar 2015 15:10:27 +0000
Subject: [PATCH] Port to Lucene 4.
---
org.eclipse.help.base/META-INF/MANIFEST.MF | 4 +-
.../eclipse/help/internal/search/Analyzer_en.java | 27 +++++---
.../help/internal/search/DefaultAnalyzer.java | 13 ++--
.../search/LowerCaseAndDigitsTokenizer.java | 7 +-
.../eclipse/help/internal/search/QueryBuilder.java | 15 +++-
.../eclipse/help/internal/search/SearchIndex.java | 81 ++++++++++------------
.../help/internal/search/SmartAnalyzer.java | 14 ++--
.../help/internal/search/WordTokenStream.java | 2 +
org.eclipse.ua.tests/META-INF/MANIFEST.MF | 7 +-
.../help/search/PrebuiltIndexCompatibility.java | 6 +-
10 files changed, 94 insertions(+), 82 deletions(-)
diff --git a/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF b/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF diff --git a/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF b/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF
index ee34c8e..fdef3e6 100644 index ee34c8e..fdef3e6 100644
--- a/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF --- a/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF
@ -497,6 +479,46 @@ index 640d4c9..8924fa7 100644
} }
} else { } else {
fail("Cannot resolve to file protocol"); fail("Cannot resolve to file protocol");
-- diff --git a/dependencies/replace_platform_plugins_with_symlinks.sh b/dependencies/replace_platform_plugins_with_symlinks.sh
2.1.0 index b818924..f1a67b3 100755
--- a/dependencies/replace_platform_plugins_with_symlinks.sh
+++ b/dependencies/replace_platform_plugins_with_symlinks.sh
@@ -45,15 +45,7 @@ pushd $1
_symlink org.apache.felix.gogo.shell_ felix-gogo-shell/org.apache.felix.gogo.shell.jar
_symlink javax.annotation-api_ glassfish-annotation-api.jar
_symlink org.apache.lucene.core_ lucene/lucene-core.jar
- _symlink org.apache.lucene.analyzers-common_ lucene/lucene-analyzers-common.jar
- _symlink org.apache.lucene.analyzers-smartcn_ lucene/lucene-analyzers-smartcn.jar
- _symlink org.apache.lucene.queries lucene/lucene-queries.jar
- _symlink org.apache.lucene.queryparser lucene/lucene-queryparser.jar
- _symlink org.apache.lucene.sandbox lucene/lucene-sandbox.jar
- _symlink org.apache.xalan xalan-j2.jar
- _symlink org.apache.xerces xerces-j2.jar
- _symlink org.apache.xml.resolver xml-commons-resolver.jar
- _symlink org.apache.xml.serializer xalan-j2-serializer.jar
+ _symlink org.apache.lucene.analysis_ lucene/lucene-analyzers-common.jar
_symlink org.eclipse.jetty.util_ jetty/jetty-util.jar
_symlink org.eclipse.jetty.server_ jetty/jetty-server.jar
_symlink org.eclipse.jetty.http_ jetty/jetty-http.jar
--- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
@@ -95,7 +95,7 @@
<import plugin="javax.servlet" />
<import plugin="javax.servlet.jsp" />
<import plugin="org.apache.commons.logging" />
- <import plugin="org.apache.lucene.analyzers-common" />
+ <import plugin="org.apache.lucene.analysis" />
<import plugin="org.apache.lucene.core" />
<import plugin="org.eclipse.jetty.continuation" />
<import plugin="org.eclipse.jetty.http" />
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
@@ -50,7 +50,7 @@
<bundle id="javax.servlet-api" />
<bundle id="javax.servlet.jsp" />
<bundle id="org.apache.commons.logging" />
- <bundle id="org.apache.lucene.analyzers-common" />
+ <bundle id="org.apache.lucene.analysis" />
<bundle id="org.apache.lucene.core" />
<bundle id="org.eclipse.jetty.continuation" />
<bundle id="org.eclipse.jetty.http" />

2263
eclipse-lucene-5.patch Normal file
View File

File diff suppressed because it is too large Load Diff

16
eclipse-no-target-platform.patch
View File

@ -1,16 +0,0 @@
--- eclipse-platform-parent/pom.xml.orig 2015-01-30 11:09:37.156904060 +0000
+++ eclipse-platform-parent/pom.xml 2015-01-30 11:11:05.154445821 +0000
@@ -204,13 +204,6 @@
<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=453757
<resolveWithExecutionEnvironmentConstraints>false</resolveWithExecutionEnvironmentConstraints>
-->
- <target>
- <artifact>
- <groupId>org.eclipse</groupId>
- <artifactId>eclipse-sdk-prereqs</artifactId>
- <version>4.5.0-SNAPSHOT</version>
- </artifact>
- </target>
<environments>
<environment>
<os>linux</os>

2
eclipse-remove-w3c-smil-and-use-geronimo.patch → eclipse-remove-w3c-smil-and-use-glassfish.patch
View File

@ -5,7 +5,7 @@
<requirement> <requirement>
<type>eclipse-plugin</type> <type>eclipse-plugin</type>
- <id>javax.annotation</id> - <id>javax.annotation</id>
+ <id>org.apache.geronimo.specs.geronimo-annotation_1.1_spec</id> + <id>javax.annotation-api</id>
<versionRange>0.0.0</versionRange> <versionRange>0.0.0</versionRange>
</requirement> </requirement>
<requirement> <requirement>

4
eclipse-secondary-arches.patch
View File

@ -2,7 +2,7 @@ diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binari
index 7dd0536..66d79ee 100644 index 7dd0536..66d79ee 100644
--- a/eclipse.platform.swt.binaries/pom.xml --- a/eclipse.platform.swt.binaries/pom.xml
+++ b/eclipse.platform.swt.binaries/pom.xml +++ b/eclipse.platform.swt.binaries/pom.xml
@@ -53,6 +53,8 @@ @@ -63,6 +63,8 @@
<module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module> <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
<module>bundles/org.eclipse.swt.gtk.linux.s390</module> <module>bundles/org.eclipse.swt.gtk.linux.s390</module>
<module>bundles/org.eclipse.swt.gtk.linux.s390x</module> <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
@ -15,7 +15,7 @@ diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
index b46cdc6..0fb36a5 100644 index b46cdc6..0fb36a5 100644
--- a/rt.equinox.framework/pom.xml --- a/rt.equinox.framework/pom.xml
+++ b/rt.equinox.framework/pom.xml +++ b/rt.equinox.framework/pom.xml
@@ -54,6 +54,8 @@ @@ -64,6 +64,8 @@
<module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module> <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module> <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64</module> <module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64</module>

18
eclipse-support-symlink-bundles.patch
View File

@ -1,4 +1,4 @@
From ca186bc5d8c8f0ecde78aab255c02eed414e3cb1 Mon Sep 17 00:00:00 2001 From 0b0f725bdcf10918a25321a66c0abd4ddbbdd870 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com> From: Roland Grunberg <rgrunber@redhat.com>
Date: Fri, 12 Sep 2014 10:27:14 -0400 Date: Fri, 12 Sep 2014 10:27:14 -0400
Subject: [PATCH] Add support for regenerating bundle versions for symlinks. Subject: [PATCH] Add support for regenerating bundle versions for symlinks.
@ -10,11 +10,11 @@ regenerated every time, in case a change has occured.
Change-Id: Ifbe8efed2218a8a1250fd1ac59f0cdd6bdd5f309 Change-Id: Ifbe8efed2218a8a1250fd1ac59f0cdd6bdd5f309
--- ---
.../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 +
.../utils/SimpleConfiguratorUtils.java | 104 ++++++++++++++++++++- .../utils/SimpleConfiguratorUtils.java | 106 ++++++++++++++++++++-
2 files changed, 104 insertions(+), 1 deletion(-) 2 files changed, 106 insertions(+), 1 deletion(-)
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF
index 7f339b5..38b881c 100644 index d88d0a6..07fe087 100644
--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF --- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF
+++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF +++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Bundle-Activator: org.eclipse.equinox.internal.simpleconfigurator.Activator @@ -9,6 +9,7 @@ Bundle-Activator: org.eclipse.equinox.internal.simpleconfigurator.Activator
@ -26,7 +26,7 @@ index 7f339b5..38b881c 100644
org.osgi.framework.namespace;version="1.0.0", org.osgi.framework.namespace;version="1.0.0",
org.osgi.framework.wiring;version="1.2.0", org.osgi.framework.wiring;version="1.2.0",
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
index ab69b88..bde62e0 100644 index ab69b88..12e4d89 100644
--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java --- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java +++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
@@ -13,9 +13,15 @@ package org.eclipse.equinox.internal.simpleconfigurator.utils; @@ -13,9 +13,15 @@ package org.eclipse.equinox.internal.simpleconfigurator.utils;
@ -46,21 +46,23 @@ index ab69b88..bde62e0 100644
public class SimpleConfiguratorUtils { public class SimpleConfiguratorUtils {
@@ -283,6 +289,13 @@ public class SimpleConfiguratorUtils { @@ -283,6 +289,15 @@ public class SimpleConfiguratorUtils {
String symbolicName = tok.nextToken().trim(); String symbolicName = tok.nextToken().trim();
String version = tok.nextToken().trim(); String version = tok.nextToken().trim();
URI location = parseLocation(tok.nextToken().trim()); URI location = parseLocation(tok.nextToken().trim());
+ if (base != null) {
+ URI absLoc = URIUtil.append(base, location.toString()); + URI absLoc = URIUtil.append(base, location.toString());
+ // Symbolic links may change outside Eclipse so regenerate proper bundle version. + // Symbolic links may change outside Eclipse so regenerate proper bundle version.
+ if (Files.isSymbolicLink(Paths.get(absLoc))) { + if (Files.isSymbolicLink(Paths.get(absLoc))) {
+ // We can't depend on org.eclipse.equinox.internal.frameworkadmin.utils.Utils + // We can't depend on org.eclipse.equinox.internal.frameworkadmin.utils.Utils
+ Dictionary<String, String> manifest = getOSGiManifest(absLoc); + Dictionary<String, String> manifest = getOSGiManifest(absLoc);
+ version = manifest.get(Constants.BUNDLE_VERSION); + version = manifest.get(Constants.BUNDLE_VERSION);
+ }
+ } + }
int startLevel = Integer.parseInt(tok.nextToken().trim()); int startLevel = Integer.parseInt(tok.nextToken().trim());
boolean markedAsStarted = Boolean.valueOf(tok.nextToken()).booleanValue(); boolean markedAsStarted = Boolean.valueOf(tok.nextToken()).booleanValue();
BundleInfo result = new BundleInfo(symbolicName, version, location, startLevel, markedAsStarted); BundleInfo result = new BundleInfo(symbolicName, version, location, startLevel, markedAsStarted);
@@ -421,4 +434,93 @@ public class SimpleConfiguratorUtils { @@ -421,4 +436,93 @@ public class SimpleConfiguratorUtils {
} }
return regularTimestamp; return regularTimestamp;
} }
@ -155,5 +157,5 @@ index ab69b88..bde62e0 100644
+ } + }
} }
-- --
1.9.3 2.1.0

8
eclipse-test-support.patch
View File

@ -122,7 +122,7 @@
<antcall target="runSuite" /> <antcall target="runSuite" />
<antcall target="genResults" /> <antcall target="genResults" />
</target> </target>
@@ -1430,6 +1370,15 @@ @@ -1431,6 +1371,15 @@
value="end longRunningTests" /> value="end longRunningTests" />
</antcall> </antcall>
@ -138,7 +138,7 @@
</target> </target>
<!-- <!--
@@ -1471,7 +1420,6 @@ @@ -1472,7 +1421,6 @@
<antcall target="e4CssSwt" /> <antcall target="e4CssSwt" />
<antcall target="e4UI" /> <antcall target="e4UI" />
<antcall target="equinoxds" /> <antcall target="equinoxds" />
@ -146,7 +146,7 @@
<antcall target="bidi" /> <antcall target="bidi" />
<antcall target="ltkuirefactoringtests" /> <antcall target="ltkuirefactoringtests" />
<antcall target="ltkcorerefactoringtests" /> <antcall target="ltkcorerefactoringtests" />
@@ -1485,7 +1433,6 @@ @@ -1486,7 +1434,6 @@
<antcall target="osgi" /> <antcall target="osgi" />
<antcall target="coreresources" /> <antcall target="coreresources" />
<antcall target="equinoxp2" /> <antcall target="equinoxp2" />
@ -154,7 +154,7 @@
<antcall target="jface" /> <antcall target="jface" />
<antcall target="ui" /> <antcall target="ui" />
<antcall target="uiperformance" /> <antcall target="uiperformance" />
@@ -1568,7 +1515,7 @@ @@ -1569,7 +1516,7 @@
<property <property
name="message" name="message"
value="no message given by caller" /> value="no message given by caller" />

194
eclipse.spec
View File

@ -10,11 +10,18 @@ Epoch: 1
%global eclipse_major 4 %global eclipse_major 4
%global eclipse_minor 5 %global eclipse_minor 5
%global eclipse_micro 0 %global eclipse_micro 1
%global eb_commit da55ff01f3de743f70197a9addb386a6d2183b60 %global eb_commit f53a7bd2aedc58f1226833639b07e6dc7faf0470
%global eclipse_tag R4_5 %global eclipse_tag R4_5_1
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro} %global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
%if 0%{?fedora} >= 23
%global _jetty_version 9.3.0
%global _lucene_version 5.3.0
%else
%global _jetty_version 9.2.9 %global _jetty_version 9.2.9
%global _lucene_version 4.10.3
%endif
%ifarch %{ix86} %ifarch %{ix86}
%define eclipse_arch x86 %define eclipse_arch x86
@ -37,7 +44,7 @@ Epoch: 1
Summary: An open, extensible IDE Summary: An open, extensible IDE
Name: eclipse Name: eclipse
Version: %{eclipse_version} Version: %{eclipse_version}
Release: 7%{?dist} Release: 1%{?dist}
License: EPL License: EPL
URL: http://www.eclipse.org/ URL: http://www.eclipse.org/
@ -45,7 +52,7 @@ URL: http://www.eclipse.org/
Source0: R4_platform-aggregator-%{eclipse_tag}.tar.xz Source0: R4_platform-aggregator-%{eclipse_tag}.tar.xz
Source1: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-%{eb_commit}.tar.xz Source1: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-%{eb_commit}.tar.xz
Patch0: %{pkg_name}-remove-w3c-smil-and-use-geronimo.patch Patch0: %{pkg_name}-remove-w3c-smil-and-use-glassfish.patch
# Eclipse should not include source for dependencies that are not supplied by this package # Eclipse should not include source for dependencies that are not supplied by this package
# and should not include source for bundles that are not relevant to our platform # and should not include source for bundles that are not relevant to our platform
@ -87,9 +94,6 @@ Patch13: %{pkg_name}-fix-dropins.patch
Patch14: %{pkg_name}-bug-386377.patch Patch14: %{pkg_name}-bug-386377.patch
# Resolving the target platform requires too many changes, so don't use it
Patch15: %{pkg_name}-no-target-platform.patch
# org.mockito -> org.mockito.mockito-core # org.mockito -> org.mockito.mockito-core
Patch16: %{pkg_name}-mockito.patch Patch16: %{pkg_name}-mockito.patch
@ -109,18 +113,22 @@ Patch19: %{pkg_name}-support-symlink-bundles.patch
# -org.apache.jasper.glassfish # -org.apache.jasper.glassfish
# +org.glassfish.web.javax.servlet.jsp # +org.glassfish.web.javax.servlet.jsp
# -javax.annotation # -javax.annotation
# +org.apache.geronimo.specs.geronimo-annotation_1.1_spec # +javax.annotation-api
# -org.w3c.dom.smil # -org.w3c.dom.smil
Patch20: %{pkg_name}-feature-plugins-to-category-ius.patch Patch20: %{pkg_name}-feature-plugins-to-category-ius.patch
Patch21: disable-non-linux.patch Patch21: disable-non-linux.patch
# Lucene 4.10 porting patch %if 0%{?fedora} >= 23
# Port to Lucene 5
Patch22: eclipse-lucene-5.patch
%else
# Port to Lucene 4
Patch22: eclipse-lucene-4.patch Patch22: eclipse-lucene-4.patch
%endif
Patch23: %{pkg_name}-javaxannotation-import.patch Patch23: %{pkg_name}-javaxannotation-import.patch
Patch24: %{pkg_name}-fix-tests.patch
# For https://bugzilla.redhat.com/show_bug.cgi?id=1255150 Patch25: %{pkg_name}-adjust-droplets.patch
Patch24: eclipse-bug-466499.patch
BuildRequires: rsync BuildRequires: rsync
BuildRequires: make, gcc BuildRequires: make, gcc
@ -134,8 +142,8 @@ BuildRequires: desktop-file-utils
BuildRequires: java-1.8.0-openjdk-devel BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: libXt-devel BuildRequires: libXt-devel
BuildRequires: libXtst-devel BuildRequires: libXtst-devel
%if 0%{?fedora}
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
%if 0%{?fedora}
BuildRequires: gtk3-devel BuildRequires: gtk3-devel
BuildRequires: webkitgtk-devel BuildRequires: webkitgtk-devel
BuildRequires: webkitgtk4-devel BuildRequires: webkitgtk4-devel
@ -144,11 +152,9 @@ BuildRequires: webkitgtk4-devel
BuildRequires: gtk3-devel BuildRequires: gtk3-devel
BuildRequires: webkitgtk3-devel BuildRequires: webkitgtk3-devel
%else %else
BuildRequires: gtk2-devel
BuildRequires: webkitgtk-devel BuildRequires: webkitgtk-devel
%endif %endif
%endif %endif
BuildRequires: geronimo-annotation >= 1.0-7
BuildRequires: icu4j >= 1:54.1.1-2 BuildRequires: icu4j >= 1:54.1.1-2
BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
@ -166,8 +172,10 @@ BuildRequires: osgi(org.eclipse.jetty.continuation) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.io) >= %{_jetty_version} BuildRequires: osgi(org.eclipse.jetty.io) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.security) >= %{_jetty_version} BuildRequires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version} BuildRequires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
BuildRequires: lucene-core >= 4.10.3 BuildRequires: lucene-core >= %{_lucene_version}
BuildRequires: lucene-analysis >= 4.10.3 BuildRequires: lucene-analysis >= %{_lucene_version}
BuildRequires: lucene-queryparser >= %{_lucene_version}
BuildRequires: lucene-analyzers-smartcn >= %{_lucene_version}
BuildRequires: junit >= 4.10-5 BuildRequires: junit >= 4.10-5
BuildRequires: hamcrest >= 0:1.3-11 BuildRequires: hamcrest >= 0:1.3-11
BuildRequires: sat4j >= 2.3.5-1 BuildRequires: sat4j >= 2.3.5-1
@ -177,27 +185,28 @@ BuildRequires: batik-css >= 1.8-0.17
BuildRequires: xml-commons-apis >= 1.4.01-12 BuildRequires: xml-commons-apis >= 1.4.01-12
BuildRequires: atinject >= 1-18 BuildRequires: atinject >= 1-18
BuildRequires: atinject-tck >= 1-18 BuildRequires: atinject-tck >= 1-18
BuildRequires: tycho >= 0.22.0-15 BuildRequires: tycho >= 0.23.0
BuildRequires: tycho-extras >= 0.22 BuildRequires: tycho-extras >= 0.23.0
BuildRequires: cbi-plugins BuildRequires: cbi-plugins
BuildRequires: eclipse-ecf-core >= 3.10.1-1 BuildRequires: eclipse-ecf-core >= 3.11.0-1
BuildRequires: eclipse-emf-core >= 1:2.10.1-1 BuildRequires: eclipse-emf-core >= 1:2.11.0-1
BuildRequires: eclipse-license BuildRequires: eclipse-license
BuildRequires: glassfish-jsp-api >= 2.2.1-4 BuildRequires: glassfish-jsp-api >= 2.2.1-4
BuildRequires: glassfish-jsp >= 2.2.5 BuildRequires: glassfish-jsp >= 2.2.5
BuildRequires: glassfish-servlet-api >= 3.1.0 BuildRequires: glassfish-servlet-api >= 3.1.0
BuildRequires: xml-maven-plugin BuildRequires: xml-maven-plugin
BuildRequires: httpcomponents-core >= 4.4-1 BuildRequires: httpcomponents-core
BuildRequires: httpcomponents-client >= 4.4-1 BuildRequires: httpcomponents-client
BuildRequires: xz-java BuildRequires: xz-java
BuildRequires: mockito BuildRequires: mockito
BuildRequires: osgi(osgi.annotation) BuildRequires: osgi(osgi.annotation)
BuildRequires: glassfish-annotation-api
%if ! %{bootstrap} %if ! %{bootstrap}
# Build deps that are excluded when bootstrapping # Build deps that are excluded when bootstrapping
BuildRequires: eclipse-pde BuildRequires: eclipse-pde
# Build deps needed for contributor tools # Build deps needed for contributor tools
BuildRequires: eclipse-egit >= 4.0.0 BuildRequires: eclipse-egit >= 4.0.0
BuildRequires: eclipse-emf BuildRequires: eclipse-emf-runtime
%endif %endif
%description %description
@ -253,25 +262,27 @@ Requires: osgi(org.eclipse.jetty.continuation) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.io) >= %{_jetty_version} Requires: osgi(org.eclipse.jetty.io) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.security) >= %{_jetty_version} Requires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version} Requires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
Requires: osgi(javax.annotation-api)
Requires: jsch >= 0.1.46-2 Requires: jsch >= 0.1.46-2
Requires: lucene-core >= 4.10.2 Requires: lucene-core >= %{_lucene_version}
Requires: lucene-analysis >= 4.10.2 Requires: lucene-analysis >= %{_lucene_version}
Requires: lucene-queryparser >= %{_lucene_version}
Requires: lucene-analyzers-smartcn >= %{_lucene_version}
Requires: sat4j >= 2.3.5-1 Requires: sat4j >= 2.3.5-1
Requires: sac >= 1.3-12 Requires: sac >= 1.3-12
Requires: batik-css >= 1.8-0.17 Requires: batik-css >= 1.8-0.17
Requires: xml-commons-apis >= 1.4.01-12 Requires: xml-commons-apis >= 1.4.01-12
Requires: atinject >= 1-18 Requires: atinject >= 1-18
Requires: geronimo-annotation >= 1.0-7 Requires: eclipse-ecf-core >= 3.11.0-1
Requires: eclipse-ecf-core >= 3.10.1-1 Requires: eclipse-emf-core >= 1:2.11.0-1
Requires: eclipse-emf-core >= 1:2.10.1-1
Requires: glassfish-jsp-api >= 2.2.1-4 Requires: glassfish-jsp-api >= 2.2.1-4
Requires: glassfish-jsp >= 2.2.5 Requires: glassfish-jsp >= 2.2.5
Requires: glassfish-servlet-api >= 3.1.0 Requires: glassfish-servlet-api >= 3.1.0
Requires: icu4j >= 1:54.1.1-2 Requires: icu4j >= 1:54.1.1-2
Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release} Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release} Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
Requires: httpcomponents-core >= 4.4-1 Requires: httpcomponents-core
Requires: httpcomponents-client >= 4.4-1 Requires: httpcomponents-client
Requires: xz-java Requires: xz-java
%description platform %description platform
@ -280,6 +291,7 @@ Java Development Tools or the Plugin Development Environment.
%package jdt %package jdt
Summary: Eclipse Java Development Tools Summary: Eclipse Java Development Tools
Provides: %{name} = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release} Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
Requires: junit >= 4.10-5 Requires: junit >= 4.10-5
Requires: hamcrest-core >= 0:1.3-11 Requires: hamcrest-core >= 0:1.3-11
@ -290,7 +302,6 @@ developing software written in the Java programming language.
%package pde %package pde
Summary: Eclipse Plugin Development Environment Summary: Eclipse Plugin Development Environment
Provides: %{name} = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release} Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-jdt = %{epoch}:%{eclipse_version}-%{release} Requires: %{name}-jdt = %{epoch}:%{eclipse_version}-%{release}
Requires: objectweb-asm >= 5.0.3-1 Requires: objectweb-asm >= 5.0.3-1
@ -354,7 +365,6 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch12 %patch12
%patch13 %patch13
%patch14 %patch14
%patch15
%patch16 %patch16
%patch17 %patch17
%patch18 %patch18
@ -362,11 +372,14 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch20 %patch20
%patch21 %patch21
%patch22 -p1 %patch22 -p1
pushd eclipse.platform.ui pushd eclipse.platform.ui
%patch23 -p1 %patch23 -p1
popd popd
%patch24 -p1 %patch24
%patch25
# Resolving the target platform requires too many changes, so don't use it
%pom_xpath_remove "pom:configuration/pom:target" eclipse-platform-parent
# Disable as many things as possible to make the build faster. We care only for Eclipse. # Disable as many things as possible to make the build faster. We care only for Eclipse.
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder %pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
@ -402,6 +415,7 @@ popd
%pom_disable_module bundles/org.eclipse.osgi.compatibility.plugins rt.equinox.framework %pom_disable_module bundles/org.eclipse.osgi.compatibility.plugins rt.equinox.framework
%pom_xpath_remove "feature[@id='org.eclipse.osgi.compatibility.plugins.feature']" \ %pom_xpath_remove "feature[@id='org.eclipse.osgi.compatibility.plugins.feature']" \
eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
sed -i -e '/OldStylePluginTests/d' ./rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/AutomatedTests.java
# This part generates secondary fragments using primary fragments # This part generates secondary fragments using primary fragments
for dir in eclipse.platform.swt.binaries/bundles \ for dir in eclipse.platform.swt.binaries/bundles \
@ -544,8 +558,6 @@ sed -i -e "2iRequire-Bundle: javax.servlet-api" rt.equinox.bundles/bundles/org.e
%pom_remove_plugin org.mortbay.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp %pom_remove_plugin org.mortbay.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp
sed -i -e 's@Dhelp.lucene.tokenizer=standard@XX:MaxPermSize=384M@g' eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
# Remove generated files not present during bootstrap build # Remove generated files not present during bootstrap build
# org.eclipse.platform.doc.isv, org.eclipse.jdt.doc.isv, org.eclipse.pde.doc.user # org.eclipse.platform.doc.isv, org.eclipse.jdt.doc.isv, org.eclipse.pde.doc.user
%if %{bootstrap} %if %{bootstrap}
@ -559,6 +571,7 @@ ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles/org.eclipse.equinox.coordinator/lib/ ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles/org.eclipse.equinox.coordinator/lib/
# It would be nice if upstream were refactored to make selecting features by maven groupId easier... # It would be nice if upstream were refactored to make selecting features by maven groupId easier...
%mvn_package "::pom::" __noinstall
%mvn_package ":org.eclipse.equinox.p2.discovery.{feature,compatibility}" p2-discovery %mvn_package ":org.eclipse.equinox.p2.discovery.{feature,compatibility}" p2-discovery
%mvn_package ":org.eclipse.equinox.p2{,.ui}.discovery" p2-discovery %mvn_package ":org.eclipse.equinox.p2{,.ui}.discovery" p2-discovery
%mvn_package ":org.eclipse.e4{,.core}.tools*" contributor-tools %mvn_package ":org.eclipse.e4{,.core}.tools*" contributor-tools
@ -570,7 +583,7 @@ ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles
%build %build
#This is the lowest value where the build succeeds. 512m is not enough. #This is the lowest value where the build succeeds. 512m is not enough.
export MAVEN_OPTS="-Xmx1000m -XX:MaxPermSize=256m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}" export MAVEN_OPTS="-Xmx1000m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
export JAVA_HOME=%{java_home} export JAVA_HOME=%{java_home}
%mvn_build -j -f -- -DforceContextQualifier=$(date -u +v%Y%m%d-%H00) \ %mvn_build -j -f -- -DforceContextQualifier=$(date -u +v%Y%m%d-%H00) \
@ -579,7 +592,7 @@ export JAVA_HOME=%{java_home}
%endif %endif
-Declipse.javadoc=/usr/bin/javadoc -Dnative=gtk.linux.%{eclipse_arch} \ -Declipse.javadoc=/usr/bin/javadoc -Dnative=gtk.linux.%{eclipse_arch} \
-Dtycho.local.keepTarget \ -Dtycho.local.keepTarget \
-Dfedora.p2.repos=`pwd`/.m2/p2/repo-sdk -DbuildType=Z -Dfedora.p2.repos=`pwd`/.m2/p2/repo-sdk/plugins -DbuildType=Z
#ant again #ant again
dependencies/fake_ant_dependency.sh \ dependencies/fake_ant_dependency.sh \
@ -594,9 +607,6 @@ utils/move_JDT_PDE_to_dropins.sh \
"jdt cvs sdk" "jdt cvs sdk"
# Symlink necessary plugins that are provided by other packages # Symlink necessary plugins that are provided by other packages
sed -i -e 's/analyzers-common_/analysis_/' -e '/org\.apache\.x/d' \
-e '/lucene\.sandbox/d' -e '/lucene\.queries/d' -e '/lucene\.analyzers/d' -e '/lucene\.queryparser/d' \
dependencies/replace_platform_plugins_with_symlinks.sh
dependencies/replace_platform_plugins_with_symlinks.sh \ dependencies/replace_platform_plugins_with_symlinks.sh \
eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse %{_javadir} eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse %{_javadir}
@ -626,15 +636,19 @@ sed -i "s|-Xms40m|-Xms128m|g" eclipse.ini
sed -i "s|-Xmx512m|-Xmx1024m|g" eclipse.ini sed -i "s|-Xmx512m|-Xmx1024m|g" eclipse.ini
sed -i '1i-protect\nmaster' eclipse.ini sed -i '1i-protect\nmaster' eclipse.ini
# Use GTK3 by default on F22 or newer # Use GTK3 by default on Fedora or RHEL 7 and newer
%if 0%{?fedora} >= 22 %if 0%{?fedora}
sed -i '5i--launcher.GTK_version\n3' eclipse.ini
%else
%if 0%{?rhel} >= 7
sed -i '5i--launcher.GTK_version\n3' eclipse.ini sed -i '5i--launcher.GTK_version\n3' eclipse.ini
%else %else
sed -i '5i--launcher.GTK_version\n2' eclipse.ini sed -i '5i--launcher.GTK_version\n2' eclipse.ini
%endif %endif
%endif
# Temporary fix until https://bugs.eclipse.org/294877 is resolved # Temporary fix until https://bugs.eclipse.org/294877 is resolved
cat >> eclipse.ini <<EOF cat >> eclipse.ini <<EOFINI
-Dorg.eclipse.swt.browser.UseWebKitGTK=true -Dorg.eclipse.swt.browser.UseWebKitGTK=true
-Dhelp.lucene.tokenizer=standard -Dhelp.lucene.tokenizer=standard
-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith -XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith
@ -644,8 +658,9 @@ cat >> eclipse.ini <<EOF
-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile -XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile
-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState
-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%{_datadir}/eclipse/dropins -Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%{_datadir}/eclipse/dropins
-Dp2.fragments=%{_datadir}/eclipse/droplets,%{_libdir}/eclipse/droplets
-Declipse.p2.skipMovedInstallDetection=true -Declipse.p2.skipMovedInstallDetection=true
EOF EOFINI
popd #eclipse popd #eclipse
@ -655,8 +670,8 @@ popd #eclipse
# Some directories we need # Some directories we need
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir} install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}
install -d -m 755 $RPM_BUILD_ROOT%{_jnidir} install -d -m 755 $RPM_BUILD_ROOT%{_jnidir}
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{pkg_name} install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/eclipse
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/buildscripts install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/eclipse/buildscripts
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -d -m 755 $RPM_BUILD_ROOT%{_bindir} install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
@ -815,12 +830,15 @@ popd
sed -i -e "s#@libdir@#%{_libdir}#" $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.sh sed -i -e "s#@libdir@#%{_libdir}#" $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.sh
sed -i -e "s#@USR@#%{?_scl_root}%{_usr}#" $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.sh sed -i -e "s#@USR@#%{?_scl_root}%{_usr}#" $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.sh
touch $RPM_BUILD_ROOT%{_bindir}/%{pkg_name}-runEclipsePackageTests touch $RPM_BUILD_ROOT%{_bindir}/eclipse-runEclipsePackageTests
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runEclipsePackageTests chmod a+x $RPM_BUILD_ROOT/%{_bindir}/eclipse-runEclipsePackageTests
echo '#!/bin/sh' >> $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runEclipsePackageTests echo '#!/bin/sh' >> $RPM_BUILD_ROOT/%{_bindir}/eclipse-runEclipsePackageTests
echo 'echo "results in /tmp/eclipse-tests-directory/results/"' >> $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runEclipsePackageTests echo 'echo "results in /tmp/eclipse-tests-directory/results/"' >> $RPM_BUILD_ROOT/%{_bindir}/eclipse-runEclipsePackageTests
echo 'export testslocation="%{_javadir}/eclipse-testing/"' >> $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runEclipsePackageTests echo 'export testslocation="%{_javadir}/eclipse-testing/"' >> $RPM_BUILD_ROOT/%{_bindir}/eclipse-runEclipsePackageTests
echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{eclipse_arch} ; popd;" >> $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runEclipsePackageTests echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{eclipse_arch} ; popd;" >> $RPM_BUILD_ROOT/%{_bindir}/eclipse-runEclipsePackageTests
# These properties are not correct and nested properties won't get resolved
sed -i '/org.eclipse.equinox.p2.reconciler.test/ d' $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/equinoxp2tests.properties
# Package testbundle-to-eclipse-test # Package testbundle-to-eclipse-test
cp -r testbundle-to-eclipse-test $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle cp -r testbundle-to-eclipse-test $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle
@ -857,7 +875,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
fi fi
%files swt -f .mfiles-swt %files swt -f .mfiles-swt
%{_libdir}/%{pkg_name}/eclipse.ini
%{_libdir}/%{pkg_name}/plugins/org.eclipse.swt_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.swt_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.swt.gtk.linux.* %{_libdir}/%{pkg_name}/plugins/org.eclipse.swt.gtk.linux.*
%{_libdir}/%{pkg_name}/swt.jar %{_libdir}/%{pkg_name}/swt.jar
@ -902,9 +919,15 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.command_* %{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.command_*
%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.runtime_* %{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.runtime_*
%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.shell_* %{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.shell_*
%{_libdir}/%{pkg_name}/plugins/org.apache.geronimo.specs.geronimo-annotation_1.1_spec_* %{_libdir}/%{pkg_name}/plugins/javax.annotation-api_*
%{_libdir}/%{pkg_name}/plugins/org.glassfish.web.javax.servlet.jsp_* %{_libdir}/%{pkg_name}/plugins/org.glassfish.web.javax.servlet.jsp_*
%{_libdir}/%{pkg_name}/plugins/org.apache.lucene.* %{_libdir}/%{pkg_name}/plugins/org.apache.lucene.*
%if 0%{?fedora} >= 23
%{_libdir}/%{pkg_name}/plugins/org.apache.xalan_*
%{_libdir}/%{pkg_name}/plugins/org.apache.xerces_*
%{_libdir}/%{pkg_name}/plugins/org.apache.xml.resolver_*
%{_libdir}/%{pkg_name}/plugins/org.apache.xml.serializer_*
%endif
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ant.core_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.ant.core_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.compare_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.compare_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.compare.core_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.compare.core_*
@ -1090,25 +1113,58 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog %changelog
* Wed Aug 26 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-7 * Wed Sep 30 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-1
- Update to Mars.1
- Fix JDT javafx and annotation processor tests
* Wed Sep 16 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.0-19
- Rebuild for new eclipse-ecf
* Wed Sep 9 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.0-18
- Rebuild for new eclipse-ecf
* Mon Sep 07 2015 Michael Simacek <msimacek@redhat.com> - 1:4.5.0-17
- Rebuild for httpcomponents-core-4.4.2
* Tue Sep 01 2015 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.0-16
- Modify copy-platform script to support p2 Droplets.
* Thu Aug 27 2015 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.0-15
- Add support for p2 Droplets.
* Wed Aug 26 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-14
- Rebuild for new ECF - Rebuild for new ECF
* Thu Aug 20 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-6 * Thu Aug 20 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-13
- Add patch for rhbz#1255150 - Add patch for rhbz#1255150
- Use older requires on emf (not emf-runtime) - Always use UTC timestamps to prevent rpmdiff failures
- Always use UTC timestamps - Move eclipse provides away from PDE rhbz#1253898
* Tue Aug 11 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-5 * Tue Aug 11 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-12
- Non-bootstrap build
- Rebuild for new ECF - Rebuild for new ECF
* Wed Aug 05 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-4.2 * Thu Aug 6 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-11
- Fix erroneous requires on httpcomponents - Update to newer e-b snapshot fixing appdata validation.
* Wed Jul 15 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-4.1 * Thu Jul 30 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-10
- Backport Mars updates to F22 - Preserve JDT core test data
- Port to lucen 4.10
- Enable bootstrap mode * Wed Jul 22 2015 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.0-9
- Fix JDT Feature path for TargetDefinitionPersistenceTests (PDE)
- SimpleConfiguratorUtils should handle base == null for tests
- Locate the compressed platform archive for p2 AbstractReconcilerTest
* Mon Jul 20 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-8
- Disable tests for Eclipse 2.x style plug-in support that we don't ship
* Fri Jul 17 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-7
- Less PermSize settings - simply ignored in Java 8.
* Thu Jul 16 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-6
- Eclipse.ini has no place in swt subpackage.
* Wed Jul 15 2015 Sopot Cela <scela@redhat.com> 1:4.5.0-5
- Replaced javax.annotation provider from geronimo to glassfish
* Tue Jul 7 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.0-4 * Tue Jul 7 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.0-4
- Add Maven metadata for SWT - Add Maven metadata for SWT

11
get-eclipse.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -e set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
TAG=R4_5 TAG=R4_5_1
rm -rf R4_platform-aggregator-$TAG rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz rm -rf R4_platform-aggregator-$TAG.tar.xz
@ -9,23 +9,24 @@ rm -rf R4_platform-aggregator-$TAG.tar.xz
# adding --depth 1 here may result in a quicker clone, but did not work for me # adding --depth 1 here may result in a quicker clone, but did not work for me
git clone --branch $TAG $AGGREGATOR_PATH R4_platform-aggregator-$TAG git clone --branch $TAG $AGGREGATOR_PATH R4_platform-aggregator-$TAG
pushd R4_platform-aggregator-$TAG pushd R4_platform-aggregator-$TAG
git submodule init git submodule init
git submodule update git submodule update
rm -rf bootstrap streams scripts rm -rf bootstrap devutils streams scripts
# Comment this line to get a shallow clone. # Comment this line to get a shallow clone.
find . -type d -name ".git" | xargs rm -rf find . -type d -name ".git" | xargs rm -rf
# Delete pre-built binary artifacts # Delete pre-built binary artifacts except some test data that cannot be generated
find . -type f -name *.jar -delete find . ! -path "*/JCL/*" \
-type f -name *.jar -delete
find . -type f -name *.class -delete find . -type f -name *.class -delete
find . -type f -name *.so -delete find . -type f -name *.so -delete
find . -type f -name *.dll -delete find . -type f -name *.dll -delete
find . -type f -name *.jnilib -delete find . -type f -name *.jnilib -delete
find . -type f -name *.exe -delete
# Remove pre-compiled native launchers # Remove pre-compiled native launchers
rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/

4
sources
View File

@ -1,2 +1,2 @@
0c073108639c62aeb02c9e1fc1e8ef30 org.eclipse.linuxtools.eclipse-build-da55ff01f3de743f70197a9addb386a6d2183b60.tar.xz 8500e4cef00ed0feee3d1c908e3b954c R4_platform-aggregator-R4_5_1.tar.xz
8d1b5040c96abd98b61aca3bb58478d7 R4_platform-aggregator-R4_5.tar.xz 2858c18b10628c8c76be18ff60351de0 org.eclipse.linuxtools.eclipse-build-f53a7bd2aedc58f1226833639b07e6dc7faf0470.tar.xz