Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
Mat Booth | 11e00ac121 | |
Mat Booth | 2f43c77f3b | |
Mat Booth | 20c60e8d38 | |
Sami Wagiaalla | f8da45cbfc |
|
@ -41,7 +41,7 @@ index 5a15c5b..d4fb54e 100644
|
|||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/carbon/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/carbon/" target="build_eclipse"/>
|
||||
+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/carbon/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/carbon/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
|
@ -105,7 +105,7 @@ index 59f46ae..e7616ed 100644
|
|||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
|
||||
+ <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>
|
||||
|
@ -169,7 +169,7 @@ index d639b6e..8bf7d74 100644
|
|||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
|
||||
+ <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>
|
||||
|
@ -234,7 +234,7 @@ index e0b59be..f82005c 100644
|
|||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/win32/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/win32/" target="build_eclipse"/>
|
||||
+ <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>
|
||||
|
@ -299,7 +299,7 @@ index ce4252c..4b72b1f 100644
|
|||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/win32/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/win32/" target="build_eclipse"/>
|
||||
+ <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>
|
||||
|
@ -364,7 +364,7 @@ index ce4252c..4b72b1f 100644
|
|||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
|
||||
+ <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>
|
||||
|
@ -429,7 +429,7 @@ index ce4252c..4b72b1f 100644
|
|||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
|
||||
+ <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>
|
||||
|
@ -494,7 +494,7 @@ index ce4252c..4b72b1f 100644
|
|||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
|
||||
+ <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>
|
||||
|
@ -559,7 +559,7 @@ index ce4252c..4b72b1f 100644
|
|||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
|
||||
+ <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>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml.bak 2012-08-28 09:35:00.000000000 +0200
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml 2012-08-28 10:02:35.739112336 +0200
|
||||
@@ -80,7 +80,7 @@
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml.orig 2014-03-12 10:25:46.000000000 +0000
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml 2014-03-12 12:17:01.623708316 +0000
|
||||
@@ -46,7 +46,7 @@
|
||||
<profile>SDKProfile</profile>
|
||||
<products>
|
||||
<product>
|
||||
|
@ -9,37 +9,37 @@
|
|||
<rootFolder>eclipse</rootFolder>
|
||||
</product>
|
||||
</products>
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product.bak 2012-08-28 10:04:10.214701605 +0200
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product 2012-08-28 10:04:29.568822865 +0200
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product.orig 2014-03-12 12:17:01.624708315 +0000
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product 2014-03-12 12:54:18.543754231 +0000
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?pde version="3.5"?>
|
||||
|
||||
-<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.1.qualifier" useFeatures="true" includeLaunchers="true">
|
||||
+<product uid="org.fedoraproject.eclipse.platform" name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.1.qualifier" useFeatures="true" includeLaunchers="true">
|
||||
-<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.2.qualifier" useFeatures="true" includeLaunchers="true">
|
||||
+<product name="Eclipse Platform" uid="org.fedoraproject.eclipse.platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.2.qualifier" useFeatures="true" includeLaunchers="true">
|
||||
|
||||
<configIni use="default">
|
||||
</configIni>
|
||||
@@ -161,6 +161,7 @@
|
||||
<feature id="org.eclipse.rcp.configuration" />
|
||||
<feature id="org.eclipse.rcp.configuration"/>
|
||||
<feature id="org.eclipse.platform"/>
|
||||
<feature id="org.eclipse.equinox.p2.user.ui"/>
|
||||
+ <feature id="org.eclipse.cvs"/>
|
||||
</features>
|
||||
|
||||
<configurations>
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/pom.xml.bak 2012-12-17 15:03:11.000000000 +0100
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml 2012-12-18 10:32:35.835825807 +0100
|
||||
@@ -37,5 +37,6 @@
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/pom.xml.orig 2014-03-12 10:25:46.000000000 +0000
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml 2014-03-12 12:17:01.625708314 +0000
|
||||
@@ -34,5 +34,6 @@
|
||||
<module>osgistarter.config.launcher</module>
|
||||
<module>equinox.starterkit.product</module>
|
||||
<module>eclipse-junit-tests</module>
|
||||
+ <module>jdtpde</module>
|
||||
</modules>
|
||||
</project>
|
||||
--- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml.bak 2012-07-25 17:26:52.000000000 +0200
|
||||
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 2012-09-10 10:46:53.027809695 +0200
|
||||
@@ -548,4 +548,10 @@
|
||||
--- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml.orig 2014-03-12 12:17:01.625708314 +0000
|
||||
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 2014-03-12 12:58:21.458878371 +0000
|
||||
@@ -566,4 +566,10 @@
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
|
@ -50,4 +50,3 @@
|
|||
+ version="0.0.0"
|
||||
+ unpack="false"/>
|
||||
</feature>
|
||||
\ No newline at end of file
|
|
@ -1,6 +1,6 @@
|
|||
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.bak 2012-10-01 11:32:20.000000000 +0200
|
||||
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 2012-11-08 08:23:51.329134354 +0100
|
||||
@@ -106,7 +106,7 @@
|
||||
--- "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
|
||||
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
-DSWT_VERSION=$(SWT_VERSION) \
|
||||
$(NATIVE_STATS) \
|
||||
-DLINUX -DGTK \
|
||||
@@ -116,12 +116,6 @@
|
||||
@@ -125,12 +125,6 @@
|
||||
${SWT_PTR_CFLAGS}
|
||||
LFLAGS = -shared -fPIC ${SWT_LFLAGS}
|
||||
|
||||
|
@ -22,8 +22,8 @@
|
|||
all: make_swt make_atk make_glx make_webkit
|
||||
|
||||
#
|
||||
--- rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/make_linux.mak.bak 2013-01-28 12:36:24.000000000 +0100
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/make_linux.mak 2013-01-28 14:56:12.349192612 +0100
|
||||
--- 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 @@
|
||||
-DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \
|
||||
-DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
|
||||
|
|
|
@ -3,7 +3,7 @@ diff -r -Nu eclipse-3.8.0-M1-src/features/org.eclipse.help/feature.xml eclipse-3
|
|||
+++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2011-08-23 14:01:19.026328809 -0400
|
||||
@@ -36,7 +36,7 @@
|
||||
unpack="false"/>
|
||||
|
||||
|
||||
<plugin
|
||||
- id="com.sun.el"
|
||||
+ id="javax.el"
|
||||
|
|
|
@ -116,12 +116,11 @@
|
|||
</execution>
|
||||
--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.bak 2013-03-14 11:18:11.000000000 +0100
|
||||
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2013-03-14 12:57:12.344569351 +0100
|
||||
@@ -77,6 +77,13 @@
|
||||
@@ -76,6 +76,12 @@
|
||||
<plugin id="org.eclipse.update.core.linux"/>
|
||||
<plugin id="org.eclipse.update.core.win32"/>
|
||||
<plugin id="org.eclipse.equinox.security.macosx"/>
|
||||
<plugin id="org.eclipse.equinox.security.macosx"/>
|
||||
+
|
||||
+
|
||||
+
|
||||
+ <plugin id="com.jcraft.jsch"/>
|
||||
+ <plugin id="org.apache.ant"/>
|
||||
+ <plugin id="org.eclipse.core.filesystem.linux.arm"/>
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
--- eclipse-platform-parent/pom.xml.orig 2014-03-13 11:09:45.344247777 +0000
|
||||
+++ eclipse-platform-parent/pom.xml 2014-03-13 11:09:57.979242733 +0000
|
||||
@@ -146,13 +146,6 @@
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>target-platform-configuration</artifactId>
|
||||
<configuration>
|
||||
- <target>
|
||||
- <artifact>
|
||||
- <groupId>org.eclipse</groupId>
|
||||
- <artifactId>eclipse-sdk-prereqs</artifactId>
|
||||
- <version>4.3.0-SNAPSHOT</version>
|
||||
- </artifact>
|
||||
- </target>
|
||||
<environments>
|
||||
<environment>
|
||||
<os>linux</os>
|
|
@ -1,6 +1,6 @@
|
|||
--- eclipse-platform-parent/pom.xml.orig 2013-03-14 11:05:42.000000000 +0100
|
||||
+++ eclipse-platform-parent/pom.xml 2013-03-14 13:11:05.104112979 +0100
|
||||
@@ -289,7 +289,7 @@
|
||||
--- eclipse-platform-parent/pom.xml.orig 2014-03-12 10:25:46.000000000 +0000
|
||||
+++ eclipse-platform-parent/pom.xml 2014-03-12 12:12:56.387914854 +0000
|
||||
@@ -308,7 +308,7 @@
|
||||
<artifactId>tycho-packaging-plugin</artifactId>
|
||||
<version>${tycho.version}</version>
|
||||
<dependencies>
|
||||
|
@ -9,7 +9,7 @@
|
|||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-buildtimestamp-jgit</artifactId>
|
||||
<version>${tycho-extras.version}</version>
|
||||
@@ -280,18 +280,18 @@
|
||||
@@ -317,19 +317,19 @@
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-sourceref-jgit</artifactId>
|
||||
<version>${tycho-extras.version}</version>
|
||||
|
@ -24,6 +24,7 @@
|
|||
<jgit.ignore>
|
||||
pom.xml
|
||||
</jgit.ignore>
|
||||
<jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree>
|
||||
- <sourceReferences>
|
||||
+ <!--sourceReferences>
|
||||
<generate>true</generate>
|
||||
|
|
|
@ -1,89 +1,87 @@
|
|||
--- eclipse.platform.swt.binaries/pom.xml.bak 2012-10-18 11:29:03.000000000 +0200
|
||||
+++ eclipse.platform.swt.binaries/pom.xml 2012-10-18 11:39:42.523524920 +0200
|
||||
@@ -41,6 +41,7 @@
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.s390</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.arm</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.gtk.solaris.sparc</module>
|
||||
--- eclipse.platform.team/pom.xml.bak 2012-10-18 11:29:03.000000000 +0200
|
||||
+++ eclipse.platform.team/pom.xml 2012-10-18 11:43:17.422081348 +0200
|
||||
@@ -49,6 +49,11 @@
|
||||
<module>features/org.eclipse.cvs-feature</module>
|
||||
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
|
||||
index 6c567f8..969eafb 100644
|
||||
--- a/eclipse-platform-parent/pom.xml
|
||||
+++ b/eclipse-platform-parent/pom.xml
|
||||
@@ -205,29 +205,9 @@
|
||||
<arch>x86_64</arch>
|
||||
</environment>
|
||||
<environment>
|
||||
- <os>solaris</os>
|
||||
+ <os>linux</os>
|
||||
<ws>gtk</ws>
|
||||
- <arch>sparc</arch>
|
||||
- </environment>
|
||||
- <environment>
|
||||
- <os>solaris</os>
|
||||
- <ws>gtk</ws>
|
||||
- <arch>x86</arch>
|
||||
- </environment>
|
||||
- <environment>
|
||||
- <os>hpux</os>
|
||||
- <ws>gtk</ws>
|
||||
- <arch>ia64</arch>
|
||||
- </environment>
|
||||
- <environment>
|
||||
- <os>aix</os>
|
||||
- <ws>gtk</ws>
|
||||
- <arch>ppc</arch>
|
||||
- </environment>
|
||||
- <environment>
|
||||
- <os>aix</os>
|
||||
- <ws>gtk</ws>
|
||||
- <arch>ppc64</arch>
|
||||
+ <arch>arm</arch>
|
||||
</environment>
|
||||
</environments>
|
||||
</configuration>
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
|
||||
index 80a32e4..85de879 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
|
||||
@@ -27,6 +27,8 @@ root.solaris.gtk.sparc.permissions.755=eclipse
|
||||
root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
|
||||
root.solaris.gtk.x86.permissions.755=eclipse
|
||||
|
||||
<!-- creatively located fragments -->
|
||||
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.arm</module>
|
||||
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.ppc</module>
|
||||
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.ppc64</module>
|
||||
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.s390</module>
|
||||
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.s390x</module>
|
||||
<module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86</module>
|
||||
<module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64</module>
|
||||
<module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86</module>
|
||||
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.bak 2012-10-19 14:53:13.000000000 +0200
|
||||
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2012-10-22 19:45:57.425680855 +0200
|
||||
@@ -409,6 +409,26 @@
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
fragment="true"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.equinox.launcher.gtk.linux.ppc"
|
||||
+ os="linux"
|
||||
+ ws="gtk"
|
||||
+ arch="ppc"
|
||||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
+ fragment="true"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.equinox.launcher.gtk.linux.arm"
|
||||
+ os="linux"
|
||||
+ ws="gtk"
|
||||
+ arch="arm"
|
||||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
+ fragment="true"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.equinox.launcher.gtk.linux.x86"
|
||||
@@ -582,6 +602,29 @@
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
+ fragment="true"
|
||||
+ unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.swt.gtk.linux.ppc"
|
||||
+ os="linux"
|
||||
+ ws="gtk"
|
||||
+ arch="ppc"
|
||||
+ 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"
|
||||
+ arch="arm"
|
||||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
|
||||
--- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml.bak 2012-10-19 14:53:13.000000000 +0200
|
||||
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 2012-10-22 19:52:12.985023364 +0200
|
||||
@@ -135,8 +135,56 @@
|
||||
+root.linux.gtk.arm=target/resources/linux.gtk.arm,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/arm
|
||||
+root.linux.gtk.arm.permissions.755=eclipse
|
||||
root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
|
||||
root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse
|
||||
root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
|
||||
index bb03da8..257d417 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
|
||||
@@ -19,6 +19,25 @@
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<version>2.6</version>
|
||||
<executions>
|
||||
+ <execution>
|
||||
+ <id>copy-resources-gtk.linux.arm</id>
|
||||
+ <phase>validate</phase>
|
||||
+ <goals>
|
||||
+ <goal>copy-resources</goal>
|
||||
+ </goals>
|
||||
+ <configuration>
|
||||
+ <outputDirectory>${basedir}/target/resources/linux.gtk.arm</outputDirectory>
|
||||
+ <resources>
|
||||
+ <resource>
|
||||
+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.arm</directory>
|
||||
+ <includes>
|
||||
+ <include>about_files/*</include>
|
||||
+ <include>about.html</include>
|
||||
+ </includes>
|
||||
+ </resource>
|
||||
+ </resources>
|
||||
+ </configuration>
|
||||
+ </execution>
|
||||
<execution>
|
||||
<id>copy-resources-gtk.linux.x86</id>
|
||||
<phase>validate</phase>
|
||||
diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
|
||||
index 03bf359..3acacc2 100644
|
||||
--- a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
|
||||
+++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
|
||||
@@ -134,8 +134,56 @@
|
||||
version="0.0.0"
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
|
@ -140,11 +138,10 @@
|
|||
id="org.eclipse.core.resources"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -396,7 +426,54 @@
|
||||
@@ -405,6 +462,53 @@
|
||||
version="0.0.0"
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
-
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.core.filesystem.linux.ppc"
|
||||
|
@ -192,18 +189,168 @@
|
|||
+ version="0.0.0"
|
||||
+ fragment="true"
|
||||
+ unpack="false"/>
|
||||
+
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.core.filesystem.linux.x86_64"
|
||||
os="linux"
|
||||
--- rt.equinox.framework/bundles/org.eclipse.equinox.executable/pom.xml.bak 2012-10-22 20:39:19.000000000 +0200
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.executable/pom.xml 2012-10-23 09:40:57.205750700 +0200
|
||||
@@ -132,6 +132,170 @@
|
||||
diff --git a/eclipse.platform.resources/pom.xml b/eclipse.platform.resources/pom.xml
|
||||
index 4b33285..f522167 100644
|
||||
--- a/eclipse.platform.resources/pom.xml
|
||||
+++ b/eclipse.platform.resources/pom.xml
|
||||
@@ -43,6 +43,9 @@
|
||||
|
||||
<modules>
|
||||
<module>bundles/org.eclipse.core.filesystem</module>
|
||||
+ <module>bundles/org.eclipse.core.filesystem.linux.arm</module>
|
||||
+ <module>bundles/org.eclipse.core.filesystem.linux.s390</module>
|
||||
+ <module>bundles/org.eclipse.core.filesystem.linux.s390x</module>
|
||||
<module>bundles/org.eclipse.core.filesystem.hpux.ia64</module>
|
||||
<module>bundles/org.eclipse.core.filesystem.hpux.PA_RISC</module>
|
||||
<module>bundles/org.eclipse.core.filesystem.linux.ppc</module>
|
||||
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
|
||||
index 7dd0536..66d79ee 100644
|
||||
--- a/eclipse.platform.swt.binaries/pom.xml
|
||||
+++ b/eclipse.platform.swt.binaries/pom.xml
|
||||
@@ -53,6 +53,7 @@
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.s390</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.arm</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.gtk.solaris.sparc</module>
|
||||
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
|
||||
index 689616e..4caf0a9 100644
|
||||
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
|
||||
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
|
||||
@@ -411,7 +411,7 @@ esac
|
||||
|
||||
|
||||
# For 64-bit CPUs, we have a switch
|
||||
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64' -o ${MODEL} = 's390x' ]; then
|
||||
+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64' -o ${MODEL} = 's390x' -o ${MODEL} = 'aarch64' ]; then
|
||||
SWT_PTR_CFLAGS=-DJNI64
|
||||
if [ -d /lib64 ]; then
|
||||
XLIB64=-L/usr/X11R6/lib64
|
||||
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
|
||||
index f5fb504..1187e84 100644
|
||||
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
|
||||
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
|
||||
@@ -429,6 +429,7 @@
|
||||
<equals arg1="${swt.arch}" arg2="ia64"/>
|
||||
<equals arg1="${swt.arch}" arg2="ppc64"/>
|
||||
<equals arg1="${swt.arch}" arg2="s390x"/>
|
||||
+ <equals arg1="${swt.arch}" arg2="aarch64"/>
|
||||
</or>
|
||||
</condition>
|
||||
<echo>Is64=${is64}</echo>
|
||||
diff --git a/eclipse.platform.team/pom.xml b/eclipse.platform.team/pom.xml
|
||||
index 8637ed3..e36538a 100644
|
||||
--- a/eclipse.platform.team/pom.xml
|
||||
+++ b/eclipse.platform.team/pom.xml
|
||||
@@ -63,6 +63,11 @@
|
||||
<module>features/org.eclipse.cvs-feature</module>
|
||||
|
||||
<!-- creatively located fragments -->
|
||||
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.arm</module>
|
||||
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.ppc</module>
|
||||
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.ppc64</module>
|
||||
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.s390</module>
|
||||
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.s390x</module>
|
||||
<module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86</module>
|
||||
<module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64</module>
|
||||
<module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86</module>
|
||||
diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
index 7e1f520..734dd10 100644
|
||||
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
@@ -420,6 +420,26 @@
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
fragment="true"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.equinox.launcher.gtk.linux.ppc"
|
||||
+ os="linux"
|
||||
+ ws="gtk"
|
||||
+ arch="ppc"
|
||||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
+ fragment="true"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.equinox.launcher.gtk.linux.arm"
|
||||
+ os="linux"
|
||||
+ ws="gtk"
|
||||
+ arch="arm"
|
||||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
+ fragment="true"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.equinox.launcher.gtk.linux.x86"
|
||||
@@ -584,6 +614,29 @@
|
||||
version="0.0.0"
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.swt.gtk.linux.ppc"
|
||||
+ os="linux"
|
||||
+ ws="gtk"
|
||||
+ arch="ppc"
|
||||
+ 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"
|
||||
+ arch="arm"
|
||||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
+ fragment="true"
|
||||
+ unpack="false"/>
|
||||
|
||||
<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 +119,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}>"
|
||||
;;
|
||||
diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
|
||||
index fac13bf..e487001 100644
|
||||
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
|
||||
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
|
||||
@@ -207,6 +207,221 @@
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
+
|
||||
+ <profile>
|
||||
+
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.ppc</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
|
@ -256,8 +403,7 @@
|
|||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+
|
||||
+ <profile>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.ppc64</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
|
@ -310,9 +456,8 @@
|
|||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+
|
||||
+
|
||||
+ <profile>
|
||||
+
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.arm</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
|
@ -365,73 +510,68 @@
|
|||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+
|
||||
+ <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="build.xml" dir="library/gtk/" />
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ <dependencies>
|
||||
+ <dependency>
|
||||
+ <groupId>bsf</groupId>
|
||||
+ <artifactId>bsf</artifactId>
|
||||
+ <version>2.4.0</version>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>rhino</groupId>
|
||||
+ <artifactId>js</artifactId>
|
||||
+ <version>1.7R2</version>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>org.apache.ant</groupId>
|
||||
+ <artifactId>ant-apache-bsf</artifactId>
|
||||
+ <version>1.8.3</version>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>org.apache.ant</groupId>
|
||||
+ <artifactId>ant-nodeps</artifactId>
|
||||
+ <version>1.8.1</version>
|
||||
+ </dependency>
|
||||
+ </dependencies>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+
|
||||
<profile>
|
||||
<id>build-native-launchers-win32.win32.x86_64</id>
|
||||
<activation>
|
||||
--- rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/build.sh.bak 2012-11-20 07:45:12.580081610 -0500
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/build.sh 2012-11-20 07:49:33.792018170 -0500
|
||||
@@ -94,6 +94,11 @@
|
||||
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"
|
||||
+ ;;
|
||||
*)
|
||||
echo "*** Unknown MODEL <${MODEL}>"
|
||||
;;
|
||||
--- eclipse.platform.resources/pom.xml.orig 2013-01-28 12:13:43.000000000 +0100
|
||||
+++ eclipse.platform.resources/pom.xml 2013-01-28 14:23:18.394863232 +0100
|
||||
@@ -33,6 +33,9 @@
|
||||
|
||||
<modules>
|
||||
<module>bundles/org.eclipse.core.filesystem</module>
|
||||
+ <module>bundles/org.eclipse.core.filesystem.linux.arm</module>
|
||||
+ <module>bundles/org.eclipse.core.filesystem.linux.s390</module>
|
||||
+ <module>bundles/org.eclipse.core.filesystem.linux.s390x</module>
|
||||
<module>bundles/org.eclipse.core.filesystem.hpux.ia64</module>
|
||||
<module>bundles/org.eclipse.core.filesystem.hpux.PA_RISC</module>
|
||||
<module>bundles/org.eclipse.core.filesystem.linux.ppc</module>
|
||||
--- eclipse-platform-parent/pom.xml.orig 2013-01-28 14:28:39.000000000 +0100
|
||||
+++ eclipse-platform-parent/pom.xml 2013-01-28 14:31:16.528302907 +0100
|
||||
@@ -151,29 +151,9 @@
|
||||
<arch>x86_64</arch>
|
||||
</environment>
|
||||
<environment>
|
||||
- <os>solaris</os>
|
||||
+ <os>linux</os>
|
||||
<ws>gtk</ws>
|
||||
- <arch>sparc</arch>
|
||||
- </environment>
|
||||
- <environment>
|
||||
- <os>solaris</os>
|
||||
- <ws>gtk</ws>
|
||||
- <arch>x86</arch>
|
||||
- </environment>
|
||||
- <environment>
|
||||
- <os>hpux</os>
|
||||
- <ws>gtk</ws>
|
||||
- <arch>ia64</arch>
|
||||
- </environment>
|
||||
- <environment>
|
||||
- <os>aix</os>
|
||||
- <ws>gtk</ws>
|
||||
- <arch>ppc</arch>
|
||||
- </environment>
|
||||
- <environment>
|
||||
- <os>aix</os>
|
||||
- <ws>gtk</ws>
|
||||
- <arch>ppc64</arch>
|
||||
+ <arch>arm</arch>
|
||||
</environment>
|
||||
</environments>
|
||||
</configuration>
|
||||
--- rt.equinox.framework/pom.xml.orig 2013-01-28 12:36:24.000000000 +0100
|
||||
+++ rt.equinox.framework/pom.xml 2013-01-28 14:33:58.089470923 +0100
|
||||
@@ -45,6 +45,7 @@
|
||||
diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
|
||||
index b46cdc6..0fb36a5 100644
|
||||
--- a/rt.equinox.framework/pom.xml
|
||||
+++ b/rt.equinox.framework/pom.xml
|
||||
@@ -53,6 +53,7 @@
|
||||
<module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module>
|
||||
<module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module>
|
||||
<module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64</module>
|
||||
|
@ -439,43 +579,3 @@
|
|||
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc</module>
|
||||
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
|
||||
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390</module>
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties.orig 2013-01-28 11:57:49.000000000 +0100
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties 2013-01-28 14:42:17.165096616 +0100
|
||||
@@ -25,6 +25,8 @@
|
||||
root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
|
||||
root.solaris.gtk.x86.permissions.755=eclipse
|
||||
|
||||
+root.linux.gtk.arm=target/resources/linux.gtk.arm,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/arm
|
||||
+root.linux.gtk.arm.permissions.755=eclipse
|
||||
root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
|
||||
root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse
|
||||
root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml.bak 2013-01-28 11:57:49.000000000 +0100
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml 2013-01-28 14:50:06.674520657 +0100
|
||||
@@ -21,6 +21,25 @@
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<version>2.6</version>
|
||||
<executions>
|
||||
+ <execution>
|
||||
+ <id>copy-resources-gtk.linux.arm</id>
|
||||
+ <phase>validate</phase>
|
||||
+ <goals>
|
||||
+ <goal>copy-resources</goal>
|
||||
+ </goals>
|
||||
+ <configuration>
|
||||
+ <outputDirectory>${basedir}/target/resources/linux.gtk.arm</outputDirectory>
|
||||
+ <resources>
|
||||
+ <resource>
|
||||
+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.arm</directory>
|
||||
+ <includes>
|
||||
+ <include>about_files/*</include>
|
||||
+ <include>about.html</include>
|
||||
+ </includes>
|
||||
+ </resource>
|
||||
+ </resources>
|
||||
+ </configuration>
|
||||
+ </execution>
|
||||
<execution>
|
||||
<id>copy-resources-gtk.linux.x86</id>
|
||||
<phase>validate</phase>
|
||||
|
||||
|
|
35
eclipse.spec
35
eclipse.spec
|
@ -7,10 +7,10 @@ Epoch: 1
|
|||
%global eclipse_major 4
|
||||
%global eclipse_minor 3
|
||||
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
|
||||
%global eclipse_micro 1
|
||||
%global eclipse_micro 2
|
||||
%global initialize 1
|
||||
%global eb_commit 79dfa1abc0ba06375b42d0015c7f0ceb3759eb5b
|
||||
%global eclipse_tag R4_3_1
|
||||
%global eclipse_tag R4_3_2
|
||||
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
|
||||
%global installation_loc %{_libdir}/%{pkg_name}
|
||||
|
||||
|
@ -51,7 +51,7 @@ fi;
|
|||
Summary: An open, extensible IDE
|
||||
Name: %{?scl_prefix}eclipse
|
||||
Version: %{eclipse_version}
|
||||
Release: 11%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: EPL
|
||||
Group: Development/Tools
|
||||
URL: http://www.eclipse.org/
|
||||
|
@ -125,6 +125,8 @@ Patch27: %{pkg_name}-bug-408505.patch
|
|||
|
||||
Patch29: %{pkg_name}-bug-386377.patch
|
||||
|
||||
Patch30: %{pkg_name}-no-target-platform.patch
|
||||
|
||||
BuildRequires: ant >= 1.8.3
|
||||
BuildRequires: rsync
|
||||
BuildRequires: jpackage-utils >= 0:1.5, make, gcc
|
||||
|
@ -177,8 +179,8 @@ BuildRequires: xml-commons-apis >= 1.4.01-12
|
|||
BuildRequires: atinject >= 1-6
|
||||
BuildRequires: tycho >= 0.16
|
||||
BuildRequires: tycho-extras >= 0.16
|
||||
BuildRequires: eclipse-emf-core >= 1:2.9.0-1
|
||||
BuildRequires: %{?scl_prefix}eclipse-ecf-core >= 3.6.0-2
|
||||
BuildRequires: eclipse-emf-core >= 1:2.9.2-1
|
||||
BuildRequires: %{?scl_prefix}eclipse-ecf-core >= 3.8.0-1
|
||||
BuildRequires: tomcat-servlet-3.0-api
|
||||
BuildRequires: tomcat-el-2.2-api
|
||||
BuildRequires: glassfish-jsp-api >= 2.2.1-4
|
||||
|
@ -196,6 +198,7 @@ BuildRequires: eclipse-pde
|
|||
%if 0%{?rhel} >= 6
|
||||
ExclusiveArch: %{ix86} x86_64
|
||||
%endif
|
||||
BuildRequires: eclipse-license
|
||||
|
||||
%description
|
||||
The Eclipse platform is designed for building integrated development
|
||||
|
@ -255,8 +258,8 @@ Requires: xml-commons-apis >= 1.4.01-12
|
|||
Requires: batik >= 1.8
|
||||
Requires: atinject >= 1-6
|
||||
Requires: geronimo-annotation >= 1.0-7
|
||||
Requires: %{?scl_prefix}eclipse-ecf-core >= 3.6.0-2
|
||||
Requires: eclipse-emf-core >= 2.9.0-1
|
||||
Requires: %{?scl_prefix}eclipse-ecf-core >= 3.8.0-1
|
||||
Requires: eclipse-emf-core >= 2.9.2-1
|
||||
Requires: tomcat-servlet-3.0-api
|
||||
Requires: tomcat-el-2.2-api
|
||||
Requires: glassfish-jsp-api >= 2.2.1-4
|
||||
|
@ -338,7 +341,7 @@ tar --strip-components=1 -xf %{SOURCE1}
|
|||
%patch10
|
||||
%patch11
|
||||
%patch14
|
||||
%patch17
|
||||
%patch17 -p1
|
||||
%patch18
|
||||
%patch20
|
||||
%patch21
|
||||
|
@ -350,6 +353,7 @@ tar --strip-components=1 -xf %{SOURCE1}
|
|||
pushd rt.equinox.framework
|
||||
%patch29 -p1
|
||||
popd
|
||||
%patch30
|
||||
|
||||
#Disable as many things as possible to make the build faster. We care only for Eclipse.
|
||||
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
|
||||
|
@ -464,6 +468,7 @@ done
|
|||
#fake dependencies that don't exist in fedora
|
||||
./dependencies/./fake_ant_dependency.sh .m2/p2/repo-sdk/plugins/org.apache.ant_* /usr/share/java /usr/bin -makejar
|
||||
|
||||
cp -r /usr/share/java/eclipse-license/eclipse/features/* .m2/p2/repo-sdk/features/
|
||||
cp -r /usr/share/java/emf/eclipse/features/* .m2/p2/repo-sdk/features/
|
||||
%{?scl: cp %{_javadir}/ecf/eclipse/plugins/* .m2/p2/repo-sdk/plugins}
|
||||
%{?scl: cp %{_javadir}/*sat4j* .m2/p2/repo-sdk/plugins}
|
||||
|
@ -488,7 +493,7 @@ sed -i -e 's@Dhelp.lucene.tokenizer=standard@XX:MaxPermSize=384M@g' eclipse.plat
|
|||
%build
|
||||
%{?scl:%scl_maven_opts}
|
||||
#This is the lowest value where the build succeeds. 512m is not enough.
|
||||
export MAVEN_OPTS="-Xmx900m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
|
||||
export MAVEN_OPTS="-Xmx1000m -XX:MaxPermSize=256m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
|
||||
export JAVA_HOME=%{java_home}
|
||||
|
||||
pushd eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{eclipse_arch}
|
||||
|
@ -1029,6 +1034,18 @@ fi
|
|||
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
|
||||
|
||||
%changelog
|
||||
* Mon Mar 24 2014 Mat Booth <fedora@matbooth.co.uk> - 1:4.3.2-3
|
||||
- Fix BR/R on eclipse-ecf-core.
|
||||
|
||||
* Thu Mar 20 2014 Mat Booth <fedora@matbooth.co.uk> - 1:4.3.2-2
|
||||
- Rebuild p2 metadata.
|
||||
|
||||
* Wed Mar 12 2014 Mat Booth <fedora@matbooth.co.uk> - 1:4.3.2-1
|
||||
- Update to 4.3.2
|
||||
|
||||
* Thu Jan 30 2014 Sami Wagiaalla <swagiaal@redhat.com> - 1:4.3.1-12
|
||||
- Increase JVM stack size for Maven. Fixes bz 1059816.
|
||||
|
||||
* Mon Nov 4 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.1-11
|
||||
- Fix the app data.
|
||||
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
#!/bin/bash
|
||||
set -e
|
||||
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
|
||||
TAG=R4_3_1
|
||||
TAG=R4_3_2
|
||||
|
||||
rm -rf R4_platform-aggregator-$TAG
|
||||
rm -rf R4_platform-aggregator-$TAG.tar.xz
|
||||
|
||||
git clone --branch $TAG --depth 1 $AGGREGATOR_PATH R4_platform-aggregator-$TAG
|
||||
# adding --depth 1 here may result in a quicker clone, but did not work for me
|
||||
git clone --branch $TAG $AGGREGATOR_PATH R4_platform-aggregator-$TAG
|
||||
|
||||
|
||||
pushd R4_platform-aggregator-$TAG
|
||||
|
||||
|
@ -27,4 +29,4 @@ find . -type f -name *.jnilib -exec rm -rf {} \;
|
|||
|
||||
popd
|
||||
|
||||
tar cJf R4_platform-aggregator-$TAG.tar.xz R4_platform-aggregator-$TAG
|
||||
tar cJf R4_platform-aggregator-$TAG.tar.xz R4_platform-aggregator-$TAG
|
||||
|
|
Loading…
Reference in New Issue