Compare commits
No commits in common. "f29-riscv64" and "master" have entirely different histories.
f29-riscv6
...
master
@ -1,6 +1,6 @@
|
||||
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2018-08-19 12:37:52.764590467 +0100
|
||||
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2018-08-19 12:38:15.032503913 +0100
|
||||
@@ -75,7 +75,8 @@
|
||||
@@ -72,7 +72,8 @@
|
||||
|
||||
MAKE_TYPE=make
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
if [ "${OS}" = "" ]; then
|
||||
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak.orig 2014-03-12 14:47:37.513191381 +0000
|
||||
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak 2014-03-12 14:47:45.672200015 +0000
|
||||
@@ -94,7 +94,7 @@
|
||||
@@ -91,7 +91,7 @@
|
||||
-DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \
|
||||
-DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\""
|
||||
LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java.orig 2014-03-24 12:06:59.530918305 +0000
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 2014-03-24 12:07:42.709932098 +0000
|
||||
@@ -1383,7 +1383,7 @@
|
||||
@@ -1362,7 +1362,7 @@
|
||||
String appVersion = props.getProperty(PRODUCT_SITE_VERSION);
|
||||
if (appVersion == null || appVersion.trim().length() == 0)
|
||||
appVersion = ""; //$NON-NLS-1$
|
||||
@ -11,7 +11,7 @@
|
||||
// in the user's home dir.
|
||||
--- rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java.orig 2014-03-24 12:05:52.666896971 +0000
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java 2014-03-24 12:06:46.076914704 +0000
|
||||
@@ -308,7 +308,7 @@
|
||||
@@ -296,7 +296,7 @@
|
||||
String appVersion = props.getProperty(PRODUCT_SITE_VERSION);
|
||||
if (appVersion == null || appVersion.trim().length() == 0)
|
||||
appVersion = ""; //$NON-NLS-1$
|
||||
|
@ -1,117 +1,5 @@
|
||||
diff --git a/eclipse.jdt/org.eclipse.jdt-feature/pom.xml b/eclipse.jdt/org.eclipse.jdt-feature/pom.xml
|
||||
index eb364d213..bfd89007b 100644
|
||||
--- a/eclipse.jdt/org.eclipse.jdt-feature/pom.xml
|
||||
+++ b/eclipse.jdt/org.eclipse.jdt-feature/pom.xml
|
||||
@@ -57,6 +57,8 @@
|
||||
<excludes>
|
||||
<plugin id="org.eclipse.jdt"/>
|
||||
<plugin id="org.eclipse.jdt.doc.user"/>
|
||||
+ <plugin id="org.junit" />
|
||||
+ <plugin id="org.hamcrest.core" />
|
||||
</excludes>
|
||||
</configuration>
|
||||
</execution>
|
||||
diff --git a/eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml b/eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml
|
||||
index 4dc27f70e..42922169b 100644
|
||||
--- a/eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml
|
||||
+++ b/eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml
|
||||
@@ -38,6 +38,8 @@
|
||||
<configuration>
|
||||
<excludes>
|
||||
<plugin id="org.eclipse.pde"/>
|
||||
+ <plugin id="org.objectweb.asm"/>
|
||||
+ <plugin id="org.objectweb.asm.tree"/>
|
||||
<plugin id="org.eclipse.pde.doc.user"/>
|
||||
</excludes>
|
||||
</configuration>
|
||||
diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml
|
||||
index 52e7248ed..b84a3d8e2 100644
|
||||
--- a/eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml
|
||||
+++ b/eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml
|
||||
@@ -34,6 +34,17 @@
|
||||
<goals>
|
||||
<goal>source-feature</goal>
|
||||
</goals>
|
||||
+ <configuration>
|
||||
+ <excludes>
|
||||
+ <plugin id="javax.servlet-api" /><plugin id="javax.el" /><plugin id="com.sun.el.javax.el" /><plugin id="org.apache.el" /><plugin id="org.apache.commons.logging" />
|
||||
+ <plugin id="javax.servlet.jsp" /><plugin id="org.apache.lucene.analysis" /><plugin id="org.apache.lucene.core" />
|
||||
+ <plugin id="org.apache.tomcat" /><plugin id="org.eclipse.jetty.continuation" /><plugin id="org.eclipse.jetty.http" />
|
||||
+ <plugin id="org.apache.juli" /><plugin id="org.eclipse.jetty.io" /><plugin id="org.eclipse.jetty.security" />
|
||||
+ <plugin id="org.eclipse.jetty.util" /><plugin id="org.eclipse.jetty.server" />
|
||||
+ <plugin id="org.glassfish.web.javax.servlet.jsp" /><plugin id="org.eclipse.jetty.servlet" />
|
||||
+ <plugin id="org.apache.commons.el" /><plugin id="org.glassfish.web.javax.servlet.jsp" />
|
||||
+ </excludes>
|
||||
+ </configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
|
||||
index c859e4f4e..d46431dba 100644
|
||||
--- a/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
|
||||
+++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
|
||||
@@ -68,6 +68,8 @@
|
||||
<plugin id="org.eclipse.core.net.linux.x86_64"/>
|
||||
<plugin id="org.eclipse.core.net.win32.x86"/>
|
||||
<plugin id="org.eclipse.core.net.win32.x86_64"/>
|
||||
+ <plugin id="com.jcraft.jsch"/>
|
||||
+ <plugin id="org.apache.ant"/>
|
||||
</excludes>
|
||||
</configuration>
|
||||
</execution>
|
||||
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk/feature.xml
|
||||
index 2bd82f8d8..a090f9d26 100644
|
||||
--- a/eclipse.platform.releng/features/org.eclipse.sdk/feature.xml
|
||||
+++ b/eclipse.platform.releng/features/org.eclipse.sdk/feature.xml
|
||||
@@ -51,16 +51,6 @@
|
||||
id="org.eclipse.help.source"
|
||||
version="0.0.0"/>
|
||||
|
||||
- <requires>
|
||||
- <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.ecf.core.feature.source" version="1.4.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.core.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.feature.source" version="3.13.7" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.feature.source" version="3.13.7" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||
- </requires>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.sdk"
|
||||
diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
|
||||
index 2e623ec74..d48879a10 100644
|
||||
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
|
||||
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
|
||||
@@ -44,6 +44,23 @@
|
||||
<plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
|
||||
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
|
||||
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
|
||||
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" />
|
||||
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64" />
|
||||
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.riscv64" />
|
||||
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390x" />
|
||||
+ <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" />
|
||||
+ <plugin id="org.apache.commons.jxpath" />
|
||||
+ <plugin id="org.apache.felix.gogo.command" />
|
||||
+ <plugin id="org.apache.batik.css" />
|
||||
+ <plugin id="org.apache.batik.i18n" />
|
||||
+ <plugin id="org.w3c.css.sac" />
|
||||
+ <plugin id="org.apache.batik.util" />
|
||||
+ <plugin id="org.apache.xmlgraphics" />
|
||||
+ <plugin id="org.w3c.dom.svg" />
|
||||
+ <plugin id="javax.inject" />
|
||||
+ <plugin id="com.ibm.icu"/>
|
||||
+ <plugin id="org.apache.felix.gogo.runtime" />
|
||||
+ <plugin id="org.apache.felix.gogo.shell" />
|
||||
</excludes>
|
||||
</configuration>
|
||||
</execution>
|
||||
diff --git a/rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml b/rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml
|
||||
index a5bd36f60..4fa38e709 100644
|
||||
--- a/rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml
|
||||
+++ b/rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml
|
||||
--- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml.bak 2012-07-25 17:45:43.000000000 +0200
|
||||
+++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml 2012-07-31 07:41:13.103636303 +0200
|
||||
@@ -40,6 +40,25 @@
|
||||
<excludes>
|
||||
<plugin id="org.sat4j.core"/>
|
||||
@ -138,3 +26,100 @@ index a5bd36f60..4fa38e709 100644
|
||||
</excludes>
|
||||
</configuration>
|
||||
</execution>
|
||||
--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak 2012-07-31 07:43:57.000000000 +0200
|
||||
+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2012-07-31 08:05:24.279277920 +0200
|
||||
@@ -34,6 +34,17 @@
|
||||
<goals>
|
||||
<goal>source-feature</goal>
|
||||
</goals>
|
||||
+ <configuration>
|
||||
+ <excludes>
|
||||
+ <plugin id="javax.servlet-api" /><plugin id="javax.el" /><plugin id="com.sun.el.javax.el" /><plugin id="org.apache.el" /><plugin id="org.apache.commons.logging" />
|
||||
+ <plugin id="javax.servlet.jsp" /><plugin id="org.apache.lucene.analysis" /><plugin id="org.apache.lucene.core" />
|
||||
+ <plugin id="org.apache.tomcat" /><plugin id="org.eclipse.jetty.continuation" /><plugin id="org.eclipse.jetty.http" />
|
||||
+ <plugin id="org.apache.juli" /><plugin id="org.eclipse.jetty.io" /><plugin id="org.eclipse.jetty.security" />
|
||||
+ <plugin id="org.eclipse.jetty.util" /><plugin id="org.eclipse.jetty.server" />
|
||||
+ <plugin id="org.glassfish.web.javax.servlet.jsp" /><plugin id="org.eclipse.jetty.servlet" />
|
||||
+ <plugin id="org.apache.commons.el" /><plugin id="org.glassfish.web.javax.servlet.jsp" />
|
||||
+ </excludes>
|
||||
+ </configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
--- eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml.bak 2013-01-29 11:22:47.065953870 +0100
|
||||
+++ eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml 2013-01-29 11:23:18.630196529 +0100
|
||||
@@ -38,6 +38,8 @@
|
||||
<configuration>
|
||||
<excludes>
|
||||
<plugin id="org.eclipse.pde"/>
|
||||
+ <plugin id="org.objectweb.asm"/>
|
||||
+ <plugin id="org.objectweb.asm.tree"/>
|
||||
<plugin id="org.eclipse.pde.doc.user"/>
|
||||
</excludes>
|
||||
</configuration>
|
||||
--- eclipse.jdt/org.eclipse.jdt-feature/pom.xml.orig 2013-02-20 16:32:38.000000000 +0100
|
||||
+++ eclipse.jdt/org.eclipse.jdt-feature/pom.xml 2013-02-21 10:08:50.404275226 +0100
|
||||
@@ -57,6 +57,8 @@
|
||||
<excludes>
|
||||
<plugin id="org.eclipse.jdt"/>
|
||||
<plugin id="org.eclipse.jdt.doc.user"/>
|
||||
+ <plugin id="org.junit" />
|
||||
+ <plugin id="org.hamcrest.core" />
|
||||
</excludes>
|
||||
</configuration>
|
||||
</execution>
|
||||
--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-11-28 15:27:07.874872769 +0000
|
||||
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-11-28 15:31:02.592652099 +0000
|
||||
@@ -68,6 +68,8 @@
|
||||
<plugin id="org.eclipse.core.net.linux.x86_64"/>
|
||||
<plugin id="org.eclipse.core.net.win32.x86"/>
|
||||
<plugin id="org.eclipse.core.net.win32.x86_64"/>
|
||||
+ <plugin id="com.jcraft.jsch"/>
|
||||
+ <plugin id="org.apache.ant"/>
|
||||
</excludes>
|
||||
</configuration>
|
||||
</execution>
|
||||
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig 2014-05-26 18:37:25.406426611 +0300
|
||||
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2014-05-26 18:37:47.327449374 +0300
|
||||
@@ -44,6 +44,22 @@
|
||||
<plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
|
||||
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
|
||||
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
|
||||
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" />
|
||||
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64" />
|
||||
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390x" />
|
||||
+ <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" />
|
||||
+ <plugin id="org.apache.commons.jxpath" />
|
||||
+ <plugin id="org.apache.felix.gogo.command" />
|
||||
+ <plugin id="org.apache.batik.css" />
|
||||
+ <plugin id="org.apache.batik.i18n" />
|
||||
+ <plugin id="org.w3c.css.sac" />
|
||||
+ <plugin id="org.apache.batik.util" />
|
||||
+ <plugin id="org.apache.xmlgraphics" />
|
||||
+ <plugin id="org.w3c.dom.svg" />
|
||||
+ <plugin id="javax.inject" />
|
||||
+ <plugin id="com.ibm.icu"/>
|
||||
+ <plugin id="org.apache.felix.gogo.runtime" />
|
||||
+ <plugin id="org.apache.felix.gogo.shell" />
|
||||
</excludes>
|
||||
</configuration>
|
||||
</execution>
|
||||
--- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig 2016-04-27 09:18:50.421221722 +0100
|
||||
+++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml 2016-04-27 09:19:08.454957280 +0100
|
||||
@@ -51,16 +51,6 @@
|
||||
id="org.eclipse.help.source"
|
||||
version="0.0.0"/>
|
||||
|
||||
- <requires>
|
||||
- <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.ecf.core.feature.source" version="1.4.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.core.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.feature.source" version="3.13.7" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.feature.source" version="3.13.7" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||
- </requires>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.sdk"
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java.orig 2018-04-25 15:35:44.914031196 +0100
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java 2018-04-25 15:36:17.546856697 +0100
|
||||
@@ -885,7 +885,7 @@
|
||||
@@ -880,7 +880,7 @@
|
||||
//First check to see if there is already an IU around for this
|
||||
IInstallableUnit bundleIU = queryForIU(result, bd.getSymbolicName(), PublisherHelper.fromOSGiVersion(bd.getVersion()));
|
||||
IArtifactKey bundleArtKey = createBundleArtifactKey(bd.getSymbolicName(), bd.getVersion().toString());
|
||||
|
@ -27,7 +27,7 @@ diff --git eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/c
|
||||
index fbd4b81..55cd40e 100644
|
||||
--- eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java
|
||||
+++ eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java
|
||||
@@ -15,11 +15,12 @@
|
||||
@@ -12,11 +12,12 @@
|
||||
package org.eclipse.pde.internal.core;
|
||||
|
||||
import java.io.*;
|
||||
@ -42,7 +42,7 @@ index fbd4b81..55cd40e 100644
|
||||
import org.eclipse.equinox.p2.core.IProvisioningAgent;
|
||||
import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
|
||||
import org.eclipse.equinox.p2.engine.*;
|
||||
@@ -32,6 +33,7 @@ import org.eclipse.osgi.service.resolver.*;
|
||||
@@ -29,6 +30,7 @@ import org.eclipse.osgi.service.resolver.*;
|
||||
import org.eclipse.pde.core.plugin.*;
|
||||
import org.eclipse.pde.internal.build.BundleHelper;
|
||||
import org.eclipse.pde.internal.core.plugin.PluginBase;
|
||||
@ -50,7 +50,7 @@ index fbd4b81..55cd40e 100644
|
||||
import org.osgi.framework.Constants;
|
||||
|
||||
/**
|
||||
@@ -111,7 +113,16 @@ public class P2Utils {
|
||||
@@ -108,7 +110,16 @@ public class P2Utils {
|
||||
try {
|
||||
URL bundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), new File(configurationArea.getFile(), SimpleConfiguratorManipulator.BUNDLES_INFO_PATH).getAbsolutePath());
|
||||
File home = basePath.toFile();
|
||||
@ -68,7 +68,7 @@ index fbd4b81..55cd40e 100644
|
||||
if (bundles == null || bundles.length == 0) {
|
||||
return null;
|
||||
}
|
||||
@@ -143,11 +154,38 @@ public class P2Utils {
|
||||
@@ -140,11 +151,38 @@ public class P2Utils {
|
||||
try {
|
||||
File home = basePath.toFile();
|
||||
URL srcBundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), configurationArea.getFile().concat(SimpleConfiguratorManipulator.SOURCE_INFO_PATH));
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- eclipse-platform-parent/pom.xml.orig 2014-11-28 14:54:50.000000000 +0000
|
||||
+++ eclipse-platform-parent/pom.xml 2014-11-28 15:32:51.700154985 +0000
|
||||
@@ -491,7 +491,7 @@
|
||||
@@ -483,7 +483,7 @@
|
||||
<artifactId>tycho-packaging-plugin</artifactId>
|
||||
<version>${tycho.version}</version>
|
||||
<dependencies>
|
||||
@ -9,7 +9,7 @@
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-buildtimestamp-jgit</artifactId>
|
||||
<version>${tycho-extras.version}</version>
|
||||
@@ -500,19 +500,19 @@
|
||||
@@ -492,19 +492,19 @@
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-sourceref-jgit</artifactId>
|
||||
<version>${tycho-extras.version}</version>
|
||||
|
@ -1,71 +1,8 @@
|
||||
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
|
||||
index c13fae9ff..7f798e4f1 100644
|
||||
--- a/eclipse.platform.swt.binaries/pom.xml
|
||||
+++ b/eclipse.platform.swt.binaries/pom.xml
|
||||
@@ -54,7 +54,12 @@
|
||||
|
||||
<modules>
|
||||
<module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.riscv64</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.x86</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
|
||||
<module>bundles/org.eclipse.swt.win32.win32.x86</module>
|
||||
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
|
||||
index a1e3f456b..e138f98a3 100755
|
||||
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
|
||||
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
|
||||
@@ -195,7 +195,7 @@ esac
|
||||
|
||||
|
||||
# For 64-bit CPUs, we have a switch
|
||||
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
|
||||
+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'riscv64' ]; then
|
||||
SWT_PTR_CFLAGS=-DJNI64
|
||||
if [ -d /lib64 ]; then
|
||||
XLIB64=-L/usr/X11R6/lib64
|
||||
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
|
||||
index 64628e51c..28da2e7d3 100644
|
||||
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
|
||||
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
|
||||
@@ -34,3 +34,28 @@ requires.7.namespace = org.eclipse.equinox.p2.iu
|
||||
requires.7.name = org.eclipse.swt.gtk.linux.ppc64le
|
||||
requires.7.range = [$version$,$version$]
|
||||
requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
|
||||
+
|
||||
+requires.8.namespace = org.eclipse.equinox.p2.iu
|
||||
+requires.8.name = org.eclipse.swt.gtk.linux.ppc64
|
||||
+requires.8.range = [$version$,$version$]
|
||||
+requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)(!(org.eclipse.swt.buildtime=true)))
|
||||
+
|
||||
+requires.9.namespace = org.eclipse.equinox.p2.iu
|
||||
+requires.9.name = org.eclipse.swt.gtk.linux.arm
|
||||
+requires.9.range = [$version$,$version$]
|
||||
+requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
|
||||
+
|
||||
+requires.10.namespace = org.eclipse.equinox.p2.iu
|
||||
+requires.10.name = org.eclipse.swt.gtk.linux.aarch64
|
||||
+requires.10.range = [$version$,$version$]
|
||||
+requires.10.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
|
||||
+
|
||||
+requires.11.namespace = org.eclipse.equinox.p2.iu
|
||||
+requires.11.name = org.eclipse.swt.gtk.linux.s390x
|
||||
+requires.11.range = [$version$,$version$]
|
||||
+requires.11.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
|
||||
+
|
||||
+requires.12.namespace = org.eclipse.equinox.p2.iu
|
||||
+requires.12.name = org.eclipse.swt.gtk.linux.riscv64
|
||||
+requires.12.range = [$version$,$version$]
|
||||
+requires.12.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=riscv64)(!(org.eclipse.swt.buildtime=true)))
|
||||
diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
index 51790c259..1ceafc95b 100644
|
||||
index 7e1f520..734dd10 100644
|
||||
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
@@ -418,6 +418,46 @@
|
||||
@@ -418,6 +418,36 @@
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
fragment="true"/>
|
||||
@ -98,24 +35,17 @@ index 51790c259..1ceafc95b 100644
|
||||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
+ fragment="true"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.equinox.launcher.gtk.linux.riscv64"
|
||||
+ os="linux"
|
||||
+ ws="gtk"
|
||||
+ arch="riscv64"
|
||||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
+ fragment="true"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.equinox.launcher.gtk.linux.x86"
|
||||
@@ -499,6 +539,50 @@
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
|
||||
@@ -496,6 +526,39 @@
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
+ fragment="true"
|
||||
+ unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.swt.gtk.linux.s390x"
|
||||
+ os="linux"
|
||||
@ -146,28 +76,26 @@ index 51790c259..1ceafc95b 100644
|
||||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
+ fragment="true"
|
||||
+ unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.swt.gtk.linux.riscv64"
|
||||
+ os="linux"
|
||||
+ ws="gtk"
|
||||
+ arch="riscv64"
|
||||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
+ fragment="true"
|
||||
+ unpack="false"/>
|
||||
+
|
||||
<plugin
|
||||
id="org.eclipse.swt.gtk.linux.ppc64le"
|
||||
os="linux"
|
||||
diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
|
||||
index 8ffe18e76..ebc821dc6 100644
|
||||
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
|
||||
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
|
||||
@@ -34,3 +34,18 @@ root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/launcher
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
|
||||
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 15:09:42.000000000 +0000
|
||||
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 16:52:00.315007846 +0000
|
||||
@@ -123,7 +123,11 @@
|
||||
<copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true">
|
||||
<fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
|
||||
<include name="cocoa/macosx/x86_64/**/*"/>
|
||||
+ <include name="gtk/linux/arm/**/*"/>
|
||||
+ <include name="gtk/linux/aarch64/**/*"/>
|
||||
+ <include name="gtk/linux/ppc64/**/*"/>
|
||||
<include name="gtk/linux/ppc64le/**/*"/>
|
||||
+ <include name="gtk/linux/s390x/**/*"/>
|
||||
<include name="gtk/linux/x86/**/*"/>
|
||||
<include name="gtk/linux/x86_64/**/*"/>
|
||||
<include name="win32/win32/x86/**/*"/>
|
||||
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:44:03.436891441 +0000
|
||||
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:45:25.232480509 +0000
|
||||
@@ -34,3 +34,15 @@
|
||||
|
||||
root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
|
||||
root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
|
||||
@ -181,16 +109,51 @@ index 8ffe18e76..ebc821dc6 100644
|
||||
+root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
|
||||
+root.linux.gtk.ppc64.permissions.755=launcher
|
||||
+
|
||||
+root.linux.gtk.riscv64=bin/gtk/linux/riscv64,gtk_root
|
||||
+root.linux.gtk.riscv64.permissions.755=launcher
|
||||
+
|
||||
+root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
|
||||
+root.linux.gtk.s390x.permissions.755=launcher
|
||||
diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
|
||||
index 2b8fe11e0..b19cf298e 100755
|
||||
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
|
||||
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
|
||||
@@ -106,7 +106,7 @@ case $defaultOS in
|
||||
--- a/eclipse.platform.swt.binaries/pom.xml 2017-04-05 01:57:59.142576722 +0100
|
||||
+++ b/eclipse.platform.swt.binaries/pom.xml 2017-04-05 02:00:00.153247342 +0100
|
||||
@@ -54,7 +54,11 @@
|
||||
|
||||
<modules>
|
||||
<module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.x86</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
|
||||
<module>bundles/org.eclipse.swt.win32.win32.x86</module>
|
||||
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:15:34.857977599 +0100
|
||||
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:18:22.878025820 +0100
|
||||
@@ -34,3 +34,23 @@
|
||||
requires.7.name = org.eclipse.swt.gtk.linux.ppc64le
|
||||
requires.7.range = [$version$,$version$]
|
||||
requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
|
||||
+
|
||||
+requires.8.namespace = org.eclipse.equinox.p2.iu
|
||||
+requires.8.name = org.eclipse.swt.gtk.linux.ppc64
|
||||
+requires.8.range = [$version$,$version$]
|
||||
+requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)(!(org.eclipse.swt.buildtime=true)))
|
||||
+
|
||||
+requires.9.namespace = org.eclipse.equinox.p2.iu
|
||||
+requires.9.name = org.eclipse.swt.gtk.linux.arm
|
||||
+requires.9.range = [$version$,$version$]
|
||||
+requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
|
||||
+
|
||||
+requires.10.namespace = org.eclipse.equinox.p2.iu
|
||||
+requires.10.name = org.eclipse.swt.gtk.linux.aarch64
|
||||
+requires.10.range = [$version$,$version$]
|
||||
+requires.10.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
|
||||
+
|
||||
+requires.11.namespace = org.eclipse.equinox.p2.iu
|
||||
+requires.11.name = org.eclipse.swt.gtk.linux.s390x
|
||||
+requires.11.range = [$version$,$version$]
|
||||
+requires.11.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
|
||||
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-19 13:31:15.000000000 +0100
|
||||
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-23 16:58:34.022207885 +0100
|
||||
@@ -106,7 +106,7 @@
|
||||
"s390x")
|
||||
defaultOSArch="s390x"
|
||||
defaultJava=DEFAULT_JAVA_EXEC
|
||||
@ -199,40 +162,9 @@ index 2b8fe11e0..b19cf298e 100755
|
||||
;;
|
||||
arm*)
|
||||
defaultOSArch="arm"
|
||||
@@ -118,6 +118,11 @@ case $defaultOS in
|
||||
defaultJava=DEFAULT_JAVA_EXEC
|
||||
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
;;
|
||||
+ "riscv64")
|
||||
+ defaultOSArch="riscv64"
|
||||
+ defaultJava=DEFAULT_JAVA_EXEC
|
||||
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
+ ;;
|
||||
*)
|
||||
echo "*** Unknown MODEL <${MODEL}>"
|
||||
;;
|
||||
diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
|
||||
index e56be0149..9f2727d00 100644
|
||||
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
|
||||
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
|
||||
@@ -123,7 +123,12 @@
|
||||
<copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true">
|
||||
<fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
|
||||
<include name="cocoa/macosx/x86_64/**/*"/>
|
||||
+ <include name="gtk/linux/arm/**/*"/>
|
||||
+ <include name="gtk/linux/aarch64/**/*"/>
|
||||
+ <include name="gtk/linux/ppc64/**/*"/>
|
||||
<include name="gtk/linux/ppc64le/**/*"/>
|
||||
+ <include name="gtk/linux/riscv64/**/*"/>
|
||||
+ <include name="gtk/linux/s390x/**/*"/>
|
||||
<include name="gtk/linux/x86/**/*"/>
|
||||
<include name="gtk/linux/x86_64/**/*"/>
|
||||
<include name="win32/win32/x86/**/*"/>
|
||||
diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
|
||||
index ab9ba3bac..16cf0944f 100644
|
||||
--- a/rt.equinox.framework/pom.xml
|
||||
+++ b/rt.equinox.framework/pom.xml
|
||||
@@ -73,6 +73,42 @@
|
||||
--- a/rt.equinox.framework/pom.xml 2017-04-26 22:19:15.548461372 +0100
|
||||
+++ b/rt.equinox.framework/pom.xml 2017-04-26 22:20:41.348571492 +0100
|
||||
@@ -73,6 +73,30 @@
|
||||
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
|
||||
</modules>
|
||||
</profile>
|
||||
@ -249,18 +181,6 @@ index ab9ba3bac..16cf0944f 100644
|
||||
+ </modules>
|
||||
+ </profile>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.riscv64</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.riscv64</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <modules>
|
||||
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.riscv64</module>
|
||||
+ </modules>
|
||||
+ </profile>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.s390x</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
|
36
eclipse.spec
36
eclipse.spec
@ -1,12 +1,12 @@
|
||||
# Set to 1 to build Eclipse without circular dependency to eclipse-pde, API
|
||||
# generation and docs will not be built and a second run will be required, but
|
||||
# this is a way to bootstrap Eclipse on secondary archs.
|
||||
%global bootstrap 0
|
||||
%global bootstrap 1
|
||||
|
||||
Epoch: 1
|
||||
|
||||
%global eb_commit 44643cbda3dfd6f00fbf1b346dae7068df2a9ef9
|
||||
%global eclipse_tag I20180906-0745
|
||||
%global eb_commit 23577466b35eaf62bee3b00090f4fbedc555b4e6
|
||||
%global eclipse_tag I20180822-0800
|
||||
|
||||
%global _jetty_version 9.4.11
|
||||
%global _lucene_version 7.1.0
|
||||
@ -20,7 +20,7 @@ Epoch: 1
|
||||
%ifarch ppc64 ppc64p7
|
||||
%global eclipse_arch ppc64
|
||||
%endif
|
||||
%ifarch s390x x86_64 aarch64 ppc64le riscv64
|
||||
%ifarch s390x x86_64 aarch64 ppc64le
|
||||
%global eclipse_arch %{_arch}
|
||||
%endif
|
||||
|
||||
@ -40,7 +40,7 @@ Epoch: 1
|
||||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: 4.9.0
|
||||
Release: 1.0.riscv64%{?dist}
|
||||
Release: 0.4%{?dist}
|
||||
License: EPL-2.0
|
||||
URL: http://www.eclipse.org/
|
||||
|
||||
@ -132,7 +132,6 @@ BuildRequires: maven-assembly-plugin
|
||||
BuildRequires: maven-dependency-plugin
|
||||
BuildRequires: maven-enforcer-plugin
|
||||
BuildRequires: maven-install-plugin
|
||||
BuildRequires: maven-shade-plugin
|
||||
BuildRequires: xml-maven-plugin
|
||||
BuildRequires: rhino
|
||||
BuildRequires: sonatype-oss-parent
|
||||
@ -369,7 +368,7 @@ find . -type f -name *.jnilib -delete
|
||||
# Remove pre-compiled native launchers
|
||||
rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
|
||||
|
||||
%patch0 -p1
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
@ -453,7 +452,7 @@ sed -i -e '/org\.eclipse\.jdt\.annotation;bundle-version="\[1\.1\.0,2\.0\.0)"/d'
|
||||
# This part generates secondary fragments using primary fragments
|
||||
for dir in rt.equinox.binaries rt.equinox.framework/bundles eclipse.platform.swt.binaries/bundles ; do
|
||||
utils/ensure_arch.sh "$dir" x86 arm
|
||||
utils/ensure_arch.sh "$dir" x86_64 aarch64 ppc64 riscv64
|
||||
utils/ensure_arch.sh "$dir" x86_64 aarch64 ppc64
|
||||
done
|
||||
|
||||
# Remove platform-specific stuff that we don't care about to reduce build time
|
||||
@ -507,7 +506,7 @@ for f in eclipse.jdt/org.eclipse.jdt-feature/feature.xml \
|
||||
%pom_xpath_remove -f "plugin[@os='macosx']" $f
|
||||
%pom_xpath_remove -f "plugin[@os='win32']" $f
|
||||
%pom_xpath_remove -f "plugin[@ws='win32']" $f
|
||||
for arch in x86 x86_64 arm aarch64 ppc64 ppc64le s390x riscv64 ; do
|
||||
for arch in x86 x86_64 arm aarch64 ppc64 ppc64le s390x ; do
|
||||
if [ "$arch" != "%{eclipse_arch}" ] ; then
|
||||
%pom_xpath_remove -f "plugin[@arch='$arch']" $f
|
||||
fi
|
||||
@ -648,21 +647,11 @@ rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/
|
||||
%build
|
||||
#This is the lowest value where the build succeeds. 512m is not enough.
|
||||
export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
|
||||
# Ensure we get the jit on arm
|
||||
%ifarch %{arm}
|
||||
export JAVA_HOME=$(ls -d %{_jvmdir}/java-1.8.0-openjdk-aarch32*)
|
||||
%else
|
||||
export JAVA_HOME=%{_jvmdir}/java
|
||||
%endif
|
||||
|
||||
# Pre-build agent jar needed for AdvancedSourceLookupSupport
|
||||
sed -i -e '/createSourcesJar/d' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/pom.xml
|
||||
(cd eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent && xmvn -o -B clean verify)
|
||||
mv eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/target/javaagent-shaded.jar \
|
||||
eclipse.jdt.debug/org.eclipse.jdt.launching/lib
|
||||
|
||||
# Qualifier generated from last modification time of source tarball
|
||||
QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M)
|
||||
|
||||
%mvn_build -j -f -- -DforceContextQualifier=$QUALIFIER \
|
||||
%if %{bootstrap}
|
||||
-P !api-generation,!build-docs \
|
||||
@ -1080,13 +1069,6 @@ fi
|
||||
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
|
||||
|
||||
%changelog
|
||||
* Mon Sep 17 2018 David Abdurachmanov <david.abdurachmanov> - 1:4.9.0-1.0.riscv64
|
||||
- Enable RISC-V (riscv64)
|
||||
|
||||
* Wed Sep 12 2018 Mat Booth <mat.booth@redhat.com> - 1:4.9.0-1
|
||||
- Update to final bits for 4.9
|
||||
- Fix NPE due to missing agent jar
|
||||
|
||||
* Thu Aug 23 2018 Mat Booth <mat.booth@redhat.com> - 1:4.9.0-0.4
|
||||
- Update to latest I-build
|
||||
- Full non-bootstrap build
|
||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (eclipse-platform-sources-I20180906-0745.tar.xz) = eed6fbb7d160713ba2c043e7b218a778fa493e1187fbaf6b0a36a231ab1a35d61ecc2793b179d911d6e34105534ab47cc2d0fabe54ac216b5371adab7606c6a5
|
||||
SHA512 (org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9.tar.xz) = ef02f54deefd154265122fa0191c8d69bbb135e026171de147a7fb3af83bb26523ea866d19aa7c7cc184c8e05ad55e54846a909bea69bd1bc6cd57005d055ebf
|
||||
SHA512 (eclipse-platform-sources-I20180822-0800.tar.xz) = c1158fa81c21a1fe9d09fd814062e55623b4ceca34be9b44c50f917f14bab8643e29ec6d20879c01b107fb93e68de4af553edea0fb606add870230d0498a03ef
|
||||
SHA512 (org.eclipse.linuxtools.eclipse-build-23577466b35eaf62bee3b00090f4fbedc555b4e6.tar.xz) = d268ea945c33b997c79b390f9592c1139f52dc39ebdb7ea7155d41301459827f576389e20080462ad22f2aef833857626df983bbb2abe30845e79ca74a194bea
|
||||
|
Loading…
Reference in New Issue
Block a user