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

Updated I-build 

Attempt to fix arm platform launchers
This commit is contained in:
Mat Booth 2018-05-03 22:02:57 +01:00
parent daa02f7158
commit 7996b3e543
5 changed files with 119 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
eclipse-bug-386377.patch
View File

@ -198,3 +198,83 @@
+ </profile> + </profile>
+ </profiles> + </profiles>
</project> </project>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/pom.xml.orig 2018-05-03 21:44:44.780856654 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/pom.xml 2018-05-03 21:45:27.608655357 +0100
@@ -27,4 +27,37 @@
<ws>gtk</ws>
<arch>arm</arch>
</properties>
+ <profiles>
+ <profile>
+ <id>build-native-launchers-gtk.linux.arm</id>
+ <activation>
+ <property>
+ <name>native</name>
+ <value>gtk.linux.arm</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/pom.xml.orig 2018-05-03 21:46:26.672377749 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/pom.xml 2018-05-03 21:47:28.940085081 +0100
@@ -27,4 +27,37 @@
<ws>gtk</ws>
<arch>aarch64</arch>
</properties>
+ <profiles>
+ <profile>
+ <id>build-native-launchers-gtk.linux.aarch64</id>
+ <activation>
+ <property>
+ <name>native</name>
+ <value>gtk.linux.aarch64</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>

73
eclipse-hide-droplets-from-install-wizard.patch
View File

