Update to Oxygen I-build
Don't build unsupported GTK2 backend for SWT Move installation to a multilib agnostic location /usr/lib
This commit is contained in:
parent
207c510d53
commit
c736234c3b
@ -1,6 +1,6 @@
|
||||
--- eclipse.jdt/org.eclipse.jdt-feature/feature.xml.sav 2015-06-10 10:05:23.943730974 +0300
|
||||
+++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml 2015-06-10 10:05:50.820612421 +0300
|
||||
@@ -161,22 +161,6 @@
|
||||
@@ -166,22 +166,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
@ -114,7 +114,7 @@
|
||||
id="org.eclipse.core.filebuffers"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -351,35 +343,6 @@
|
||||
@@ -359,15 +351,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
@ -127,29 +127,9 @@
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.core.filesystem.aix.ppc"
|
||||
- os="aix"
|
||||
- arch="ppc"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.core.filesystem.aix.ppc64"
|
||||
- os="aix"
|
||||
- arch="ppc64"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.core.filesystem.hpux.ia64"
|
||||
os="hpux"
|
||||
arch="ia64"
|
||||
id="org.eclipse.core.filesystem.linux.x86"
|
||||
os="linux"
|
||||
arch="x86"
|
||||
@@ -439,26 +402,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
|
@ -2,7 +2,7 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/e
|
||||
index 5fc0e73..ed7e4fa 100644
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
|
||||
@@ -144,7 +144,20 @@ public class EngineActivator implements BundleActivator {
|
||||
@@ -147,7 +147,20 @@ public class EngineActivator implements BundleActivator {
|
||||
}
|
||||
continue;
|
||||
}
|
||||
@ -28,7 +28,7 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/
|
||||
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 {
|
||||
@@ -155,7 +155,20 @@ public class SimpleConfiguratorUtils {
|
||||
}
|
||||
continue;
|
||||
}
|
||||
@ -54,15 +54,15 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/e
|
||||
index 3d7e313..debbfb8 100644
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
|
||||
@@ -238,10 +238,11 @@ public class SurrogateProfileHandler implements ISurrogateProfileHandler {
|
||||
@@ -236,10 +236,11 @@
|
||||
|| "feature".equals(cap.getName())) { //$NON-NLS-1$
|
||||
featureOrBundle = true;
|
||||
}
|
||||
- } else if (Boolean.TRUE.equals(unit.getProperties().get("org.eclipse.equinox.p2.type.group"))) { //$NON-NLS-1$
|
||||
- } else if (Boolean.TRUE.equals(Boolean.valueOf(unit.getProperties().get("org.eclipse.equinox.p2.type.group")))) { //$NON-NLS-1$
|
||||
- featureOrBundle = true;
|
||||
}
|
||||
}
|
||||
+ if (Boolean.TRUE.toString().equals(unit.getProperties().get("org.eclipse.equinox.p2.type.group"))) { //$NON-NLS-1$
|
||||
+ if (Boolean.TRUE.equals(Boolean.valueOf(unit.getProperties().get("org.eclipse.equinox.p2.type.group")))) { //$NON-NLS-1$
|
||||
+ featureOrBundle = true;
|
||||
+ }
|
||||
if (featureOrBundle && !added.contains(unit)) {
|
||||
|
@ -36,46 +36,6 @@
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ </profiles>
|
||||
</project>
|
||||
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml 2014-04-16 15:53:08.145402094 +0100
|
||||
@@ -27,4 +27,37 @@
|
||||
<ws>win32</ws>
|
||||
<arch>x86_64</arch>
|
||||
</properties>
|
||||
+ <profiles>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-win32.win32.x86_64</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>win32.win32.x86_64</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/win32/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" 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.ppc64le/pom.xml.orig 2014-04-16 15:57:02.805249103 +0100
|
||||
@ -156,86 +116,6 @@
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ </profiles>
|
||||
</project>
|
||||
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml 2014-04-16 15:53:08.145402094 +0100
|
||||
@@ -27,4 +27,37 @@
|
||||
<ws>win32</ws>
|
||||
<arch>x86</arch>
|
||||
</properties>
|
||||
+ <profiles>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-win32.win32.x86</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>win32.win32.x86</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/win32/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" 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.s390/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml 2014-04-16 15:53:08.145402094 +0100
|
||||
@@ -27,4 +27,37 @@
|
||||
<ws>gtk</ws>
|
||||
<arch>s390</arch>
|
||||
</properties>
|
||||
+ <profiles>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.s390</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.s390</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.s390x/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
||||
@ -318,43 +198,3 @@
|
||||
+ </profile>
|
||||
+ </profiles>
|
||||
</project>
|
||||
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml 2014-04-16 15:53:08.146402075 +0100
|
||||
@@ -27,4 +27,37 @@
|
||||
<ws>gtk</ws>
|
||||
<arch>ppc</arch>
|
||||
</properties>
|
||||
+ <profiles>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.ppc</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.ppc</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>
|
||||
|
@ -1,27 +1,30 @@
|
||||
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.orig 2014-03-12 10:43:26.000000000 +0000
|
||||
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 2014-03-12 14:36:44.130938292 +0000
|
||||
@@ -115,7 +115,7 @@
|
||||
WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
|
||||
@@ -121,7 +121,7 @@
|
||||
WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
|
||||
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
|
||||
|
||||
-CFLAGS = -O -Wall \
|
||||
+CFLAGS = -g -O -Wall \
|
||||
-DSWT_VERSION=$(SWT_VERSION) \
|
||||
$(NATIVE_STATS) \
|
||||
-DLINUX -DGTK \
|
||||
@@ -125,12 +125,6 @@
|
||||
$(SWT_DEBUG) \
|
||||
@@ -133,15 +133,6 @@
|
||||
${SWT_PTR_CFLAGS}
|
||||
LFLAGS = -shared -fPIC ${SWT_LFLAGS}
|
||||
|
||||
-ifndef NO_STRIP
|
||||
- # -s = Remove all symbol table and relocation information from the executable.
|
||||
- # i.e, more efficent code, but removes debug information. Should not be used if you want to debug.
|
||||
- # https://gcc.gnu.org/onlinedocs/gcc/Link-Options.html#Link-Options
|
||||
- # http://stackoverflow.com/questions/14175040/effects-of-removing-all-symbol-table-and-relocation-information-from-an-executab
|
||||
- AWT_LFLAGS := $(AWT_LFLAGS) -s
|
||||
- MOZILLALFLAGS := $(MOZILLALFLAGS) -s
|
||||
- LFLAGS := $(LFLAGS) -s
|
||||
-endif
|
||||
-
|
||||
|
||||
all: make_swt make_atk make_glx make_webkit
|
||||
|
||||
#
|
||||
--- 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
|
||||
@@ -48,7 +48,7 @@
|
||||
|
@ -70,7 +70,7 @@ index 88a8daa..382c5ee 100644
|
||||
<plugin
|
||||
--- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml.orig 2017-01-04 10:57:15.000000000 +0000
|
||||
+++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2017-01-13 11:29:16.371473551 +0000
|
||||
@@ -23,62 +23,6 @@
|
||||
@@ -23,76 +23,6 @@
|
||||
</license>
|
||||
|
||||
<plugin
|
||||
@ -116,7 +116,7 @@ index 88a8daa..382c5ee 100644
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.lucene.analysis"
|
||||
- id="org.apache.lucene.analyzers-common"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
@ -129,11 +129,25 @@ index 88a8daa..382c5ee 100644
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.lucene.analyzers-smartcn"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.lucene.misc"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.equinox.http.jetty"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -135,55 +79,6 @@
|
||||
@@ -149,55 +79,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
@ -189,17 +203,21 @@ index 88a8daa..382c5ee 100644
|
||||
id="org.eclipse.core.net"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -197,4 +92,21 @@
|
||||
@@ -211,4 +92,23 @@
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
+ <requires>
|
||||
+ <import plugin="javax.el" />
|
||||
+ <import plugin="javax.servlet" />
|
||||
+ <import plugin="javax.el-api" />
|
||||
+ <import plugin="javax.servlet-api" />
|
||||
+ <import plugin="javax.servlet.jsp" />
|
||||
+ <import plugin="com.sun.el.javax.el" />
|
||||
+ <import plugin="org.apache.commons.logging" />
|
||||
+ <import plugin="org.glassfish.web.javax.servlet.jsp" />
|
||||
+ <import plugin="org.apache.lucene.analyzers-common" />
|
||||
+ <import plugin="org.apache.lucene.core" />
|
||||
+ <import plugin="org.apache.lucene.analyzers-smartcn" />
|
||||
+ <import plugin="org.apache.lucene.misc" />
|
||||
+ <import plugin="org.eclipse.jetty.continuation" />
|
||||
+ <import plugin="org.eclipse.jetty.http" />
|
||||
+ <import plugin="org.eclipse.jetty.io" />
|
||||
@ -207,9 +225,7 @@ index 88a8daa..382c5ee 100644
|
||||
+ <import plugin="org.eclipse.jetty.server" />
|
||||
+ <import plugin="org.eclipse.jetty.servlet" />
|
||||
+ <import plugin="org.eclipse.jetty.util" />
|
||||
+ <import plugin="org.glassfish.web.javax.servlet.jsp" />
|
||||
+ </requires>
|
||||
+
|
||||
</feature>
|
||||
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig 2017-01-13 11:29:16.362473652 +0000
|
||||
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2017-01-13 11:29:16.371473551 +0000
|
||||
@ -276,7 +292,7 @@ index 88a8daa..382c5ee 100644
|
||||
id="org.eclipse.e4.core.di"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -165,20 +109,6 @@
|
||||
@@ -165,13 +109,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
@ -287,14 +303,21 @@ index 88a8daa..382c5ee 100644
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="javax.xml"
|
||||
id="org.eclipse.e4.core.di.extensions"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -217,13 +154,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.apache.felix.scr"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.e4.core.di.extensions"
|
||||
id="org.eclipse.equinox.ds"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -315,13 +245,6 @@
|
||||
@ -311,7 +334,7 @@ index 88a8daa..382c5ee 100644
|
||||
id="org.eclipse.equinox.preferences"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -757,27 +680,6 @@
|
||||
@@ -575,27 +498,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
@ -339,7 +362,7 @@ index 88a8daa..382c5ee 100644
|
||||
id="org.eclipse.equinox.console"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -806,13 +708,6 @@
|
||||
@@ -624,13 +526,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
@ -353,28 +376,28 @@ index 88a8daa..382c5ee 100644
|
||||
id="org.eclipse.e4.emf.xpath"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -835,4 +730,18 @@
|
||||
fragment="true"
|
||||
@@ -660,4 +555,18 @@
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
+ <requires>
|
||||
+ <import plugin="com.ibm.icu" />
|
||||
+ <import plugin="org.apache.batik.css" />
|
||||
+ <import plugin="org.w3c.css.sac" />
|
||||
+ <import plugin="org.apache.batik.util" />
|
||||
+ <import plugin="org.w3c.dom.svg" />
|
||||
+ <import plugin="javax.inject" />
|
||||
+ <import plugin="org.apache.batik.util.gui" />
|
||||
+ <import plugin="org.apache.commons.jxpath" />
|
||||
+ <import plugin="org.apache.felix.scr" />
|
||||
+ <import plugin="com.ibm.icu" />
|
||||
+ <import plugin="org.apache.felix.gogo.command" />
|
||||
+ <import plugin="org.apache.felix.gogo.runtime" />
|
||||
+ <import plugin="org.apache.felix.gogo.shell" />
|
||||
+ <import plugin="org.w3c.dom.svg" />
|
||||
+ <import plugin="org.w3c.css.sac" />
|
||||
+ <import plugin="javax.inject" />
|
||||
+ <import plugin="javax.xml" />
|
||||
+ <import plugin="org.apache.commons.jxpath" />
|
||||
+ </requires>
|
||||
</feature>
|
||||
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml.orig 2017-01-04 10:54:36.000000000 +0000
|
||||
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml 2017-01-13 11:28:25.827041896 +0000
|
||||
@@ -61,11 +61,6 @@
|
||||
@@ -61,12 +61,7 @@
|
||||
</requirement>
|
||||
<requirement>
|
||||
<type>eclipse-plugin</type>
|
||||
@ -383,9 +406,20 @@ index 88a8daa..382c5ee 100644
|
||||
- </requirement>
|
||||
- <requirement>
|
||||
- <type>eclipse-plugin</type>
|
||||
<id>javax.el</id>
|
||||
- <id>javax.el</id>
|
||||
+ <id>javax.el-api</id>
|
||||
<versionRange>0.0.0</versionRange>
|
||||
</requirement>
|
||||
<requirement>
|
||||
@@ -76,7 +71,7 @@
|
||||
</requirement>
|
||||
<requirement>
|
||||
<type>eclipse-plugin</type>
|
||||
- <id>javax.servlet</id>
|
||||
+ <id>javax.servlet-api</id>
|
||||
<versionRange>0.0.0</versionRange>
|
||||
</requirement>
|
||||
<requirement>
|
||||
@@ -96,7 +91,7 @@
|
||||
</requirement>
|
||||
<requirement>
|
||||
@ -397,9 +431,9 @@ index 88a8daa..382c5ee 100644
|
||||
<requirement>
|
||||
--- eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF.orig 2017-02-15 10:01:24.202436806 +0000
|
||||
+++ eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF 2017-02-15 10:01:35.454301845 +0000
|
||||
@@ -38,8 +38,7 @@
|
||||
org.eclipse.e4.core.commands;bundle-version="0.10.0",
|
||||
org.eclipse.e4.ui.dialogs;bundle-version="1.0.0"
|
||||
@@ -39,8 +39,7 @@
|
||||
org.eclipse.e4.ui.dialogs;bundle-version="1.0.0",
|
||||
org.eclipse.e4.emf.xpath
|
||||
Bundle-ActivationPolicy: lazy
|
||||
-Import-Package: javax.annotation,
|
||||
- javax.inject;version="1.0.0",
|
||||
|
@ -246,3 +246,30 @@ index bc8963d..fbe4da3 100644
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
--- eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml.orig 2017-04-07 10:44:33.764607961 +0100
|
||||
+++ eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml 2017-04-07 11:26:44.511961798 +0100
|
||||
@@ -26,4 +26,24 @@
|
||||
<testClass>org.eclipse.jdt.core.tests.builder.BuilderTests</testClass>
|
||||
<testSuite>${project.artifactId}</testSuite>
|
||||
</properties>
|
||||
+
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <groupId>org.eclipse.tycho</groupId>
|
||||
+ <artifactId>target-platform-configuration</artifactId>
|
||||
+ <configuration>
|
||||
+ <dependency-resolution>
|
||||
+ <extraRequirements>
|
||||
+ <requirement>
|
||||
+ <type>eclipse-plugin</type>
|
||||
+ <id>org.eclipse.jdt.annotation</id>
|
||||
+ <versionRange>0.0.0</versionRange>
|
||||
+ </requirement>
|
||||
+ </extraRequirements>
|
||||
+ </dependency-resolution>
|
||||
+ </configuration>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
</project>
|
||||
|
@ -24,7 +24,7 @@ index 8d08101..59567c0 100644
|
||||
import org.eclipse.core.runtime.*;
|
||||
import org.eclipse.equinox.internal.p2.ui.*;
|
||||
import org.eclipse.equinox.internal.p2.ui.query.IUViewQueryContext;
|
||||
@@ -314,6 +315,19 @@ public class RepositorySelectionGroup {
|
||||
@@ -325,6 +326,19 @@ public class RepositorySelectionGroup {
|
||||
void fillRepoCombo(final String selection) {
|
||||
RepositoryTracker tracker = ui.getRepositoryTracker();
|
||||
URI[] sites = tracker.getKnownRepositories(ui.getSession());
|
||||
@ -48,7 +48,7 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equin
|
||||
index c0f2ca1..03515c7 100644
|
||||
--- 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
|
||||
@@ -130,9 +130,22 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb
|
||||
@@ -132,9 +132,22 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb
|
||||
if (cachedElements == null) {
|
||||
Object[] children = super.fetchChildren(o, monitor);
|
||||
cachedElements = new Hashtable<String, MetadataRepositoryElement>(children.length);
|
||||
|
@ -1,36 +0,0 @@
|
||||
--- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty9/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java.old 2016-06-15 10:29:35.370386868 +0100
|
||||
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty9/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java 2016-06-15 10:59:31.120348432 +0100
|
||||
@@ -26,7 +26,6 @@
|
||||
import org.eclipse.equinox.http.servlet.HttpServiceMultipartServlet;
|
||||
import org.eclipse.equinox.http.servlet.HttpServiceServlet;
|
||||
import org.eclipse.jetty.server.*;
|
||||
-import org.eclipse.jetty.server.session.HashSessionManager;
|
||||
import org.eclipse.jetty.server.session.SessionHandler;
|
||||
import org.eclipse.jetty.servlet.ServletContextHandler;
|
||||
import org.eclipse.jetty.servlet.ServletHolder;
|
||||
@@ -144,9 +143,9 @@
|
||||
// This servlet has no mapping as it's only used from named dispatcher
|
||||
httpContext.getServletHandler().addServlet(multiPartHolder);
|
||||
|
||||
- SessionManager sessionManager = httpContext.getSessionHandler().getSessionManager();
|
||||
+ SessionHandler sessionHandler = httpContext.getSessionHandler();
|
||||
try {
|
||||
- sessionManager.addEventListener((HttpSessionIdListener) holder.getServlet());
|
||||
+ sessionHandler.addEventListener((HttpSessionIdListener) holder.getServlet());
|
||||
} catch (ServletException e) {
|
||||
throw new ConfigurationException(pid, e.getMessage(), e);
|
||||
}
|
||||
@@ -241,10 +240,10 @@
|
||||
contextWorkDir.mkdir();
|
||||
httpContext.setAttribute(CONTEXT_TEMPDIR, contextWorkDir);
|
||||
|
||||
- HashSessionManager sessionManager = new HashSessionManager();
|
||||
- sessionManager.setMaxInactiveInterval(Details.getInt(dictionary, JettyConstants.CONTEXT_SESSIONINACTIVEINTERVAL, -1));
|
||||
+ SessionHandler sessionHandler = new SessionHandler();
|
||||
+ sessionHandler.setMaxInactiveInterval(Details.getInt(dictionary, JettyConstants.CONTEXT_SESSIONINACTIVEINTERVAL, -1));
|
||||
|
||||
- httpContext.setSessionHandler(new SessionHandler(sessionManager));
|
||||
+ httpContext.setSessionHandler(sessionHandler);
|
||||
|
||||
return httpContext;
|
||||
}
|
File diff suppressed because it is too large
Load Diff
@ -14,7 +14,7 @@
|
||||
org.eclipse.ui.tests.menus
|
||||
--- eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF.orig 2014-03-26 11:44:04.400306048 +0000
|
||||
+++ eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF 2014-03-26 12:58:07.608331033 +0000
|
||||
@@ -31,8 +31,8 @@
|
||||
@@ -32,8 +32,8 @@
|
||||
org.eclipse.core.expressions;bundle-version="3.4.200",
|
||||
org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.9.0",
|
||||
org.eclipse.e4.ui.css.swt;bundle-version="0.11.0",
|
||||
@ -38,3 +38,14 @@
|
||||
org.eclipse.equinox.preferences;bundle-version="3.5.200"
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
--- eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml.orig 2017-04-04 17:30:21.859313175 +0100
|
||||
+++ eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml 2017-04-04 17:30:47.748038958 +0100
|
||||
@@ -75,7 +75,7 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.mockito"
|
||||
+ id="org.mockito.mockito-core"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
|
@ -72,7 +72,7 @@
|
||||
</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
|
||||
@@ -74,6 +74,13 @@
|
||||
@@ -73,6 +73,13 @@
|
||||
<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"/>
|
||||
@ -113,15 +113,14 @@
|
||||
</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
|
||||
@@ -54,6 +54,21 @@
|
||||
<plugin id="org.eclipse.equinox.launcher.gtk.hpux.ia64"/>
|
||||
@@ -46,6 +46,20 @@
|
||||
<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.e4.ui.workbench.renderers.swt.cocoa" />
|
||||
+ <plugin id="org.apache.commons.jxpath" />
|
||||
+ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
|
||||
+ <plugin id="org.apache.felix.gogo.command" />
|
||||
+ <plugin id="org.apache.batik.css" />
|
||||
+ <plugin id="org.w3c.css.sac" />
|
||||
@ -144,12 +143,12 @@
|
||||
- <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.source.feature" version="1.1.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.core.ssl.source.feature" version="1.0.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.source.feature" version="3.9.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.ssl.source.feature" version="1.0.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.core.feature.source" version="1.3.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.3" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.feature.source" version="3.13.3" 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
|
||||
|
@ -29,12 +29,23 @@ index 7e1f520..734dd10 100644
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.equinox.launcher.gtk.linux.x86"
|
||||
@@ -597,6 +627,28 @@
|
||||
@@ -597,6 +627,39 @@
|
||||
version="0.0.0"
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.swt.gtk.linux.s390x"
|
||||
+ os="linux"
|
||||
+ ws="gtk"
|
||||
+ arch="s390x"
|
||||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
+ fragment="true"
|
||||
+ unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.swt.gtk.linux.arm"
|
||||
+ os="linux"
|
||||
+ ws="gtk"
|
||||
@ -58,65 +69,14 @@ index 7e1f520..734dd10 100644
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.swt.gtk.linux.ppc"
|
||||
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 29d3871..45526c8 100644
|
||||
--- 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
|
||||
@@ -119,6 +125,16 @@
|
||||
defaultJava=DEFAULT_JAVA_EXEC
|
||||
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
;;
|
||||
+ arm*)
|
||||
+ defaultOSArch="arm"
|
||||
+ defaultJava=DEFAULT_JAVA_EXEC
|
||||
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
+ ;;
|
||||
+ "aarch64")
|
||||
+ defaultOSArch="aarch64"
|
||||
+ defaultJava=DEFAULT_JAVA_EXEC
|
||||
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
+ ;;
|
||||
*)
|
||||
echo "*** Unknown MODEL <${MODEL}>"
|
||||
;;
|
||||
--- 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
|
||||
@@ -219,6 +219,128 @@
|
||||
@@ -349,6 +349,68 @@
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
+
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.ppc</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.ppc</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.ppc64</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
@ -176,57 +136,37 @@ index 29d3871..45526c8 100644
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.s390</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.s390</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+
|
||||
<profile>
|
||||
<id>build-native-launchers-win32.win32.x86_64</id>
|
||||
<activation>
|
||||
@@ -347,8 +530,6 @@
|
||||
<include name="gtk/solaris/sparcv9/**/*"/>
|
||||
<include name="win32/win32/x86/**/*"/>
|
||||
<include name="win32/win32/x86_64/**/*"/>
|
||||
- </fileset>
|
||||
- <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/">
|
||||
<include name="gtk/linux/s390/**/*"/>
|
||||
<include name="gtk/linux/s390x/**/*"/>
|
||||
</fileset>
|
||||
--- 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
|
||||
@@ -59,4 +59,8 @@
|
||||
root.linux.gtk.s390=bin/gtk/linux/s390,gtk_root
|
||||
root.linux.gtk.s390.permissions.755=launcher
|
||||
@@ -40,3 +40,12 @@
|
||||
|
||||
root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
|
||||
root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
|
||||
+
|
||||
+root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
|
||||
+root.linux.gtk.aarch64.permissions.755=launcher
|
||||
+
|
||||
+root.linux.gtk.arm=bin/gtk/linux/arm,gtk_root
|
||||
+root.linux.gtk.arm.permissions.755=launcher
|
||||
+
|
||||
+root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
|
||||
+root.linux.gtk.s390x.permissions.755=launcher
|
||||
--- 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
|
||||
@@ -55,9 +55,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.ppc</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>
|
||||
|
@ -29,11 +29,9 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/
|
||||
index ab69b88..d6bf121 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
|
||||
@@ -13,9 +13,14 @@ package org.eclipse.equinox.internal.simpleconfigurator.utils;
|
||||
|
||||
import java.io.*;
|
||||
@@ -15,8 +15,12 @@ package org.eclipse.equinox.internal.simpleconfigurator.utils;
|
||||
import java.net.*;
|
||||
+import java.nio.file.*;
|
||||
import java.nio.file.Files;
|
||||
import java.util.*;
|
||||
+import java.util.jar.JarFile;
|
||||
+import java.util.zip.ZipEntry;
|
||||
@ -51,7 +49,7 @@ index ab69b88..d6bf121 100644
|
||||
URI location = parseLocation(tok.nextToken().trim());
|
||||
+ if (base != null) {
|
||||
+ URI absLoc = URIUtil.append(base, location.toString());
|
||||
+ Path absPath = Paths.get(absLoc);
|
||||
+ java.nio.file.Path absPath = java.nio.file.Paths.get(absLoc);
|
||||
+ // Symbolic links may change outside Eclipse so regenerate proper bundle version.
|
||||
+ if (Files.isSymbolicLink(absPath) && absPath.toFile().isFile()) {
|
||||
+ // We can't depend on org.eclipse.equinox.internal.frameworkadmin.utils.Utils
|
||||
|
25
eclipse-swt-disable-gtk2.patch
Normal file
25
eclipse-swt-disable-gtk2.patch
Normal file
@ -0,0 +1,25 @@
|
||||
--- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml.orig
|
||||
+++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
|
||||
@@ -898,15 +898,19 @@
|
||||
</not>
|
||||
</condition>
|
||||
<antcall target="init_build"/>
|
||||
+ <antcall target="build_gtk2"/>
|
||||
+ <antcall target="build_gtk3"/>
|
||||
+ <delete dir="${build_dir}" quiet="true"/>
|
||||
+ <antcall target="refresh_fragment"/>
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="build_gtk2" if="machine_gtk2">
|
||||
<antcall target="${build_task}">
|
||||
<param name="build_targets" value="${targets}"/>
|
||||
<param name="build_machine" value="${machine}"/>
|
||||
<param name="port" value="${port}"/>
|
||||
<param name="keyfile" value="${keyfile}"/>
|
||||
</antcall>
|
||||
- <antcall target="build_gtk3"/>
|
||||
- <delete dir="${build_dir}" quiet="true"/>
|
||||
- <antcall target="refresh_fragment"/>
|
||||
</target>
|
||||
|
||||
<target name="build_gtk3" if="machine_gtk3">
|
@ -201,7 +201,7 @@
|
||||
echo "command line as passed into $(basename ${0}): ${*}"
|
||||
echo "command line (quoted) as passed into $(basename ${0}): ${@}"
|
||||
|
||||
@@ -159,6 +198,8 @@
|
||||
@@ -166,6 +205,8 @@
|
||||
if [[ "true" == "${START_WINDOW_MGT}" ]]
|
||||
then
|
||||
./startWindowManager.sh
|
||||
@ -210,7 +210,7 @@
|
||||
fi
|
||||
|
||||
# During production tests, we define 'testedPlatform' as a combination of
|
||||
@@ -192,6 +233,7 @@
|
||||
@@ -199,6 +240,7 @@
|
||||
echo "platformString: ${platformString}"
|
||||
echo "testedPlatform: ${testedPlatform}"
|
||||
|
||||
@ -218,7 +218,7 @@
|
||||
# -Dtimeout=300000 "${ANT_OPTS}"
|
||||
if [[ -n "${extdirproperty}" ]]
|
||||
then
|
||||
@@ -202,4 +244,4 @@
|
||||
@@ -209,4 +251,4 @@
|
||||
$jvm ${ANT_OPTS} ${platformArgString} -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml ${ANT_OPTS} ${platformParmString} -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger $tests 2>&1 | tee $consolelogs
|
||||
fi
|
||||
|
||||
|
569
eclipse.spec
569
eclipse.spec
@ -5,22 +5,11 @@
|
||||
|
||||
Epoch: 1
|
||||
|
||||
%global eb_commit a8c4189f4b7af192e2295b27aef74300ac3bfce9
|
||||
%global eclipse_tag S4_6_3_RC4
|
||||
%global eb_commit 4bb6dae1336990aa3fe29be55f99869f091f6e44
|
||||
%global eclipse_tag I20170404-0245
|
||||
|
||||
%if 0%{?fedora} >= 26
|
||||
%global _jetty_version 9.4.2
|
||||
%global _lucene_version 5.5.0
|
||||
%else
|
||||
%if 0%{?fedora} >= 25
|
||||
%global _jetty_version 9.4.0
|
||||
%global _lucene_version 5.5.0
|
||||
%else
|
||||
# Used on RHEL
|
||||
%global _jetty_version 9.0.3
|
||||
%global _lucene_version 5.4.1
|
||||
%endif
|
||||
%endif
|
||||
%global _jetty_version 9.4.3
|
||||
%global _lucene_version 6.1.0
|
||||
|
||||
%ifarch %{ix86}
|
||||
%global eclipse_arch x86
|
||||
@ -31,7 +20,7 @@ Epoch: 1
|
||||
%ifarch ppc64 ppc64p7
|
||||
%global eclipse_arch ppc64
|
||||
%endif
|
||||
%ifarch s390 s390x ppc x86_64 aarch64 ppc64le
|
||||
%ifarch s390 s390x x86_64 aarch64 ppc64le
|
||||
%global eclipse_arch %{_arch}
|
||||
%endif
|
||||
|
||||
@ -40,14 +29,16 @@ Epoch: 1
|
||||
%global app_exec %{?app_exec_prefix} eclipse
|
||||
|
||||
# See fedora-devel-java-list discussion in September 2008.
|
||||
#
|
||||
# Prevent brp-java-repack-jars from being run.
|
||||
%global __jar_repack %{nil}
|
||||
|
||||
# Eclipse is arch-specific, but multilib agnostic
|
||||
%global _eclipsedir %{_prefix}/lib/eclipse
|
||||
|
||||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: 4.6.3
|
||||
Release: 3%{?dist}
|
||||
Version: 4.7.0
|
||||
Release: 0.1%{?dist}
|
||||
License: EPL
|
||||
URL: http://www.eclipse.org/
|
||||
|
||||
@ -75,9 +66,9 @@ Patch4: eclipse-ignore-version-when-calculating-home.patch
|
||||
# just source, and we don't want additional dependencies.
|
||||
Patch5: eclipse-remove-jgit-provider.patch
|
||||
|
||||
Patch8: eclipse-test-support.patch
|
||||
Patch6: eclipse-test-support.patch
|
||||
|
||||
Patch9: eclipse-secondary-arches.patch
|
||||
Patch7: eclipse-secondary-arches.patch
|
||||
|
||||
Patch10: eclipse-debug-symbols.patch
|
||||
|
||||
@ -98,20 +89,17 @@ Patch15: eclipse-support-symlink-bundles.patch
|
||||
# If plugin is external, updating it breaks the feature. (version changes)
|
||||
# Workaround : Change <plugin> definition to a 'requirement'
|
||||
# Also makes the following BSN changes at the same time:
|
||||
# -com.sun.el
|
||||
# +javax.el
|
||||
# -org.apache.jasper.glassfish
|
||||
# +org.glassfish.web.javax.servlet.jsp
|
||||
# -javax.annotation
|
||||
# -org.w3c.dom.smil
|
||||
# com.sun.el -> com.sun.el.javax.el
|
||||
# javax.el -> javax.el-api
|
||||
# javax.servlet -> javax.servlet-api
|
||||
# org.apache.jasper.glassfish -> org.glassfish.web.javax.servlet.jsp
|
||||
# javax.annotation -> removed
|
||||
# org.w3c.dom.smil -> removed
|
||||
Patch16: eclipse-feature-plugins-to-category-ius.patch
|
||||
|
||||
# Disable non-linux specific bundles to save build time
|
||||
Patch17: disable-non-linux.patch
|
||||
|
||||
# Port to Lucene 5
|
||||
Patch18: eclipse-lucene-5.patch
|
||||
|
||||
# Fix various JDT and PDE tests
|
||||
Patch20: eclipse-fix-tests.patch
|
||||
|
||||
@ -122,8 +110,8 @@ Patch22: eclipse-pde-tp-support-droplets.patch
|
||||
# Use webkit2 by default and prevent usage of xulrunner
|
||||
Patch23: eclipse-webkit2-by-default.patch
|
||||
|
||||
# Port to jetty 9.4
|
||||
Patch24: eclipse-jetty-9.4.patch
|
||||
# Only build gtk3 backend for SWT
|
||||
Patch24: eclipse-swt-disable-gtk2.patch
|
||||
|
||||
# Droplet fixes
|
||||
Patch26: eclipse-make-droplets-runnable.patch
|
||||
@ -161,22 +149,24 @@ BuildRequires: pkgconfig(xt)
|
||||
BuildRequires: pkgconfig(xtst)
|
||||
BuildRequires: pkgconfig(gtk+-2.0)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(webkitgtk-3.0)
|
||||
%if ! 0%{?rhel}
|
||||
%if 0%{?rhel}
|
||||
# RHEL does not have webkit2
|
||||
BuildRequires: pkgconfig(webkitgtk-3.0)
|
||||
%else
|
||||
BuildRequires: pkgconfig(webkit2gtk-4.0)
|
||||
%endif
|
||||
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-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
|
||||
BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf
|
||||
BuildRequires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
|
||||
BuildRequires: jsch >= 0:0.1.46-2
|
||||
BuildRequires: apache-commons-el >= 1.0-22
|
||||
BuildRequires: apache-commons-logging
|
||||
BuildRequires: apache-commons-codec
|
||||
BuildRequires: apache-commons-jxpath
|
||||
BuildRequires: apache-commons-fileupload
|
||||
BuildRequires: felix-gogo-command
|
||||
BuildRequires: felix-gogo-shell
|
||||
BuildRequires: osgi(org.apache.felix.gogo.shell)
|
||||
BuildRequires: osgi(org.apache.felix.gogo.command)
|
||||
BuildRequires: osgi(org.apache.felix.scr) >= 2.0.8
|
||||
BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
|
||||
BuildRequires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
|
||||
BuildRequires: osgi(org.eclipse.jetty.http) >= %{_jetty_version}
|
||||
@ -185,6 +175,7 @@ BuildRequires: osgi(org.eclipse.jetty.io) >= %{_jetty_version}
|
||||
BuildRequires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
|
||||
BuildRequires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
|
||||
BuildRequires: lucene-core >= %{_lucene_version}
|
||||
BuildRequires: lucene-misc >= %{_lucene_version}
|
||||
BuildRequires: lucene-analysis >= %{_lucene_version}
|
||||
BuildRequires: lucene-queryparser >= %{_lucene_version}
|
||||
BuildRequires: lucene-analyzers-smartcn >= %{_lucene_version}
|
||||
@ -256,14 +247,16 @@ Summary: Eclipse platform common files
|
||||
Recommends: eclipse-abrt
|
||||
Recommends: eclipse-usage
|
||||
|
||||
Requires: 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
|
||||
Requires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
|
||||
Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf
|
||||
Requires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
|
||||
Requires: jsch >= 0.1.46-2
|
||||
Requires: apache-commons-el >= 1.0-23
|
||||
Requires: apache-commons-logging
|
||||
Requires: apache-commons-codec
|
||||
Requires: apache-commons-jxpath
|
||||
Requires: felix-gogo-command
|
||||
Requires: felix-gogo-shell
|
||||
Requires: osgi(org.apache.felix.gogo.shell)
|
||||
Requires: osgi(org.apache.felix.gogo.command)
|
||||
Requires: osgi(org.apache.felix.scr) >= 2.0.8
|
||||
Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
|
||||
Requires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
|
||||
Requires: osgi(org.eclipse.jetty.http) >= %{_jetty_version}
|
||||
@ -271,8 +264,8 @@ Requires: osgi(org.eclipse.jetty.continuation) >= %{_jetty_version}
|
||||
Requires: osgi(org.eclipse.jetty.io) >= %{_jetty_version}
|
||||
Requires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
|
||||
Requires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
|
||||
Requires: jsch >= 0.1.46-2
|
||||
Requires: lucene-core >= %{_lucene_version}
|
||||
Requires: lucene-misc >= %{_lucene_version}
|
||||
Requires: lucene-analysis >= %{_lucene_version}
|
||||
Requires: lucene-queryparser >= %{_lucene_version}
|
||||
Requires: lucene-analyzers-smartcn >= %{_lucene_version}
|
||||
@ -325,9 +318,6 @@ Requires: %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires: objectweb-asm >= 5.0.3-1
|
||||
Recommends: eclipse-e4-importer
|
||||
# For PDE Build wrapper script + creating jars
|
||||
Requires: zip
|
||||
Requires: bash
|
||||
|
||||
%description pde
|
||||
Eclipse Plugin Development Environment. This package is required for
|
||||
@ -375,8 +365,8 @@ tar --strip-components=1 -xf %{SOURCE1}
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5
|
||||
%patch8
|
||||
%patch9 -p1
|
||||
%patch6
|
||||
%patch7 -p1
|
||||
%patch10
|
||||
%patch11
|
||||
%patch12
|
||||
@ -385,7 +375,6 @@ tar --strip-components=1 -xf %{SOURCE1}
|
||||
%patch15
|
||||
%patch16
|
||||
%patch17
|
||||
%patch18 -p1
|
||||
%patch20
|
||||
%patch21
|
||||
%patch22
|
||||
@ -393,9 +382,7 @@ tar --strip-components=1 -xf %{SOURCE1}
|
||||
# RHEL does not have webkit2
|
||||
%patch23
|
||||
%endif
|
||||
%if 0%{?fedora} >= 25
|
||||
%patch24
|
||||
%endif
|
||||
%patch26
|
||||
%patch27
|
||||
%patch28
|
||||
@ -410,9 +397,6 @@ sed -i -e 's/groupId>org.eclipse.jdt</groupId>org.eclipse.tycho</' eclipse-platf
|
||||
# Resolving the target platform requires too many changes, so don't use it
|
||||
%pom_xpath_remove "pom:configuration/pom:target" eclipse-platform-parent
|
||||
|
||||
# Unnecessary plugin
|
||||
%pom_remove_plugin "org.codehaus.mojo:properties-maven-plugin" eclipse-platform-parent
|
||||
|
||||
# Disable as many products as possible to make the build faster, we care only for the IDE
|
||||
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
|
||||
%pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder
|
||||
@ -444,7 +428,7 @@ sed -i -e 's/groupId>org.eclipse.jdt</groupId>org.eclipse.tycho</' eclipse-platf
|
||||
%pom_disable_module bundles/org.eclipse.equinox.p2.artifact.processors rt.equinox.p2
|
||||
%pom_disable_module bundles/ie.wombat.jbdiff rt.equinox.p2
|
||||
%pom_disable_module bundles/ie.wombat.jbdiff.test rt.equinox.p2
|
||||
%pom_disable_module tests/com.google.code.atinject.tck eclipse.platform.runtime
|
||||
%pom_disable_module com.google.code.atinject.tck eclipse.platform.runtime/tests
|
||||
|
||||
# Disable examples
|
||||
%pom_disable_module bundles/org.eclipse.sdk.examples eclipse.platform.releng
|
||||
@ -482,7 +466,7 @@ for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt
|
||||
if [ -n "$module" ] ; then
|
||||
%pom_disable_module bundles/$b eclipse.platform.swt.binaries
|
||||
%pom_xpath_inject "pom:excludes" "<plugin id='$b'/>" eclipse.platform.ui/features/org.eclipse.e4.rcp
|
||||
%pom_xpath_remove -f "plugin[@id='$b']" eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
%pom_xpath_remove "plugin[@id='$b']" eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
fi
|
||||
done
|
||||
for b in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.launcher\.(?!gtk\.linux.%{eclipse_arch}$)'` ; do
|
||||
@ -511,14 +495,16 @@ done
|
||||
%pom_disable_module bundles/org.eclipse.equinox.security.win32.x86 rt.equinox.bundles
|
||||
%pom_disable_module bundles/org.eclipse.equinox.security.win32.x86_64 rt.equinox.bundles
|
||||
%pom_disable_module bundles/org.eclipse.compare.win32 eclipse.platform.team
|
||||
%pom_disable_module bundles/org.eclipse.e4.ui.workbench.renderers.swt.cocoa eclipse.platform.ui
|
||||
%pom_disable_module bundles/org.eclipse.ui.cocoa eclipse.platform.ui
|
||||
%pom_disable_module bundles/org.eclipse.ui.win32 eclipse.platform.ui
|
||||
%pom_disable_module bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc eclipse.platform.resources
|
||||
%pom_disable_module bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64 eclipse.platform.resources
|
||||
%pom_disable_module org.eclipse.e4.ui.workbench.renderers.swt.cocoa eclipse.platform.ui/bundles
|
||||
%pom_disable_module org.eclipse.ui.cocoa eclipse.platform.ui/bundles
|
||||
%pom_disable_module org.eclipse.ui.win32 eclipse.platform.ui/bundles
|
||||
%pom_disable_module bundles/org.eclipse.core.resources.win32.x86 eclipse.platform.resources
|
||||
%pom_disable_module bundles/org.eclipse.core.resources.win32.x86_64 eclipse.platform.resources
|
||||
|
||||
# We don't need SWT fragments since we only care for current arch
|
||||
%pom_disable_module tests/org.eclipse.swt.tests.fragments.feature eclipse.platform.swt
|
||||
%pom_xpath_remove "pom:dependency-resolution" eclipse.platform.swt/tests/org.eclipse.swt.tests
|
||||
|
||||
# Disable contributor tools that have external dependencies during bootstrap
|
||||
%if %{bootstrap}
|
||||
%pom_disable_module eclipse.platform.ui.tools
|
||||
@ -596,19 +582,12 @@ popd
|
||||
# Allow usage of javax.servlet.jsp 2.3.
|
||||
sed -i '/javax\.servlet\.jsp/ s/2\.3/2\.4/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
|
||||
|
||||
# Use com.sun.el.java.el (Glassfish) instead of javax.el (Tomcat)
|
||||
sed -i 's/javax\.el/javax\.el-api/' \
|
||||
eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml \
|
||||
eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
|
||||
sed -i '/javax\.el-api/a<import plugin="com.sun.el.javax.el" \/>' \
|
||||
eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
|
||||
|
||||
# Use javax.servlet-api (Glassfish) instead of javax.servlet (Tomcat)
|
||||
find -name feature.xml | xargs sed -i -e 's|"javax.servlet"|"javax.servlet-api"|'
|
||||
sed -i -e "s|<id>javax.servlet</id>|<id>javax.servlet-api</id>|g" eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
|
||||
sed -i -e "2iRequire-Bundle: javax.servlet-api" rt.equinox.bundles/bundles/org.eclipse.equinox.http.{jetty9,servlet}/META-INF/MANIFEST.MF
|
||||
|
||||
%pom_remove_plugin org.mortbay.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp
|
||||
# Pre-compiling JSPs does not currently work
|
||||
%pom_remove_plugin org.eclipse.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp
|
||||
|
||||
# Remove generated files not present during bootstrap build
|
||||
# org.eclipse.platform.doc.isv, org.eclipse.jdt.doc.isv, org.eclipse.pde.doc.user
|
||||
@ -616,12 +595,10 @@ sed -i -e "2iRequire-Bundle: javax.servlet-api" rt.equinox.bundles/bundles/org.e
|
||||
sed -i '18,47d' eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml
|
||||
%endif
|
||||
|
||||
# Remove some problem comments that cause a failure
|
||||
sed -i -e '/<dl>/,/<dl>/d' eclipse.jdt.core/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/Checks.java
|
||||
|
||||
# Use system osgi.annotation lib
|
||||
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.framework/bundles/org.eclipse.osgi/osgi/
|
||||
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.framework/bundles/org.eclipse.osgi.services/lib/
|
||||
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.framework/bundles/org.eclipse.osgi.util/lib/
|
||||
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/osgi/
|
||||
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles/org.eclipse.equinox.coordinator/lib/
|
||||
|
||||
@ -654,8 +631,8 @@ ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles
|
||||
|
||||
%build
|
||||
#This is the lowest value where the build succeeds. 512m is not enough.
|
||||
export MAVEN_OPTS="-Xmx1000m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
|
||||
export JAVA_HOME=%{java_home}
|
||||
export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
|
||||
export JAVA_HOME=%{_jvmdir}/java
|
||||
|
||||
# Qualifier generated from last modification time of source tarball
|
||||
QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M)
|
||||
@ -675,7 +652,7 @@ product="eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/or
|
||||
dependencies/fake_ant_dependency.sh $product/eclipse/plugins/org.apache.ant_*
|
||||
|
||||
# Symlink necessary plugins that are provided by other packages
|
||||
dependencies/replace_platform_plugins_with_symlinks.sh $product/eclipse %{_javadir}
|
||||
dependencies/replace_platform_plugins_with_symlinks.sh $product/eclipse %{_javadir} %{_jnidir}
|
||||
|
||||
pushd $product/eclipse
|
||||
|
||||
@ -704,9 +681,8 @@ sed -i "s|-Xmx512m|-Xmx1024m|g" eclipse.ini
|
||||
sed -i '1i-protect\nmaster' eclipse.ini
|
||||
|
||||
# Temporary fix until https://bugs.eclipse.org/294877 is resolved
|
||||
cat >> eclipse.ini <<EOFINI
|
||||
cat >> eclipse.ini <<EOF
|
||||
-Dorg.eclipse.swt.browser.UseWebKitGTK=true
|
||||
-Dhelp.lucene.tokenizer=standard
|
||||
-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith
|
||||
-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>
|
||||
-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate
|
||||
@ -714,10 +690,10 @@ cat >> eclipse.ini <<EOFINI
|
||||
-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile
|
||||
-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState
|
||||
-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%{_datadir}/eclipse/dropins
|
||||
-Dp2.fragments=%{_datadir}/eclipse/droplets,%{_libdir}/eclipse/droplets
|
||||
-Dp2.fragments=%{_eclipsedir}/droplets,%{_datadir}/eclipse/droplets
|
||||
-Declipse.p2.skipMovedInstallDetection=true
|
||||
-Dosgi.framework.extensions=org.eclipse.wst.jsdt.nashorn.extension
|
||||
EOFINI
|
||||
EOF
|
||||
|
||||
popd #eclipse
|
||||
|
||||
@ -760,51 +736,51 @@ pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.e
|
||||
for i in `ls | grep "profile.gz"` ; do \
|
||||
echo $i ; \
|
||||
gunzip $i ; \
|
||||
sed -i -e "s@${LOCAL_PWD}/eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse@%{_libdir}/eclipse@g" *.profile ; \
|
||||
sed -i -e "s@${LOCAL_PWD}/eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse@%{_eclipsedir}@g" *.profile ; \
|
||||
gzip *.profile ; \
|
||||
done
|
||||
popd
|
||||
|
||||
#installation itself - copy it into right location
|
||||
rsync -vrpl eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse \
|
||||
$RPM_BUILD_ROOT%{_libdir}
|
||||
|
||||
# Symlink eclipse binary
|
||||
pushd $RPM_BUILD_ROOT%{_bindir}
|
||||
ln -s %{_libdir}/eclipse/eclipse
|
||||
popd
|
||||
$RPM_BUILD_ROOT%{_prefix}/lib
|
||||
|
||||
# SWT is a directory, but we need to provide jars for others that depend on it
|
||||
pushd $RPM_BUILD_ROOT/%{_libdir}/eclipse/plugins
|
||||
pushd $RPM_BUILD_ROOT/%{_eclipsedir}/plugins
|
||||
SWT_JAR=$(ls | grep swt.gtk.linux)
|
||||
(cd ${SWT_JAR} && zip -r "../../swt.jar" * )
|
||||
popd
|
||||
|
||||
# Symlink SWT jar
|
||||
pushd $RPM_BUILD_ROOT/%{_jnidir}/
|
||||
ln -s $(abs2rel %{_libdir}/eclipse/swt.jar %{_jnidir})
|
||||
ln -s $(abs2rel %{_eclipsedir}/swt.jar %{_jnidir})
|
||||
popd
|
||||
|
||||
# Symlink eclipse binary
|
||||
pushd $RPM_BUILD_ROOT%{_bindir}
|
||||
ln -s %{_eclipsedir}/eclipse
|
||||
popd
|
||||
|
||||
# Symlink eclipse ini
|
||||
pushd $RPM_BUILD_ROOT/%{_sysconfdir}/
|
||||
ln -s %{_libdir}/eclipse/eclipse.ini
|
||||
ln -s %{_eclipsedir}/eclipse.ini
|
||||
popd
|
||||
|
||||
# List jars to be symlinked into javadir
|
||||
pushd $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins
|
||||
EQUINOX_JARS=$(ls . | grep '^org.eclipse.equinox' | sed -e 's|^org\.eclipse\.\(.*\)_.*|\1|')
|
||||
pushd $RPM_BUILD_ROOT%{_eclipsedir}/plugins
|
||||
EQUINOX_JARS=$(ls . | grep -P '^org.eclipse.equinox(?!.*\.ui[\._])' | sed -e 's|^org\.eclipse\.\(.*\)_.*|\1|')
|
||||
OSGI_JARS=$(ls . | grep '^org.eclipse.osgi' | sed -e 's|^org\.eclipse\.\(.*\)_.*|\1|')
|
||||
popd
|
||||
|
||||
# Symlink jars into javadir
|
||||
for J in $EQUINOX_JARS $OSGI_JARS core.contenttype core.jobs core.net core.runtime ; do
|
||||
pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
|
||||
DIR=%{?scl:../../../../}../../../..%{_libdir}/eclipse
|
||||
DIR=%{?scl:../../../../}../../../..%{_eclipsedir}
|
||||
[ -e "`ls $DIR/plugins/org.eclipse.${J}_*.jar`" ] && ln -s $DIR/plugins/org.eclipse.${J}_*.jar ${J}.jar
|
||||
popd
|
||||
# Install pom file if there is one
|
||||
if [ -e "externalpoms/org.eclipse.${J}.pom" ] ; then
|
||||
VER=$(echo $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.${J}_*.jar | sed -e "s/.*${J}_\(.*\)\.jar/\1/")
|
||||
VER=$(echo $RPM_BUILD_ROOT%{_eclipsedir}/plugins/org.eclipse.${J}_*.jar | sed -e "s/.*${J}_\(.*\)\.jar/\1/")
|
||||
sed -i -e "s/@VERSION@/$VER/" externalpoms/org.eclipse.${J}.pom
|
||||
install -m 0644 externalpoms/org.eclipse.${J}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.eclipse-${J}.pom
|
||||
fi
|
||||
@ -817,7 +793,7 @@ done
|
||||
%add_maven_depmap JPP.eclipse-osgi.util.pom eclipse/osgi.util.jar -a "org.eclipse.osgi:util" -f equinox-osgi
|
||||
%add_maven_depmap JPP.eclipse-equinox.http.servlet.pom eclipse/equinox.http.servlet.jar -a "org.eclipse.equinox.http:servlet" -f platform
|
||||
# Maven metadata for SWT (no POM)
|
||||
VER=$(echo $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.swt_*.jar | sed -e "s/.*_\(.*\)\.jar/\1/")
|
||||
VER=$(echo $RPM_BUILD_ROOT%{_eclipsedir}/plugins/org.eclipse.swt_*.jar | sed -e "s/.*_\(.*\)\.jar/\1/")
|
||||
%add_maven_depmap org.eclipse.swt:org.eclipse.swt:$VER swt.jar -a org.eclipse.swt:swt -f swt
|
||||
|
||||
##############
|
||||
@ -837,34 +813,6 @@ unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip -d $
|
||||
cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
|
||||
rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip
|
||||
|
||||
pushd $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/plugins
|
||||
f=`ls | grep -e "^com.google.code.atinject.tck_"`
|
||||
rm -rf $f
|
||||
ln -s $(build-classpath atinject-tck) ${f%.jar}.jar
|
||||
f=`ls | grep -e "^org.apache.commons.fileupload_"`
|
||||
rm -rf $f
|
||||
ln -s $(build-classpath apache-commons-fileupload) ${f%.jar}.jar
|
||||
f=`ls | grep -e "^org.apache.commons.io_"`
|
||||
rm -rf $f
|
||||
ln -s $(build-classpath apache-commons-io) ${f%.jar}.jar
|
||||
f=`ls | grep -e "^org.mockito.mockito-core_"`
|
||||
rm -rf $f
|
||||
ln -s $(build-classpath mockito/mockito-core) ${f%.jar}.jar
|
||||
f=`ls | grep -e "^net.sf.cglib.core_"`
|
||||
rm -rf $f
|
||||
ln -s $(build-classpath cglib/cglib) ${f%.jar}.jar
|
||||
f=`ls | grep -e "^org.objenesis_"`
|
||||
rm -rf $f
|
||||
ln -s $(build-classpath objenesis/objenesis) ${f%.jar}.jar
|
||||
for ham in core library integration ; do
|
||||
f=`ls | grep -e "^org.hamcrest.${ham}_"`
|
||||
rm -rf $f
|
||||
ln -s $(build-classpath hamcrest/${ham}) ${f%.jar}.jar
|
||||
done
|
||||
# These are already present in the platform
|
||||
rm -rf org.junit_*
|
||||
popd
|
||||
|
||||
# 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
|
||||
|
||||
@ -873,11 +821,11 @@ cp -r testbundle-to-eclipse-test $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/tes
|
||||
mv $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle/eclipse-runTestBundles $RPM_BUILD_ROOT/%{_bindir}/eclipse-runTestBundles
|
||||
|
||||
#fix so permissions
|
||||
find $RPM_BUILD_ROOT/%{_libdir}/eclipse -name *.so -exec chmod a+x {} \;
|
||||
find $RPM_BUILD_ROOT/%{_eclipsedir} -name *.so -exec chmod a+x {} \;
|
||||
|
||||
# Usage marker
|
||||
install -d -m 755 %{buildroot}%{_libdir}/eclipse/.pkgs
|
||||
echo "%{version}-%{release}" > %{buildroot}%{_libdir}/eclipse/.pkgs/Distro%{?dist}
|
||||
install -d -m 755 %{buildroot}%{_eclipsedir}/.pkgs
|
||||
echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
|
||||
|
||||
%post platform
|
||||
touch --no-create /usr/share/icons/hicolor
|
||||
@ -892,197 +840,189 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
||||
fi
|
||||
|
||||
%files swt -f .mfiles-swt
|
||||
%{_libdir}/eclipse/plugins/org.eclipse.swt_*
|
||||
%{_libdir}/eclipse/plugins/org.eclipse.swt.gtk.linux.*
|
||||
%{_libdir}/eclipse/swt.jar
|
||||
%{_eclipsedir}/plugins/org.eclipse.swt_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.swt.gtk.linux.*
|
||||
%{_eclipsedir}/swt.jar
|
||||
%{_jnidir}/swt.jar
|
||||
|
||||
%files platform -f .mfiles-platform
|
||||
%{_bindir}/eclipse
|
||||
%{_libdir}/eclipse/.eclipseproduct
|
||||
%{_libdir}/eclipse/.pkgs
|
||||
%config %{_libdir}/%{name}/eclipse.ini
|
||||
%{_eclipsedir}/eclipse
|
||||
%{_eclipsedir}/.eclipseproduct
|
||||
%{_eclipsedir}/.pkgs
|
||||
%config %{_eclipsedir}/eclipse.ini
|
||||
%config %{_sysconfdir}/eclipse.ini
|
||||
/usr/share/applications/*
|
||||
/usr/share/pixmaps/*
|
||||
/usr/share/icons/*/*/apps/*
|
||||
%{_datadir}/appdata/eclipse.appdata.xml
|
||||
%{_libdir}/%{name}/eclipse
|
||||
%dir %{_libdir}/%{name}/configuration/
|
||||
%dir %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/
|
||||
%{_libdir}/%{name}/configuration/config.ini
|
||||
%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
|
||||
%{_libdir}/%{name}/features/org.eclipse.core.runtime.feature_*
|
||||
%{_libdir}/%{name}/features/org.eclipse.e4.rcp_*
|
||||
%{_libdir}/%{name}/features/org.eclipse.equinox.core.feature_*
|
||||
%{_libdir}/%{name}/features/org.eclipse.help_*
|
||||
%{_libdir}/%{name}/features/org.eclipse.platform_*
|
||||
%{_libdir}/%{name}/features/org.eclipse.rcp_*
|
||||
%{_libdir}/%{name}/plugins/com.ibm.icu_*
|
||||
%if 0%{?fedora} >= 24
|
||||
%{_libdir}/%{name}/plugins/com.spatial4j_*
|
||||
%endif
|
||||
%{_libdir}/%{name}/plugins/com.jcraft.jsch_*
|
||||
%{_libdir}/%{name}/plugins/javax.servlet-api_*
|
||||
%{_libdir}/%{name}/plugins/javax.servlet.jsp_*
|
||||
%{_libdir}/%{name}/plugins/javax.xml_*
|
||||
%{_libdir}/%{name}/plugins/javax.el-api_*
|
||||
%{_libdir}/%{name}/plugins/com.sun.el.javax.el_*
|
||||
%{_libdir}/%{name}/plugins/javax.inject_*.jar
|
||||
%{_libdir}/%{name}/plugins/org.apache.*
|
||||
%{_libdir}/%{name}/plugins/org.glassfish.web.javax.servlet.jsp_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ant.core_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.compare_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.compare.core_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.commands_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.beans_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.observable_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.property_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.databinding_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.expressions_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.externaltools_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.jobs_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.net*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.resources_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.runtime_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.variables_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.debug.core_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.debug.ui_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.ds_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.event_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.jetty_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.registry_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.servlet_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.jsp.jasper_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.jsp.jasper.registry_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.help_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.help.base_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.help.ui_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.help.webapp_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.jdt.core.compiler.batch_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.jface_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.jface.databinding_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.jface.text_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.jsch.core_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.jsch.ui_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.platform_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.user_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.search_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.team.core_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.team.ui_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.text_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.browser_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.cheatsheets_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.console_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.editors_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.externaltools_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.forms_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.ide_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.ide.application_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.intro_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.intro.quicklinks_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.intro.universal_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.monitoring_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.navigator_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.navigator.resources_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.net_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.themes_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.views_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.views.properties.tabbed_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.core.commands_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.core.contexts_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.core.di.annotations_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.core.di.extensions_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.core.di_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.core.services_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.emf.xpath_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.bindings_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.core_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.swt.theme_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.swt_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.di_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.dialogs_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.model.workbench_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.services_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.swt.gtk_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.widgets_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.addons.swt_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.renderers.swt_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.swt_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench3_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.jetty.util_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.jetty.server_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.jetty.http_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.jetty.continuation_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.jetty.io_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.jetty.security_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.jetty.servlet_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin.equinox_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_*
|
||||
%{_libdir}/%{name}/features/org.eclipse.equinox.p2.core.feature_*
|
||||
%{_libdir}/%{name}/features/org.eclipse.equinox.p2.extras.feature_*
|
||||
%{_libdir}/%{name}/features/org.eclipse.equinox.p2.rcp.feature_*
|
||||
%{_libdir}/%{name}/features/org.eclipse.equinox.p2.user.ui_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.director_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.core_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.engine_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.jarprocessor_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.metadata_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.metadata.repository_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.artifact.repository_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.touchpoint.natives_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.console_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.operations_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.transport.ecf_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.importexport_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.sdk_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.sdk.scheduler_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.updatechecker_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.garbagecollector_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.directorywatcher_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.publisher_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.publisher.eclipse_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.repository_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.repository.tools_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.reconciler.dropins_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.updatesite_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.security_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.security.ui_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.extensionlocation_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.director.app_*
|
||||
%{_libdir}/%{name}/plugins/org.sat4j.core_*
|
||||
%{_libdir}/%{name}/plugins/org.sat4j.pb_*
|
||||
%{_libdir}/%{name}/plugins/org.tukaani.xz_*
|
||||
%{_libdir}/%{name}/plugins/org.w3c.css.sac_*
|
||||
%{_libdir}/%{name}/plugins/org.w3c.dom.svg_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.app_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.bidi_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.common_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.concurrent_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.console_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.*_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.registry_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.util_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.rcp_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.update.configurator_*
|
||||
%{_libdir}/%{name}/readme
|
||||
%{_libdir}/%{name}/artifacts.xml
|
||||
%{_libdir}/%{name}/p2
|
||||
%dir %{_eclipsedir}/configuration/
|
||||
%dir %{_eclipsedir}/configuration/org.eclipse.equinox.simpleconfigurator/
|
||||
%{_eclipsedir}/configuration/config.ini
|
||||
%{_eclipsedir}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
|
||||
%{_eclipsedir}/features/org.eclipse.core.runtime.feature_*
|
||||
%{_eclipsedir}/features/org.eclipse.e4.rcp_*
|
||||
%{_eclipsedir}/features/org.eclipse.equinox.core.feature_*
|
||||
%{_eclipsedir}/features/org.eclipse.equinox.p2.core.feature_*
|
||||
%{_eclipsedir}/features/org.eclipse.equinox.p2.extras.feature_*
|
||||
%{_eclipsedir}/features/org.eclipse.equinox.p2.rcp.feature_*
|
||||
%{_eclipsedir}/features/org.eclipse.equinox.p2.user.ui_*
|
||||
%{_eclipsedir}/features/org.eclipse.help_*
|
||||
%{_eclipsedir}/features/org.eclipse.platform_*
|
||||
%{_eclipsedir}/features/org.eclipse.rcp_*
|
||||
%{_eclipsedir}/plugins/com.ibm.icu_*
|
||||
%{_eclipsedir}/plugins/com.jcraft.jsch_*
|
||||
%{_eclipsedir}/plugins/com.sun.el.javax.el_*
|
||||
%{_eclipsedir}/plugins/javax.*
|
||||
%{_eclipsedir}/plugins/org.apache.*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ant.core_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.compare_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.compare.core_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.core.commands_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.core.contenttype_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.core.databinding.beans_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.core.databinding.observable_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.core.databinding.property_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.core.databinding_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.core.expressions_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.core.externaltools_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.core.filebuffers_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.core.filesystem*
|
||||
%{_eclipsedir}/plugins/org.eclipse.core.jobs_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.core.net*
|
||||
%{_eclipsedir}/plugins/org.eclipse.core.resources_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.core.runtime_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.core.variables_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.debug.core_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.debug.ui_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.core.commands_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.core.contexts_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.core.di_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.core.di.annotations_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.core.di.extensions_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.core.di.extensions.supplier_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.core.services_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.emf.xpath_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.ui.bindings_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.ui.css.core_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.ui.css.swt_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.ui.css.swt.theme_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.ui.di_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.ui.dialogs_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.ui.model.workbench_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.ui.services_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.ui.swt.gtk_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.ui.widgets_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.ui.workbench_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.ui.workbench3_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.ui.workbench.addons.swt_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.ui.workbench.renderers.swt_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.e4.ui.workbench.swt_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.app_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.bidi_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.common_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.concurrent_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.console_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.ds_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.event_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.frameworkadmin_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.frameworkadmin.equinox_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.http.jetty_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.http.registry_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.http.servlet_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.jsp.jasper_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.jsp.jasper.registry_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.launcher_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.launcher.gtk.linux.*_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.artifact.repository_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.console_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.core_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.director_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.director.app_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.directorywatcher_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.engine_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.extensionlocation_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.garbagecollector_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.jarprocessor_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.metadata_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.metadata.repository_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.operations_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.publisher_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.publisher.eclipse_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.reconciler.dropins_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.repository_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.repository.tools_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.touchpoint.natives_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.transport.ecf_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.ui_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.ui.importexport_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.ui.sdk_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.ui.sdk.scheduler_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.updatechecker_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.updatesite_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.preferences_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.registry_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.security_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.security.ui_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.simpleconfigurator_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.equinox.util_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.help_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.help.base_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.help.ui_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.help.webapp_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.jdt.core.compiler.batch_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.jetty.*
|
||||
%{_eclipsedir}/plugins/org.eclipse.jface_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.jface.databinding_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.jface.text_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.jsch.core_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.jsch.ui_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ltk.core.refactoring_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ltk.ui.refactoring_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.platform_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.platform.doc.user_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.rcp_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.search_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.team.core_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.team.genericeditor.diff.extension_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.team.ui_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.text_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.browser_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.cheatsheets_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.console_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.editors_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.externaltools_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.forms_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.genericeditor_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.ide_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.ide.application_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.intro_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.intro.quicklinks_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.intro.universal_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.monitoring_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.navigator_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.navigator.resources_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.net_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.themes_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.views_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.views.properties.tabbed_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.workbench_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.ui.workbench.texteditor_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.update.configurator_*
|
||||
%{_eclipsedir}/plugins/org.glassfish.web.javax.servlet.jsp_*
|
||||
%{_eclipsedir}/plugins/org.kxml2_*
|
||||
%{_eclipsedir}/plugins/org.sat4j.core_*
|
||||
%{_eclipsedir}/plugins/org.sat4j.pb_*
|
||||
%{_eclipsedir}/plugins/org.tukaani.xz_*
|
||||
%{_eclipsedir}/plugins/org.w3c.css.sac_*
|
||||
%{_eclipsedir}/plugins/org.w3c.dom.svg_*
|
||||
%{_eclipsedir}/plugins/org.xmlpull_*
|
||||
%doc %{_eclipsedir}/readme
|
||||
%{_eclipsedir}/artifacts.xml
|
||||
%{_eclipsedir}/p2
|
||||
%{_javadir}/%{name}/core*
|
||||
%{_javadir}/%{name}/equinox*
|
||||
|
||||
@ -1101,12 +1041,17 @@ fi
|
||||
%{_datadir}/java/eclipse-testing
|
||||
|
||||
%files equinox-osgi -f .mfiles-equinox-osgi
|
||||
%{_libdir}/eclipse/plugins/org.eclipse.osgi_*
|
||||
%{_libdir}/eclipse/plugins/org.eclipse.osgi.services_*
|
||||
%{_libdir}/eclipse/plugins/org.eclipse.osgi.util_*
|
||||
%{_libdir}/eclipse/plugins/org.eclipse.osgi.compatibility.state_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.osgi_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.osgi.compatibility.state_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.osgi.services_*
|
||||
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
|
||||
|
||||
%changelog
|
||||
* Tue Apr 04 2017 Mat Booth <mat.booth@redhat.com> - 1:4.7.0-0.1
|
||||
- Update to Oxygen I-build
|
||||
- Don't build unsupported GTK2 backend for SWT
|
||||
- Move installation to a multilib agnostic location /usr/lib
|
||||
|
||||
* Mon Apr 03 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.3-3
|
||||
- Build missing remote ant support jar
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
|
||||
TAG=S4_6_3_RC4
|
||||
TAG=I20170404-0245
|
||||
|
||||
rm -rf R4_platform-aggregator-$TAG
|
||||
rm -rf R4_platform-aggregator-$TAG.tar.xz
|
||||
|
Loading…
Reference in New Issue
Block a user