@ -1,66 +1,56 @@
From 051d84daff808349fc3eb4d44b2f9d56f7fe89ba Mon Sep 17 00:00:00 2001 commit 4bfc5a7c6d8c2aaf954c113d805419472de2bcaf
From: Roland Grunberg <rgrunber@redhat.com> Author: Mat Booth <mat.booth@redhat.com>
Date: Wed, 18 Jan 2017 15:51:40 -0500 Date: Thu May 3 15:58:49 2018 +0100
Subject: [PATCH] Don't show p2 Droplet locations in the UI.
Don't show p2 Droplets in the Repository Selection Combo Box, or in the Bug 534326 - Awkward p2 UI when many droplets are installed
Available Software Sites preferences.
Filter out software site locations where we know that they are p2
droplets in places we show the list to the user.
Change-Id: I12364223850862783cb7cffd32fb7428fbf6b270
Signed-off-by: Mat Booth <mat.booth@redhat.com>
Change-Id: I4afddffbaaeae3f33958629eebb32861087a93de diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
--- index e6eef8c39..fe5970e79 100644
.../internal/p2/ui/dialogs/RepositorySelectionGroup.java | 14 ++++++++++++++ --- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
.../eclipse/equinox/p2/ui/RepositoryManipulationPage.java | 15 ++++++++++++++- +++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
2 files changed, 28 insertions(+), 1 deletion(-) @@ -300,6 +300,19 @@ public class RepositorySelectionGroup {
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
index 8d08101..59567c0 100644
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
@@ -16,6 +16,7 @@ import java.lang.reflect.InvocationTargetException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.*;
+import java.util.List;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.ui.*;
import org.eclipse.equinox.internal.p2.ui.query.IUViewQueryContext;
@@ -322,6 +323,19 @@ public class RepositorySelectionGroup {
void fillRepoCombo(final String selection) { void fillRepoCombo(final String selection) {
RepositoryTracker tracker = ui.getRepositoryTracker(); RepositoryTracker tracker = ui.getRepositoryTracker();
URI[] sites = tracker.getKnownRepositories(ui.getSession()); URI[] sites = tracker.getKnownRepositories(ui.getSession());
+ String fragments = System.getProperty("p2.fragments"); + // Filter out sites that are actually installed p2 droplets
+ List<URI> tmp = new ArrayList<URI>(Arrays.asList(sites)); + String fragments = System.getProperty("p2.fragments"); //$NON-NLS-1$
+ ArrayList<URI> filteredSites = new ArrayList<>(Arrays.asList(sites));
+ if (fragments != null) { + if (fragments != null) {
+ String[] rootPaths = fragments.split(","); + for (String root : fragments.split(",")) { //$NON-NLS-1$
+ for (String root : rootPaths) {
+ for (URI uri : sites) { + for (URI uri : sites) {
+ if (uri.getPath() != null && uri.getPath().startsWith(root)) { + if (uri.getPath() != null && uri.getPath().startsWith(root)) {
+ tmp.remove(uri); + filteredSites.remove(uri);
+ } + }
+ } + }
+ } + }
+ } + }
+ sites = tmp.toArray(new URI[0]); + sites = filteredSites.toArray(new URI[0]);
boolean hasLocalSites = getLocalSites().length > 0; boolean hasLocalSites = getLocalSites().length > 0;
final String[] items; final String[] items;
if (hasLocalSites) { if (hasLocalSites) {
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
index c0f2ca1..03515c7 100644 index d796aefd0..c03924f90 100644
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java --- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java +++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
@@ -132,9 +132,22 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb @@ -130,9 +130,22 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb
if (cachedElements == null) { if (cachedElements == null) {
Object[] children = super.fetchChildren(o, monitor); Object[] children = super.fetchChildren(o, monitor);
cachedElements = new Hashtable<>(children.length); cachedElements = new Hashtable<>(children.length);
+ String fragments = System.getProperty("p2.fragments"); + String fragments = System.getProperty("p2.fragments"); //$NON-NLS-1$
for (int i = 0; i < children.length; i++) { for (int i = 0; i < children.length; i++) {
if (children[i] instanceof MetadataRepositoryElement) { if (children[i] instanceof MetadataRepositoryElement) {
- put((MetadataRepositoryElement) children[i]); - put((MetadataRepositoryElement) children[i]);
+ // Filter out locations that are actually installed p2 droplets
+ if (fragments != null) { + if (fragments != null) {
+ String[] rootPaths = fragments.split(",");
+ boolean isDroplet = false; + boolean isDroplet = false;
+ for (String root : rootPaths) { + for (String root : fragments.split(",")) { //$NON-NLS-1$
+ URI childLoc = ((MetadataRepositoryElement)children[i]).getLocation(); + URI childLoc = ((MetadataRepositoryElement) children[i]).getLocation();
+ if (childLoc.getPath() != null && childLoc.getPath().startsWith(root)) { + if (childLoc.getPath() != null && childLoc.getPath().startsWith(root)) {
+ isDroplet = true; + isDroplet = true;
+ } + }
@ -72,6 +62,3 @@ index c0f2ca1..03515c7 100644
} }
} }
} }
--
2.9.3

10
eclipse.spec
View File

@ -6,7 +6,7 @@
Epoch: 1 Epoch: 1
%global eb_commit 81122c55c72d9e308302c878f642f93c39507436 %global eb_commit 81122c55c72d9e308302c878f642f93c39507436
%global eclipse_tag I20180427-2000 %global eclipse_tag I20180503-0740
%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 %if 0%{?fedora} >= 28 || 0%{?rhel} > 7
%global _jetty_version 9.4.9 %global _jetty_version 9.4.9
@ -44,7 +44,7 @@ Epoch: 1
Summary: An open, extensible IDE Summary: An open, extensible IDE
Name: eclipse Name: eclipse
Version: 4.8.0 Version: 4.8.0
Release: 0.3%{?dist} Release: 0.4%{?dist}
License: EPL License: EPL
URL: http://www.eclipse.org/ URL: http://www.eclipse.org/
@ -397,7 +397,7 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch28 %patch28
%endif %endif
%patch29 %patch29
%patch30 %patch30 -p1
# Use ecj when bootstrapping # Use ecj when bootstrapping
%if %{bootstrap} %if %{bootstrap}
@ -1079,6 +1079,10 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_* %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog %changelog
* Thu May 03 2018 Mat Booth <mat.booth@redhat.com> - 1:4.8.0-0.4
- Updated I-build
- Attempt to fix arm platform launchers
* Wed May 02 2018 Mat Booth <mat.booth@redhat.com> - 1:4.8.0-0.3 * Wed May 02 2018 Mat Booth <mat.booth@redhat.com> - 1:4.8.0-0.3
- Non-bootstrap build - Non-bootstrap build

2
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=I20180427-2000 TAG=I20180503-0740
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

2
sources
View File

@ -1,2 +1,2 @@
SHA512 (org.eclipse.linuxtools.eclipse-build-81122c55c72d9e308302c878f642f93c39507436.tar.xz) = 170d6801fd2c2f5f95c4d79cb14e36bb5db63142a52cafea81656f63dd132cf1a5b52b945fa0f85d4eed21ed660d22f46d2cdf9cde86e08fed06b16e9a22ed51 SHA512 (org.eclipse.linuxtools.eclipse-build-81122c55c72d9e308302c878f642f93c39507436.tar.xz) = 170d6801fd2c2f5f95c4d79cb14e36bb5db63142a52cafea81656f63dd132cf1a5b52b945fa0f85d4eed21ed660d22f46d2cdf9cde86e08fed06b16e9a22ed51
SHA512 (R4_platform-aggregator-I20180427-2000.tar.xz) = 79d1652fedeb19a2b0c528697fd54c155d8a12d11e9d8f061bf45f3c822b38b2b7cf431eb54ac0de9e79f7482b41fe6f553a6fd24e795edd0db7be19baed864d SHA512 (R4_platform-aggregator-I20180503-0740.tar.xz) = 6d2c8374155b97a6208366d00300906c2e1205935e0692ce902daccc06a396b610c3d85710a37828a80dcd263d0b04dae75fd47b09c334e2f1f26a8f2499252d