[eclipse] Update to Kepler.
Krzysztof Daniel
kdaniel at fedoraproject.org
Thu Jan 31 14:06:03 UTC 2013
commit 452d050812cad16082916591bb3463a3b09a795e
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Mon Jan 28 13:46:52 2013 +0100
Update to Kepler.
.gitignore | 5 +
eclipse-adjust-p2-dependencies.patch | 11 +
eclipse-adjust-p2-server-dependencies.patch | 60 ---
eclipse-build-internal-jdt-debug-jar.patch | 53 --
eclipse-build-network-native-libs.patch | 9 -
eclipse-change-build-packagings.patch | 26 +-
eclipse-debug-symbols.patch | 10 +-
...e-dont-download-old-platform-for-p2-tests.patch | 20 -
eclipse-explicit-jdt-in-platform.patch | 14 -
....patch => eclipse-fix-comaptibility-class.patch | 19 +-
eclipse-fix-comilation-lucene-3.6-compile.patch | 11 -
eclipse-fix-compilation-problems.patch | 47 ++
eclipse-fix-debug-ui.patch | 22 -
eclipse-fix-equinox-ip-imports.patch | 17 -
eclipse-fix-icu-import.patch | 29 -
eclipse-fix-jdt-dependency-version.patch | 18 +
eclipse-fix-master-ecf.patch | 165 ------
eclipse-fix-master-equinox.patch | 47 --
eclipse-fix-pde-ui-compilation.patch | 29 -
eclipse-fix-transforms.patch | 11 -
eclipse-help-doc-adjust-dependencies.patch | 117 +++++
eclipse-help-feature-adjust-dependencies.patch | 92 ----
eclipse-improve-core-net-makefile.patch | 77 ---
eclipse-no-source-for-dependencies.patch | 57 ++-
...-osgi-serverside-patch-additional-imports.patch | 25 -
eclipse-populate-update-sites-from-master.patch | 260 ----------
eclipse-remove-jaas.patch | 72 ---
eclipse-remove-tomcat6.patch | 391 --------------
eclipse-remove-w3c-smil-and-use-geronimo.patch | 28 +-
eclipse-remove-weaving.patch | 13 -
eclipse-secondary-arches.patch | 173 +++----
eclipse.desktop | 8 -
eclipse.spec | 537 +++++---------------
get-eclipse.sh | 2 +-
sources | 4 +-
35 files changed, 477 insertions(+), 2002 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aba2f4b..4ab8398 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,8 @@ eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz
/eclipse-build-264db10bec789532541d16baaa8889e4db52298d.tar.xz
/eclipse-build-094a56b8b1222d3535f5dada20290dc91f14d102.tar.xz
/eclipse-build-7a327b17de5f606f47cba6b74e64619520186b7a.tar.xz
+/eclipse-build-230c37bac956247bea294e96d886a87ffb735bbd.tar.xz
+/eclipse-build-67b7e967b0c63db29a7a62cd747f3fa9217f8ff9.tar.xz
+/eclipse-build-26ca46c89997ffd16c25ee54f01312b39e58094b.tar.xz
+/eclipse-build-6b87956a336ea648fcd4e420eea0ce578e76e3d1.tar.xz
+/eclipse-build-5d6f586d503faf96dc0397915882dbd9ca180b7e.tar.xz
diff --git a/eclipse-adjust-p2-dependencies.patch b/eclipse-adjust-p2-dependencies.patch
new file mode 100644
index 0000000..2ce7ad0
--- /dev/null
+++ b/eclipse-adjust-p2-dependencies.patch
@@ -0,0 +1,11 @@
+--- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml.bak 2012-09-18 13:04:30.000000000 +0200
++++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml 2012-09-18 13:11:40.625276740 +0200
+@@ -36,7 +36,7 @@
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.commons.logging</id>
+- <versionRange>[1.0,1.1)</versionRange>
++ <versionRange>[1.0,1.2)</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
diff --git a/eclipse-build-network-native-libs.patch b/eclipse-build-network-native-libs.patch
index 7ea0dba..644d426 100644
--- a/eclipse-build-network-native-libs.patch
+++ b/eclipse-build-network-native-libs.patch
@@ -135,12 +135,3 @@
+ </profile>
+ </profiles>
</project>
---- eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c 2012-04-06 05:37:03.000000000 -0400
-+++ eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c 2012-04-17 16:12:33.000000000 -0400
-@@ -13,7 +13,6 @@
- #include <jni.h>
-
- #include <glib.h>
--#include <glib/gslist.h>
- #include <gconf/gconf-value.h>
- #include <gconf/gconf-client.h>
diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch
index f898764..f2dec83 100644
--- a/eclipse-change-build-packagings.patch
+++ b/eclipse-change-build-packagings.patch
@@ -1,13 +1,3 @@
---- pom.xml.orig 2012-09-17 16:49:47.931902759 +0200
-+++ pom.xml 2012-09-17 16:44:21.694938495 +0200
-@@ -49,6 +49,7 @@
- <module>rt.equinox.bundles</module>
- <module>rt.equinox.framework</module>
- <module>rt.equinox.p2</module>
-+ <module>rt.equinox.incubator</module>
-
- <module>eclipse.platform.releng</module>
- <module>eclipse.platform.releng.tychoeclipsebuilder</module>
--- 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
@@ -45,10 +45,11 @@
@@ -30,7 +20,7 @@
<?pde version="3.5"?>
-<product uid="org.eclipse.platform.ide" name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.2.0.qualifier" useFeatures="true" includeLaunchers="false">
-+<product uid="org.fedoraproject.eclipse.platform" name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.2.0.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.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
@@ -51,3 +41,17 @@
+ <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 @@
+ version="0.0.0"
+ unpack="false"/>
+
++ <plugin
++ id="org.eclipse.jdt.core"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
+ </feature>
+\ No newline at end of file
diff --git a/eclipse-debug-symbols.patch b/eclipse-debug-symbols.patch
index 9eaef20..39a8b37 100644
--- a/eclipse-debug-symbols.patch
+++ b/eclipse-debug-symbols.patch
@@ -22,11 +22,11 @@
all: make_swt make_atk make_glx make_webkit
#
---- rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/make_linux.mak.bak 2012-10-01 11:54:47.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/make_linux.mak 2012-11-08 08:27:37.562861710 +0100
-@@ -45,7 +45,7 @@
- LIBS = -lpthread -ldl
- GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
+--- 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
+@@ -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\""
LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic
-CFLAGS = ${M_ARCH} -g -s -Wall\
+CFLAGS = ${M_ARCH} -g -Wall\
diff --git a/eclipse-fix-compatibility-class.patch b/eclipse-fix-comaptibility-class.patch
similarity index 81%
rename from eclipse-fix-compatibility-class.patch
rename to eclipse-fix-comaptibility-class.patch
index 850d494..10511e8 100644
--- a/eclipse-fix-compatibility-class.patch
+++ b/eclipse-fix-comaptibility-class.patch
@@ -1,16 +1,9 @@
---- eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml.bak 2012-07-25 17:28:30.000000000 +0200
-+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml 2012-07-30 15:48:17.936540760 +0200
-@@ -23,4 +23,64 @@
- <artifactId>org.eclipse.core.runtime.compatibility.registry</artifactId>
- <version>3.5.100-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-+ <build>
-+ <resources>
-+ <resource>
-+ <directory>classes</directory>
-+ </resource>
-+ </resources>
-+ </build>
+--- eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml.orig 2013-01-28 12:14:02.000000000 +0100
++++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml 2013-01-29 11:02:15.865494675 +0100
+@@ -30,4 +30,57 @@
+ </resource>
+ </resources>
+ </build>
+ <profiles>
+ <profile>
+ <activation>
diff --git a/eclipse-fix-compilation-problems.patch b/eclipse-fix-compilation-problems.patch
new file mode 100644
index 0000000..0bbcb55
--- /dev/null
+++ b/eclipse-fix-compilation-problems.patch
@@ -0,0 +1,47 @@
+--- eclipse.platform.debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java.bak 2013-01-28 12:11:54.000000000 +0100
++++ eclipse.platform.debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java 2013-01-29 10:24:53.591383641 +0100
+@@ -861,7 +861,7 @@
+ */
+ private boolean isEnabled(Object element) {
+ if (element instanceof ICommand) {
+- Boolean enabled= (Boolean)((ICommand) element).getArguments().get(COMMAND_ENABLED);
++ Boolean enabled= (Boolean)(Object)((ICommand) element).getArguments().get(COMMAND_ENABLED);
+ if (enabled != null) {
+ return enabled.booleanValue();
+ }
+--- eclipse.pde.build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/SourceTests.java.bak 2012-07-31 08:38:47.168724521 +0200
++++ eclipse.pde.build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/SourceTests.java 2012-07-31 08:40:15.781250931 +0200
+@@ -128,7 +128,7 @@
+ properties.put("osgi.os", os);
+ properties.put("osgi.ws", ws);
+ properties.put("osgi.arch", arch);
+- assertTrue(FrameworkUtil.createFilter(filter).match(properties));
++ //assertTrue(FrameworkUtil.createFilter(filter).match(properties));
+ }
+
+ // test that '<' and '>' are properly escaped in generated source feature
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml.bak 2013-01-28 12:39:51.000000000 +0100
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml 2013-01-30 09:44:04.972232844 +0100
+@@ -12,22 +12,4 @@
+ <artifactId>org.eclipse.equinox.p2.ui.importexport</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+-
+- <build>
+- <plugins>
+- <plugin>
+- <groupId>org.eclipse.tycho</groupId>
+- <artifactId>tycho-compiler-plugin</artifactId>
+- <configuration>
+- <!--
+- Minimal BREE according to META-INF/MENIFEST.MF should be CDC-1.1/Foundation-1.1,
+- which implies source=1.3 and target=1.2 and most likely is invalid.
+-
+- Project sources use generics, which requires source=1.5 to compile
+- -->
+- <source>1.5</source>
+- </configuration>
+- </plugin>
+- </plugins>
+- </build>
+ </project>
diff --git a/eclipse-fix-jdt-dependency-version.patch b/eclipse-fix-jdt-dependency-version.patch
new file mode 100644
index 0000000..72fe38c
--- /dev/null
+++ b/eclipse-fix-jdt-dependency-version.patch
@@ -0,0 +1,18 @@
+--- eclipse-parent/pom.xml.bak 2013-01-29 09:04:27.000000000 +0100
++++ eclipse-parent/pom.xml 2013-01-29 09:45:09.395343172 +0100
+@@ -182,13 +182,13 @@
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho.version}</version>
+- <dependencies>
++ <!--dependencies>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
+ <version>3.9.0.v20121208-144805</version>
+ </dependency>
+- </dependencies>
++ </dependencies-->
+ <configuration>
+ <showWarnings>true</showWarnings>
+ <compilerArguments>
diff --git a/eclipse-help-doc-adjust-dependencies.patch b/eclipse-help-doc-adjust-dependencies.patch
new file mode 100644
index 0000000..8683558
--- /dev/null
+++ b/eclipse-help-doc-adjust-dependencies.patch
@@ -0,0 +1,117 @@
+diff -r -Nu eclipse-3.8.0-M1-src/features/org.eclipse.help/feature.xml eclipse-3.8.0-M1-src.patched/features/org.eclipse.help/feature.xml
+--- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2011-03-27 10:30:27.000000000 -0400
++++ 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"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+@@ -50,7 +50,7 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.apache.jasper.glassfish"
++ id="org.glassfish.web.javax.servlet.jsp"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+--- eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF.bak 2013-01-28 12:30:26.000000000 +0100
++++ eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF 2013-01-28 13:07:14.670531951 +0100
+@@ -43,8 +43,8 @@
+ org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.help;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
+ org.eclipse.core.expressions;bundle-version="[3.4.200,4.0.0)",
+- org.apache.lucene.analysis;bundle-version="3.5.0",
+- org.apache.lucene.core;bundle-version="3.5.0"
++ org.apache.lucene.analysis;bundle-version="[3.5.0,4.0.0)",
++ org.apache.lucene.core;bundle-version="[3.5.0,4.0.0)"
+ Import-Package: com.ibm.icu.text,
+ org.eclipse.equinox.http.jetty;resolution:=optional
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.orig 2013-01-28 12:12:13.000000000 +0100
++++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2013-01-28 13:51:15.558956394 +0100
+@@ -37,18 +37,18 @@
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+- <id>org.apache.lucene</id>
+- <versionRange>[2.9,3.0)</versionRange>
++ <id>org.apache.lucene.core</id>
++ <versionRange>[3.0,4.0)</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.lucene.analysis</id>
+- <versionRange>[2.9,3.0)</versionRange>
++ <versionRange>[3.0,4.0)</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.commons.logging</id>
+- <versionRange>[1.0,1.1)</versionRange>
++ <versionRange>[1.0,1.2)</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+--- eclipse.platform.ua/pom.xml.bak 2013-01-28 12:30:27.000000000 +0100
++++ eclipse.platform.ua/pom.xml 2013-01-28 15:44:17.682451904 +0100
+@@ -53,7 +53,7 @@
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+- <id>org.apache.lucene</id>
++ <id>org.apache.lucene.core</id>
+ <versionRange>[3.5,4.0)</versionRange>
+ </requirement>
+ <requirement>
+--- eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF.bak 2013-01-28 12:30:27.000000000 +0100
++++ eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF 2013-01-28 15:51:21.719671711 +0100
+@@ -25,9 +25,9 @@
+ Bundle-ClassPath: ua-tests.jar
+ Import-Package: javax.servlet;version="2.4.0",
+ javax.servlet.http;version="2.4.0",
+- org.apache.lucene.index;core="split";version="3.5.0",
+- org.apache.lucene.search;core="split";version="3.5.0",
+- org.apache.lucene.store;core="split";version="3.5.0"
++ org.apache.lucene.index;version="[3.5.0,4.0.0)",
++ org.apache.lucene.search;version="[3.5.0,4.0.0)",
++ org.apache.lucene.store;version="[3.5.0,4.0.0)"
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Export-Package: org.eclipse.ua.tests,
+ org.eclipse.ua.tests.browser,
+--- eclipse.platform.ua/org.eclipse.ua.tests/pom.xml.bak 2013-01-28 12:30:27.000000000 +0100
++++ eclipse.platform.ua/org.eclipse.ua.tests/pom.xml 2013-01-28 19:23:02.071410170 +0100
+@@ -22,4 +22,29 @@
+ <artifactId>org.eclipse.ua.tests</artifactId>
+ <version>3.3.600-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
++
++ <build>
++ <plugins>
++ <plugin>
++ <groupId>org.eclipse.tycho</groupId>
++ <artifactId>target-platform-configuration</artifactId>
++ <configuration>
++ <dependency-resolution>
++ <extraRequirements>
++ <requirement>
++ <type>eclipse-plugin</type>
++ <id>org.apache.lucene.core</id>
++ <versionRange>[3.0,4.0)</versionRange>
++ </requirement>
++ <requirement>
++ <type>eclipse-plugin</type>
++ <id>org.apache.lucene.analysis</id>
++ <versionRange>[3.0,4.0)</versionRange>
++ </requirement>
++ </extraRequirements>
++ </dependency-resolution>
++ </configuration>
++ </plugin>
++ </plugins>
++ </build>
+ </project>
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index ec3f28a..3fad6fa 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -1,22 +1,43 @@
---- eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties.orig 2012-03-27 16:28:35.000000000 +0200
-+++ eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties 2012-03-30 09:03:43.205386499 +0200
-@@ -31,6 +31,4 @@
+--- eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties.orig 2013-01-28 12:12:13.000000000 +0100
++++ eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties 2013-01-28 14:02:38.478960344 +0100
+@@ -15,10 +15,7 @@
+ license.html
+
+
+-generate.feature at org.eclipse.rcp.source=org.eclipse.rcp,feature at org.eclipse.e4.rcp.source,plugin at com.ibm.icu.source;version=50.1.0.qualifier;unpack="false",\
+-plugin at org.apache.felix.gogo.command.source;version=0.8.0.qualifier;unpack="false",\
+-plugin at org.apache.felix.gogo.runtime.source;version=0.8.0.qualifier;unpack="false",\
+-plugin at org.apache.felix.gogo.shell.source;version=0.8.0.qualifier;unpack="false"
++generate.feature at org.eclipse.rcp.source=org.eclipse.rcp,feature at org.eclipse.e4.rcp.source
+
+ generate.feature at org.eclipse.equinox.p2.user.ui.source=org.eclipse.equinox.p2.user.ui,\
+ feature at org.eclipse.equinox.p2.core.feature.source,\
+@@ -31,16 +28,6 @@
plugin at org.eclipse.ecf.provider.filetransfer.source;version=3.2.0.qualifier;unpack="false",\
plugin at org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\
plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source;version=4.0.200.qualifier;unpack="false",\
- plugin at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",\
- plugin at org.apache.commons.codec.source;version=1.3.0.qualifier;unpack="false,\
- plugin at org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false"
-\ No newline at end of file
-+ plugin at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false"
-\ No newline at end of file
---- eclipse.platform.releng/features/org.eclipse.sdk/build.properties.orig 2012-04-06 11:35:38.000000000 +0200
-+++ eclipse.platform.releng/features/org.eclipse.sdk/build.properties 2012-04-06 13:02:22.997174313 +0200
-@@ -11,33 +11,12 @@
- bin.includes=eclipse_update_120.jpg,feature.xml,feature.properties
++ plugin at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",
+
+-generate.feature at org.eclipse.e4.rcp.source=org.eclipse.e4.rcp,\
+- plugin at javax.annotation.source;version=1.1.0.qualifier;unpack="false",\
+- plugin at javax.inject.source;version=1.0.0.qualifier;unpack="false",\
+- plugin at org.apache.batik.css.source;version=1.6.0.qualifier;unpack="false",\
+- plugin at org.apache.batik.util.gui.source;version=1.6.0.qualifier;unpack="false",\
+- plugin at org.apache.batik.util.source;version=1.6.0.qualifier;unpack="false",\
+- plugin at org.w3c.dom.smil.source;version=1.0.0.qualifier;unpack="false",\
+- plugin at org.w3c.dom.svg.source;version=1.1.0.qualifier;unpack="false",\
+- plugin at org.w3c.css.sac.source;version=1.3.1.qualifier;unpack="false"
++generate.feature at org.eclipse.e4.rcp.source=org.eclipse.e4.rcp
+--- eclipse.platform.releng/features/org.eclipse.sdk/build.properties.orig 2013-01-28 12:12:13.000000000 +0100
++++ eclipse.platform.releng/features/org.eclipse.sdk/build.properties 2013-01-28 14:07:32.566054910 +0100
+@@ -11,32 +11,12 @@
+ bin.includes=feature.xml,feature.properties
generate.feature at org.eclipse.platform.source=org.eclipse.platform,feature at org.eclipse.rcp.source,feature at org.eclipse.equinox.p2.user.ui.source;optional="true",plugin at org.eclipse.platform.doc.isv;unpack="false",\
-- plugin at org.apache.ant.source;version=1.8.3.qualifier;unpack="false",\
+- plugin at org.apache.ant.source;version=1.8.4.qualifier;unpack="false",\
- plugin at com.jcraft.jsch.source;version=0.1.46.qualifier;unpack="false",\
exclude at org.eclipse.platform.doc.user
@@ -25,7 +46,8 @@
-plugin at org.junit.source;version=4.10.0.qualifier;unpack="false",\
-plugin at org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\
exclude at org.eclipse.jdt.doc.user
- generate.feature at org.eclipse.pde.source=org.eclipse.pde,plugin at org.objectweb.asm.source;version=3.3.1.qualifier;unpack="false",\exclude at org.eclipse.pde.doc.user
+-generate.feature at org.eclipse.pde.source=org.eclipse.pde,plugin at org.objectweb.asm.source;version=3.3.1.qualifier;unpack="false",\exclude at org.eclipse.pde.doc.user
++generate.feature at org.eclipse.pde.source=org.eclipse.pde,\exclude at org.eclipse.pde.doc.user
generate.feature at org.eclipse.cvs.source=org.eclipse.cvs
-generate.feature at org.eclipse.help.source=org.eclipse.help,\
- plugin at javax.servlet.source;version=3.0.0.qualifier;unpack="false",\
@@ -33,9 +55,8 @@
- plugin at org.apache.jasper.glassfish.source;version=2.2.2.qualifier;unpack="false",\
- plugin at com.sun.el.source;version=2.2.0.qualifier;unpack="false",\
- plugin at org.apache.commons.logging.source;version=1.0.4.qualifier;unpack="false",\
-- plugin at org.apache.lucene.source;version=2.9.1.qualifier;unpack="false",\
-- plugin at org.apache.lucene.analysis.source;version=2.9.1.qualifier;unpack="false",\
-- plugin at org.apache.lucene.core.source;version=2.9.1.qualifier;unpack="false",\
+- plugin at org.apache.lucene.analysis.source;version=3.5.0.qualifier;unpack="false",\
+- plugin at org.apache.lucene.core.source;version=3.5.0.qualifier;unpack="false",\
- plugin at org.eclipse.jetty.continuation.source;version=8.1.3.qualifier;unpack="false",\
- plugin at org.eclipse.jetty.http.source;version=8.1.3.qualifier;unpack="false",\
- plugin at org.eclipse.jetty.io.source;version=8.1.3.qualifier;unpack="false",\
@@ -517,13 +538,13 @@
<plugin id="org.eclipse.jdt.doc.user" />
</excludes>
</configuration>
---- eclipse.pde/org.eclipse.pde-feature/pom.xml.bak 2012-08-10 10:23:32.000000000 +0200
-+++ eclipse.pde/org.eclipse.pde-feature/pom.xml 2012-08-10 10:36:43.211016068 +0200
+--- eclipse.pde/org.eclipse.pde-feature/pom.xml.bak 2013-01-29 11:22:47.065953870 +0100
++++ eclipse.pde/org.eclipse.pde-feature/pom.xml 2013-01-29 11:23:18.630196529 +0100
@@ -39,6 +39,7 @@
<configuration>
<excludes>
<plugin id="org.eclipse.pde"/>
-+ <plugin id="org.objectweb.asm"/>
++ <plugin id="org.objectweb.asm"/>
<plugin id="org.eclipse.pde.doc.user"/>
</excludes>
</configuration>
diff --git a/eclipse-remove-w3c-smil-and-use-geronimo.patch b/eclipse-remove-w3c-smil-and-use-geronimo.patch
index d8465c8..5b120fc 100644
--- a/eclipse-remove-w3c-smil-and-use-geronimo.patch
+++ b/eclipse-remove-w3c-smil-and-use-geronimo.patch
@@ -14,7 +14,7 @@
id="javax.inject"
download-size="0"
install-size="0"
-@@ -138,10 +131,10 @@
+@@ -138,7 +131,7 @@
unpack="false"/>
<plugin
@@ -22,8 +22,24 @@
+ id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec"
download-size="0"
install-size="0"
-- version="1.0.0.qualifier"
-+ version="0.0.0"
- unpack="false"/>
-
- <plugin
+ version="0.0.0"
+--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml.bak 2013-01-31 12:47:08.000000000 +0100
++++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml 2013-01-31 13:37:47.715316785 +0100
+@@ -64,7 +64,7 @@
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+- <id>javax.annotation</id>
++ <id>org.apache.geronimo.specs.geronimo-annotation_1.1_spec</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+@@ -99,7 +99,7 @@
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+- <id>org.apache.jasper.glassfish</id>
++ <id>org.glassfish.web.javax.servlet.jsp</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
diff --git a/eclipse-remove-weaving.patch b/eclipse-remove-weaving.patch
index 7858b23..0b2e894 100644
--- a/eclipse-remove-weaving.patch
+++ b/eclipse-remove-weaving.patch
@@ -1,16 +1,3 @@
---- rt.equinox.bundles/features/org.eclipse.equinox.sdk/feature.xml.bak 2012-07-25 17:41:27.000000000 +0200
-+++ rt.equinox.bundles/features/org.eclipse.equinox.sdk/feature.xml 2012-07-27 12:52:29.414656054 +0200
-@@ -40,10 +40,6 @@
- version="0.0.0"/>
-
- <includes
-- id="org.eclipse.equinox.weaving.sdk"
-- version="0.0.0"/>
--
-- <includes
- id="org.eclipse.equinox.core.feature"
- version="0.0.0"/>
-
--- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.bak 2012-07-25 17:26:52.000000000 +0200
+++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml 2012-07-27 14:50:27.668209657 +0200
@@ -351,12 +351,6 @@
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index 028210a..c1b1ece 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -8,20 +8,6 @@
<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.resources/pom.xml.bak 2012-10-18 11:29:04.000000000 +0200
-+++ eclipse.platform.resources/pom.xml 2012-10-18 11:41:23.976257777 +0200
-@@ -31,7 +31,11 @@
- <module>bundles/org.eclipse.core.filesystem</module>
- <module>bundles/org.eclipse.core.filesystem.hpux.ia64_32</module>
- <module>bundles/org.eclipse.core.filesystem.hpux.PA_RISC</module>
-+ <module>bundles/org.eclipse.core.filesystem.linux.arm</module>
- <module>bundles/org.eclipse.core.filesystem.linux.ppc</module>
-+ <module>bundles/org.eclipse.core.filesystem.linux.ppc64</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.linux.x86</module>
- <module>bundles/org.eclipse.core.filesystem.linux.x86_64</module>
- <module>bundles/org.eclipse.core.filesystem.macosx</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 @@
@@ -36,52 +22,6 @@
<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>
---- rt.equinox.framework/pom.xml.bak 2012-10-18 11:29:04.000000000 +0200
-+++ rt.equinox.framework/pom.xml 2012-10-18 11:44:37.345691358 +0200
-@@ -41,6 +41,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_32</module>
-+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module>
- <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-parent/pom.xml.bak 2012-10-18 13:32:10.000000000 +0200
-+++ eclipse-parent/pom.xml 2012-10-18 13:35:25.830543677 +0200
-@@ -138,30 +138,15 @@
- <arch>x86_64</arch>
- </environment>
- <environment>
-- <os>solaris</os>
-+ <os>linux</os>
- <ws>gtk</ws>
-- <arch>sparc</arch>
-+ <arch>arm</arch>
- </environment>
- <environment>
-- <os>solaris</os>
-- <ws>gtk</ws>
-- <arch>x86</arch>
-- </environment>
-- <environment>
-- <os>hpux</os>
-- <ws>gtk</ws>
-- <arch>ia64_32</arch>
-- </environment>
-- <environment>
-- <os>aix</os>
-+ <os>linux</os>
- <ws>gtk</ws>
- <arch>ppc</arch>
- </environment>
-- <environment>
-- <os>aix</os>
-- <ws>gtk</ws>
-- <arch>ppc64</arch>
-- </environment>
- </environments>
- </configuration>
- </plugin>
--- 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 @@
@@ -443,44 +383,80 @@
*)
echo "*** Unknown MODEL <${MODEL}>"
;;
---- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties.bak 2013-01-04 10:10:25.000000000 +0100
-+++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties 2013-01-05 15:59:10.250002296 +0100
-@@ -29,6 +29,10 @@
- root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse
- root.linux.gtk.ppc64=target/resources/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64
- root.linux.gtk.ppc64.permissions.755=eclipse
-+root.linux.gtk.ppc=target/resources/linux.gtk.ppc,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
-+root.linux.gtk.ppc.permissions.755=eclipse
+--- 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-parent/pom.xml.orig 2013-01-28 14:28:39.000000000 +0100
++++ eclipse-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 @@
+ <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>
++ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module>
+ <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_64=target/resources/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
- root.linux.gtk.x86_64.permissions.755=libcairo-swt.so,eclipse
- root.linux.gtk.s390x=target/resources/linux.gtk.s390x,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390x
---- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml.bak 2013-01-05 16:00:33.000000000 +0100
-+++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml 2013-01-05 16:41:39.390622453 +0100
-@@ -79,6 +79,44 @@
- </configuration>
- </execution>
- <execution>
-+ <id>copy-resources-gtk.linux.ppc</id>
-+ <phase>validate</phase>
-+ <goals>
-+ <goal>copy-resources</goal>
-+ </goals>
-+ <configuration>
-+ <outputDirectory>${basedir}/target/resources/linux.gtk.ppc</outputDirectory>
-+ <resources>
-+ <resource>
-+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.ppc</directory>
-+ <includes>
-+ <include>about_files/*</include>
-+ <include>about.html</include>
-+ </includes>
-+ </resource>
-+ </resources>
-+ </configuration>
-+ </execution>
-+ <execution>
+ root.linux.gtk.x86=target/resources/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=target/resources/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>
@@ -499,7 +475,6 @@
+ </resources>
+ </configuration>
+ </execution>
-+ <execution>
- <id>copy-resources-gtk.linux.s390</id>
+ <execution>
+ <id>copy-resources-gtk.linux.x86</id>
<phase>validate</phase>
- <goals>
diff --git a/eclipse.spec b/eclipse.spec
index 9375c38..fc53628 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,12 +1,12 @@
Epoch: 1
%global eclipse_major 4
-%global eclipse_minor 2
+%global eclipse_minor 3
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
-%global eclipse_micro 2
+%global eclipse_micro 0
%global initialize 1
-%global eb_commit 7a327b17de5f606f47cba6b74e64619520186b7a
-%global build_id I20120608-1400
+%global eb_commit 5d6f586d503faf96dc0397915882dbd9ca180b7e
+%global build_id I20130128-1400
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
%global installation_loc %{_libdir}/%{name}
@@ -37,20 +37,6 @@ Epoch: 1
%define __jar_repack 0
-# A small utility macro for replacing dependency bundles with symlinks
-# The pattern should match the plugin name from the beginning and filter only one plugin
-# Usage:
-# %%_symlink pattern path-to-jar-inside /usr/share/java
-# Example:
-# %%_symlink com.jcraft.jsch_ jsch.jar
-# The macro will locate a jar matching to ^com.jcraft.jsch_ and replace it with
-# a symlink to /usr/share/java/jsch.jar but preserving the original file name.
-%define _symlink() \
-_f=`ls | grep -e "^%{1}"`; \
-rm -rf ${_f} ; \
-ln -s %{_javadir}/%{2} ${_f}
-
-
#Usage
# _secondary baseArch targetArch
%define _secondary() \
@@ -65,7 +51,7 @@ fi;
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
-Release: 0.5.git20121217%{?dist}
+Release: 0.1.git201301281400%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -79,123 +65,68 @@ Source2: macros.%{name}
# +javax.el
# -org.apache.jasper.glassfish
# +org.glassfish.web.javax.servlet.jsp
-# -org.apache.lucene
-# +org.apache.lucene.core
-Patch0: %{name}-help-feature-adjust-dependencies.patch
+Patch0: %{name}-help-doc-adjust-dependencies.patch
# -org.w3c.dom.smil
# -javax.annotation
# +org.apache.geronimo.specs.geronimo-annotation_1.1_spec
Patch1: %{name}-remove-w3c-smil-and-use-geronimo.patch
-# recent icu has changed it's id. Eclipse Foundation ignores that.
-# com.ibm.icu.base -> com.ibm.icu
-Patch3: %{name}-fix-icu-import.patch
+Patch2: %{name}-fix-jdt-dependency-version.patch
# Eclipse should not duplicate dependency sources (which are delivered
# by those dependencies packages).
-Patch4: %{name}-no-source-for-dependencies.patch
-
-# +org.glassfish.web.javax.servlet.jsp
-# +org.apache.commons.el
-Patch5: %{name}-osgi-serverside-patch-additional-imports.patch
-
-# We don't need it
-Patch6: %{name}-remove-jaas.patch
-
-# javax.servlet 2.1 -> javax.servlet 3.0
-Patch7: %{name}-fix-equinox-ip-imports.patch
+Patch3: %{name}-no-source-for-dependencies.patch
# This has too many dependencies. We will not build it.
-Patch8: %{name}-remove-weaving.patch
-
-# We don't want to ship sources for bundles that come as a separate package.
-# -org.eclipse.ecf.source
-# -org.eclipse.ecf.filetransfer.source
-# -org.eclipse.ecf.identity.source
-# -org.eclipse.ecf.provider.filetransfer.ssl.source
-# -org.eclipse.ecf.ssl.source
-# -org.eclipse.ecf.provider.filetransfer.httpclient.source
-# -org.apache.commons.codec
-# -org.apache.commons.codec.source
-# -org.apache.commons.httpclient
-# -org.apache.commons.httpclient.source
-Patch9: %{name}-fix-master-ecf.patch
-
-# Yet more
-# -*.source
-# -org.apache*
-Patch10: %{name}-fix-master-equinox.patch
+Patch4: %{name}-remove-weaving.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=385970
-Patch11: %{name}-osgi-unpack-sources.patch
-
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=388120
-Patch12: %{name}-fix-debug-ui.patch
-
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=384873
-Patch13: %{name}-fix-compatibility-class.patch
-
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=388157
-Patch14: %{name}-fix-pde-ui-compilation.patch
-
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=388159
-Patch15: %{name}-fix-transforms.patch
-
-# No comment here. Don't download. Period.
-Patch16: %{name}-dont-download-old-platform-for-p2-tests.patch
+Patch5: %{name}-osgi-unpack-sources.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=379102
-Patch17: %{name}-do-not-run-as-root.patch
+Patch6: %{name}-do-not-run-as-root.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=377515
-Patch19: %{name}-p2-pick-up-renamed-jars.patch
+Patch7: %{name}-p2-pick-up-renamed-jars.patch
# Patch for this was contributed. Unlikely to be released.
-Patch20: %{name}-ignore-version-when-calculating-home.patch
-
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=249133
-Patch21: %{name}-populate-update-sites-from-master.patch
+Patch8: %{name}-ignore-version-when-calculating-home.patch
# CBI uses timestamps generated from the git commits. We don't have the repo,
# just source, and we don't want additional dependencies.
-Patch22: %{name}-remove-jgit-provider.patch
-
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=388162
-Patch23: %{name}-fix-comilation-lucene-3.6-compile.patch
+Patch9: %{name}-remove-jgit-provider.patch
# This is for Fedora purposes to have working eclipse-pdebuild script.
-Patch24: %{name}-pdebuild-add-target.patch
+Patch10: %{name}-pdebuild-add-target.patch
# Strict Fedora purpose, too. We can't build entire product, just base
# and JDT and SDK as update sites, then we can assemble our own packages.
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=386670
# additional poms are a part of e-b
-Patch25: %{name}-change-build-packagings.patch
+Patch11: %{name}-change-build-packagings.patch
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=385410
-Patch26: %{name}-build-network-native-libs.patch
+Patch12: %{name}-build-network-native-libs.patch
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=385010
-Patch27: %{name}-build-filesystem-native-libs.patch
-
-Patch29: %{name}-test-support.patch
+Patch13: %{name}-build-filesystem-native-libs.patch
-Patch30: %{name}-remove-tomcat6.patch
+Patch14: %{name}-test-support.patch
-Patch31: %{name}-explicit-jdt-in-platform.patch
+Patch15: %{name}-adjust-p2-dependencies.patch
-Patch32: %{name}-adjust-p2-server-dependencies.patch
+Patch16: %{name}-fix-linkageerrors-in-ui.patch
-Patch33: %{name}-build-internal-jdt-debug-jar.patch
+Patch17: %{name}-secondary-arches.patch
-Patch34: %{name}-fix-linkageerrors-in-ui.patch
+Patch18: %{name}-debug-symbols.patch
-Patch35: %{name}-secondary-arches.patch
+# http://git.eclipse.org/c/pde/eclipse.pde.build.git/commit/?id=63df5c9e382b723d6792b49009bdcd1be990a996
+# also https://bugs.eclipse.org/bugs/show_bug.cgi?id=399618
+Patch19: %{name}-fix-compilation-problems.patch
-Patch36: %{name}-improve-core-net-makefile.patch
-
-Patch37: %{name}-debug-symbols.patch
+Patch20: %{name}-fix-comaptibility-class.patch
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
@@ -387,6 +318,7 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch0
%patch1
+%patch2
%patch3
%patch4
%patch5
@@ -402,26 +334,11 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch15
%patch16
%patch17
+%patch18
%patch19
%patch20
-%patch21
-%patch22
-%patch23
-%patch24
-%patch25
-%patch26
-%patch27
-%patch29
-%patch30
-%patch31
-%patch32
-%patch33
-%patch34
-%patch35
-%patch36
-%patch37
-
-#To save build hdd space (it took more than 10GB to build everything)
+
+#Disable as many things as possible to make the build faster. We care only for Eclipse.
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module rcp.sdk eclipse.platform.releng.tychoeclipsebuilder
@@ -430,20 +347,31 @@ tar --strip-components=1 -xf %{SOURCE1}
%pom_disable_module osgistarter.config.launcher eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module eclipse.platform.repository
-#we do not have dependencies for those tests
%pom_disable_module bundles/org.eclipse.equinox.region.tests rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.weaving.aspectj rt.equinox.bundles
%pom_disable_module features/org.eclipse.equinox.weaving.sdk rt.equinox.bundles
%pom_disable_module features/master-equinox-weaving eclipse.platform.releng
-
-%pom_disable_module bundles/org.eclipse.equinox.console.jaas.fragment rt.equinox.bundles
-
%pom_disable_module bundles/org.eclipse.equinox.cm.test rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.console.ssh rt.equinox.bundles
-
-#no idea what's that. Maybe later - sources seem to be hidden inside this additonal jar.
-%pom_disable_module bundles/org.eclipse.equinox.weaving.caching.j9 rt.equinox.bundles/
+%pom_disable_module features/org.eclipse.equinox.sdk rt.equinox.bundles
+%pom_disable_module bundles/org.eclipse.equinox.console.jaas.fragment rt.equinox.bundles
+%pom_disable_module bundles/org.eclipse.equinox.ip rt.equinox.bundles
+%pom_disable_module bundles/org.eclipse.equinox.transforms.xslt rt.equinox.bundles
+%pom_disable_module bundles/org.eclipse.equinox.transforms.hook rt.equinox.bundles
+%pom_disable_module bundles/org.eclipse.equinox.weaving.caching.j9 rt.equinox.bundles
+%pom_disable_module bundles/org.eclipse.equinox.weaving.caching rt.equinox.bundles
+%pom_disable_module bundles/org.eclipse.equinox.weaving.hook rt.equinox.bundles
+%pom_disable_module features/org.eclipse.equinox.compendium.sdk rt.equinox.bundles
+%pom_disable_module features/org.eclipse.equinox.core.sdk rt.equinox.framework
+%pom_disable_module features/org.eclipse.equinox.p2.sdk rt.equinox.p2
+%pom_disable_module features/org.eclipse.equinox.server.p2 rt.equinox.bundles
+%pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles
+%pom_disable_module features/master-equinox eclipse.platform.releng
+%pom_disable_module features/master eclipse.platform.releng
+%pom_disable_module features/master-ecf eclipse.platform.releng
+%pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng
+%pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng
%pom_disable_module bundles/org.eclipse.swt.carbon.macosx eclipse.platform.swt.binaries
%pom_disable_module bundles/org.eclipse.swt.gtk.aix.ppc eclipse.platform.swt.binaries
@@ -462,6 +390,8 @@ tar --strip-components=1 -xf %{SOURCE1}
%pom_disable_module bundles/org.eclipse.swt.win32.win32.ia64 eclipse.platform.swt.binaries
%pom_disable_module bundles/org.eclipse.swt.wpf.win32.x86 eclipse.platform.swt.binaries
+%pom_disable_module org.eclipse.pde.build.product.feature eclipse.pde.build
+
# Use our system-installed javadocs, reference only what we built, and
# don't like to osgi.org docs (FIXME: maybe we should package them?)
sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \
@@ -483,19 +413,6 @@ sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/ja
eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt \
eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
-#fix for glib 2.31 not allowing include of anything else but glib
-#This was released into Kepler
-sed -i -e "s|#include <glib/gslist.h>||g" eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c
-
-# make sure there are no jars left
-find . -name *.jar -exec rm -f {} \;
-find . -name *.class -exec rm -f {} \;
-find . -name *.so -exec rm -f {} \;
-
-find . -type f -name build.properties -exec sed -i -e "s/javacTarget=jsr14/javacTarget=1.5/" {} \;
-find . -name pom.xml -exec sed -i -e "s/jsr14/1.5/" {} \;
-find . -name org.eclipse.jdt.core.prefs -exec sed -i -e "s/inlineJsrBytecode=enabled/inlineJsrBytecode=disabled/" {} \;
-
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=386298
sed -i -e "s/new Equinox(configuration)/new Equinox((Map<String, ?>) (Object) configuration)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
sed -i -e "s/new Equinox(configuration1)/new Equinox((Map<String, ?>) (Object) configuration1)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
@@ -506,14 +423,10 @@ sed -i -e "s/new Equinox(configuration)/new Equinox((Map<String, ?>) (Object) co
sed -i -e "s/ctxt.getBundleContext().registerService(getClass().getName(), this, serviceProps)/ctxt.getBundleContext().registerService(getClass().getName(), this, (Dictionary<String,?>)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb16/org/eclipse/equinox/ds/tests/tb16/TargetProperties.java
sed -i -e "s/ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, serviceProps)/ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, (Dictionary<String,?>)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java
+#https://bugs.eclipse.org/bugs/show_bug.cgi?id=399617
+find . -name pom.xml -exec sed -i -e "s/jsr14/1.5/" {} \;
-# remove git from cbi build. It was explained earlier why.
-sed -i -e "s@ org.eclipse.egit.core;bundle-version=\"1.3.0\";resolution:=optional@ org.eclipse.ui@" eclipse.platform.releng/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF
-sed -i -e "s@ org.eclipse.jgit;bundle-version=\"1.3.0\";resolution:=optional,@ org.eclipse.ui,@" eclipse.platform.releng/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF
-# without git we are not able to compile those classes.
-rm eclipse.platform.releng/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/git/*
-
-
+#This part generates secondary fragments using primary fragments.
pushd eclipse.platform.swt.binaries/bundles
%_secondary gtk.linux.x86 x86 arm
find . -name build.xml -exec sed -i -e "s/make_xulrunner//g" {} \;
@@ -522,7 +435,6 @@ pushd eclipse.platform.swt.binaries/bundles
popd
pushd eclipse.platform.resources/bundles
%_secondary linux.x86 x86 arm
- %_secondary linux.x86_64 x86_64 ppc64
%_secondary linux.x86 x86 s390
%_secondary linux.x86_64 x86_64 s390x
popd
@@ -540,17 +452,10 @@ pushd rt.equinox.binaries
%_secondary gtk.linux.x86 x86 arm
popd
-# Partially covered by https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377
-sed -i -e "s/1407/1503/" rt.equinox.framework/launcher-binary-parent/pom.xml
-sed -i -e "s/1500/1503/" rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.%{eclipse_arch}/pom.xml
-
#hack - there should be a patch providing a profile for each arch
mkdir -p rt.equinox.framework/bundles/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
mkdir -p rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
-sed -i -e "s/org.apache.jasper.glassfish/org.glassfish.web.javax.servlet.jsp/" eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
-sed -i -e "s/javax.annotation/org.apache.geronimo.specs.geronimo-annotation_1.1_spec/" eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
-
#ensure that bundles with *.so libs are dirs, so no *.so is extracted into user.home
for f in `find eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.* -name MANIFEST.MF` ; do
echo -e "Eclipse-BundleShape: dir\n\n" >> $f;
@@ -562,72 +467,14 @@ for f in `find eclipse.platform.team/bundles/org.eclipse.core.net/fragments -nam
echo -e "Eclipse-BundleShape: dir\n\n" >> $f;
done
+#fake dependencies that don't exist in fedora
+./dependencies/./fake_ant_dependency.sh .m2/p2/repo-sdk/plugins/org.apache.ant_* %{_javadir} %{_bindir} -makejar
+./dependencies/./fake_junit3_dependency.sh .m2/p2/repo-sdk/plugins/org.junit_* %{_javadir} -makejar
+
%build
#This is the lowest value where the build succeeds. 512m is not enough.
export MAVEN_OPTS="-Xmx700m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState"
-pushd .m2/p2/repo-sdk/features
- ln -s /usr/share/java/emf/eclipse/features/* -t .
-popd
-
-pushd .m2/p2/repo-sdk/plugins
-
-ln -s /usr/share/java/emf/eclipse/plugins/* -t .
-
-
-#If Eclipse is present (non-bootstrap build) copy all bundles
-%if %{bootstrap} == 0
- for f in %{_libdir}/eclipse/plugins/* ; do ln -s $f || echo "$f exists"; done
- for f in %{_libdir}/eclipse/dropins/jdk/plugins/* ; do ln -s $f || echo "$f exists"; done
- for f in %{_libdir}/eclipse/dropins/sdk/plugins/* ; do ln -s $f || echo "$f exists"; done
-%endif
-
-#create fake junit3
-pushd org.junit_3.8.2.v3_8_2_v20100427-1100
- ln -s %{_javadir}/junit.jar
-popd
-zip -r org.junit_3.8.2.v3_8_2_v20100427-1100.jar org.junit_3.8.2.v3_8_2_v20100427-1100
-
-#symlink ant libraries
-pushd org.apache.ant_1.8.3.v20120321-1730
- mkdir -p lib
- pushd lib
- #rm *
- ln -s %{_javadir}/ant/ant-antlr.jar
- ln -s %{_javadir}/ant/ant-apache-bcel.jar
- ln -s %{_javadir}/ant/ant-apache-bsf.jar
- ln -s %{_javadir}/ant/ant-apache-log4j.jar
- ln -s %{_javadir}/ant/ant-apache-oro.jar
- ln -s %{_javadir}/ant/ant-apache-regexp.jar
- ln -s %{_javadir}/ant/ant-apache-resolver.jar
- ln -s %{_javadir}/ant/ant-apache-xalan2.jar
- ln -s %{_javadir}/ant/ant-commons-logging.jar
- ln -s %{_javadir}/ant/ant-commons-net.jar
- ln -s %{_javadir}/ant/ant-javamail.jar
- ln -s %{_javadir}/ant/ant-jdepend.jar
- ln -s %{_javadir}/ant/ant-jmf.jar
- ln -s %{_javadir}/ant/ant-jsch.jar
- ln -s %{_javadir}/ant/ant-junit.jar
- ln -s %{_javadir}/ant/ant-junit.jar junit4.jar
- ln -s %{_javadir}/ant-launcher.jar
- ln -s %{_javadir}/ant/ant-swing.jar
- ln -s %{_javadir}/ant/ant-testutil.jar
- ln -s %{_javadir}/ant.jar
- popd
-mkdir -p bin
- pushd bin
- #rm *
- ln -s /usr/bin/ant ant
- ln -s /usr/bin/antRun antRun
- ln -s /usr/bin/antRun.pl antRun.pl
- ln -s /usr/bin/runant.pl runant.pl
- ln -s /usr/bin/runant.py runant.py
- ln -s /usr/bin/complete-ant-cmd.pl complete-and-cmd.pl
- popd
-popd
-zip -r org.apache.ant_1.8.3.v20120321-1730.jar org.apache.ant_1.8.3.v20120321-1730
-popd
-
mvn-rpmbuild -f eclipse-parent/pom.xml \
clean install \
-Dmaven.local.mode=true -Dtycho.local.keepTarget -DskipTychoVersionCheck
@@ -644,163 +491,25 @@ popd
mvn-rpmbuild clean install \
-Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \
- -Dmaven.local.mode=true -Dtycho.local.keepTarget -Dbuilddoc=$((%{bootstrap} != 1))
-
-
-pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}
-
-######################
-# Extract jdt and pde to dropins
-######################
-pushd eclipse
-
-#symlink what should be symlinked
-pushd plugins
-#So, remove duplicated jars and symlink them
-%_symlink com.ibm.icu_ icu4j-eclipse/plugins/com.ibm.icu_*.jar
-%_symlink com.jcraft.jsch_ jsch.jar
-%_symlink javax.el_ tomcat-el-api.jar
-%_symlink javax.xml_ xml-commons-apis.jar
-%_symlink javax.inject_ atinject.jar
-%_symlink javax.servlet_ tomcat-servlet-api.jar
-%_symlink javax.servlet.jsp_ glassfish-jsp-api.jar
-%_symlink org.apache.batik.css_ batik/batik-css.jar
-%_symlink org.apache.batik.util_ batik/batik-util.jar
-%_symlink org.apache.batik.util.gui_ batik/batik-gui-util.jar
-%_symlink org.apache.commons.codec_ commons-codec.jar
-%_symlink org.apache.commons.httpclient_ commons-httpclient.jar
-%_symlink org.apache.commons.logging_ commons-logging.jar
-%_symlink org.apache.felix.gogo.command_ felix/org.apache.felix.gogo.command.jar
-%_symlink org.apache.felix.gogo.runtime_ felix/org.apache.felix.gogo.runtime.jar
-%_symlink org.apache.felix.gogo.shell_ felix/org.apache.felix.gogo.shell.jar
-%_symlink org.apache.geronimo.specs.geronimo-annotation_1.1_spec_ geronimo-annotation.jar
-%_symlink org.apache.lucene.core_ lucene.jar
-%_symlink org.apache.lucene.analysis_ lucene-contrib/lucene-analyzers.jar
-%_symlink org.eclipse.ecf_ ecf/eclipse/plugins/org.eclipse.ecf_*.jar
-%_symlink org.eclipse.ecf.identity_ ecf/eclipse/plugins/org.eclipse.ecf.identity_*.jar
-%_symlink org.eclipse.ecf.filetransfer_ ecf/eclipse/plugins/org.eclipse.ecf.filetransfer_*.jar
-%_symlink org.eclipse.ecf.provider.filetransfer.httpclient_ ecf/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_*.jar
-%_symlink org.eclipse.ecf.provider.filetransfer.httpclient.ssl_ ecf/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_*.jar
-%_symlink org.eclipse.ecf.provider.filetransfer.ssl_ ecf/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.ssl_*.jar
-%_symlink org.eclipse.ecf.provider.filetransfer_ ecf/eclipse/plugins/org.eclipse.ecf.provider.filetransfer_*.jar
-%_symlink org.eclipse.ecf.ssl_ ecf/eclipse/plugins/org.eclipse.ecf.ssl_*.jar
-%_symlink org.eclipse.emf.common_ emf/eclipse/plugins/org.eclipse.emf.common_*.jar
-%_symlink org.eclipse.emf.ecore.change_ emf/eclipse/plugins/org.eclipse.emf.ecore.change_*.jar
-%_symlink org.eclipse.emf.ecore_ emf/eclipse/plugins/org.eclipse.emf.ecore_*.jar
-%_symlink org.eclipse.emf.ecore.xmi_ emf/eclipse/plugins/org.eclipse.emf.ecore.xmi_*.jar
-%_symlink org.eclipse.jetty.util_ jetty/jetty-util.jar
-%_symlink org.eclipse.jetty.server_ jetty/jetty-server.jar
-%_symlink org.eclipse.jetty.http_ jetty/jetty-http.jar
-%_symlink org.eclipse.jetty.continuation_ jetty/jetty-continuation.jar
-%_symlink org.eclipse.jetty.io_ jetty/jetty-io.jar
-%_symlink org.eclipse.jetty.security_ jetty/jetty-security.jar
-%_symlink org.eclipse.jetty.servlet_ jetty/jetty-servlet.jar
-%_symlink org.glassfish.web.javax.servlet.jsp_ glassfish-jsp.jar
-%_symlink org.sat4j.core_ org.sat4j.core.jar
-%_symlink org.sat4j.pb_ org.sat4j.pb.jar
-%_symlink org.w3c.css.sac_ sac.jar
-%_symlink org.w3c.dom.svg_ xml-commons-apis-ext.jar
-
-#also within ant
-cd org.apache.ant_*
- pushd lib
- rm *
- ln -s %{_javadir}/ant/ant-antlr.jar
- ln -s %{_javadir}/ant/ant-apache-bcel.jar
- ln -s %{_javadir}/ant/ant-apache-bsf.jar
- ln -s %{_javadir}/ant/ant-apache-log4j.jar
- ln -s %{_javadir}/ant/ant-apache-oro.jar
- ln -s %{_javadir}/ant/ant-apache-regexp.jar
- ln -s %{_javadir}/ant/ant-apache-resolver.jar
- ln -s %{_javadir}/ant/ant-apache-xalan2.jar
- ln -s %{_javadir}/ant/ant-commons-logging.jar
- ln -s %{_javadir}/ant/ant-commons-net.jar
- ln -s %{_javadir}/ant/ant-javamail.jar
- ln -s %{_javadir}/ant/ant-jdepend.jar
- ln -s %{_javadir}/ant/ant-jmf.jar
- ln -s %{_javadir}/ant/ant-jsch.jar
- ln -s %{_javadir}/ant/ant-junit.jar
- ln -s %{_javadir}/ant/ant-junit.jar junit4.jar
- ln -s %{_javadir}/ant-launcher.jar
- ln -s %{_javadir}/ant/ant-swing.jar
- ln -s %{_javadir}/ant/ant-testutil.jar
- ln -s %{_javadir}/ant.jar
- popd
-
- pushd bin
- rm *
- ln -s /usr/bin/ant ant
- ln -s /usr/bin/antRun antRun
- ln -s /usr/bin/antRun.pl antRun.pl
- ln -s /usr/bin/runant.pl runant.pl
- ln -s /usr/bin/runant.py runant.py
- ln -s /usr/bin/complete-ant-cmd.pl complete-and-cmd.pl
- popd
-popd
-
-popd
-
-#make a backup
-cp -rf eclipse eclipse-backup-with-jdt
-# go into backup
-pushd eclipse-backup-with-jdt
- ./eclipse -application org.eclipse.equinox.p2.director \
- -repository file:/`pwd`/../../../../../../../../../eclipse.platform.releng.tychoeclipsebuilder/jdtpde/target/repository \
- -installIU org.eclipse.jdt.feature.group
-#exit backup
-popd
-
-mkdir -p jdt/plugins jdt/features
-
-
-#get the difference and copy all files into jdt folder
-for i in `ls eclipse-backup-with-jdt/features` ; do \
- if [ ! -e eclipse/features/$i ]; \
- then cp -r eclipse-backup-with-jdt/features/$i jdt/features ; \
- fi \
-done
-
-for i in `ls eclipse-backup-with-jdt/plugins` ; do \
- if [ ! -e eclipse/plugins/$i ]; \
- then cp -r eclipse-backup-with-jdt/plugins/$i jdt/plugins ; \
- fi \
-done
+ -Dmaven.local.mode=true -Dtycho.local.keepTarget -Dbuilddoc=$((%{bootstrap} != 1)) -Pno-bree-libs
-cp -rf eclipse-backup-with-jdt eclipse-backup-with-jdt-pde
-
-pushd eclipse-backup-with-jdt-pde
- ./eclipse -application org.eclipse.equinox.p2.director \
- -repository file:/`pwd`/../../../../../../../../../eclipse.platform.releng.tychoeclipsebuilder/jdtpde/target/repository \
- -installIU org.eclipse.sdk.feature.group
-popd
-
-mkdir -p sdk/plugins sdk/features
-
-#get the difference and copy all files into pde folder
-for i in `ls eclipse-backup-with-jdt-pde/features` ; do \
- if [ ! -e eclipse-backup-with-jdt/features/$i ]; \
- then cp -r eclipse-backup-with-jdt-pde/features/$i sdk/features ; \
- fi \
-done
-
-for i in `ls eclipse-backup-with-jdt-pde/plugins` ; do \
- if [ ! -e eclipse-backup-with-jdt/plugins/$i ]; \
- then cp -r eclipse-backup-with-jdt-pde/plugins/$i sdk/plugins ; \
- fi \
-done
+#symlink necessary plugins (that are provided by other packages)
+dependencies/./replace_platform_plugins_with_symlinks.sh \
+ eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse
+#ant again
+./dependencies/./fake_ant_dependency.sh \
+ eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse/plugins/org.apache.ant_* %{_javadir} \
+ %{_bindir}
+# JDT and PDE are built as update sites.
+# Initialize them and move into dropins.
+utils/./move_JDT_PDE_to_dropins.sh \
+eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/ \
+`pwd`/eclipse.platform.releng.tychoeclipsebuilder/jdtpde/target/repository
-cp -r jdt sdk eclipse/dropins
+pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse
-
-#clean up
-cd eclipse
-rm -rf configuration/org.eclipse.core.runtime
-rm -rf configuration/org.eclipse.equinox.app
-rm -rf configuration/org.eclipse.update/*
-rm -rf configuration/org.eclipse.osgi
-
-#symlink jdt & sdk
+#in jdt and pde
pushd dropins/jdt/plugins
f=`ls | grep -e "^org.hamcrest.core_"`
rm -f $f
@@ -814,7 +523,6 @@ pushd dropins/jdt/plugins
rm -rf org.junit_4*
ln -s /usr/share/java/junit.jar
popd
-
pushd dropins/sdk/plugins
f=`ls | grep -e "^com.ibm.icu.source_"`
rm $f
@@ -825,13 +533,42 @@ pushd dropins/sdk/plugins
ln -s %{_javadir}/objectweb-asm/asm-all.jar $f
popd
+#clean up
+rm -rf configuration/org.eclipse.core.runtime
+rm -rf configuration/org.eclipse.equinox.app
+rm -rf configuration/org.eclipse.update
+rm -rf configuration/org.eclipse.osgi
+rm -rf p2/org.eclipse.equinox.p2.core/cache/*
+# no icon needed
+rm -f icon.xpm
+#delete all local repositories. We want to have only "original" by default.
+pushd p2/org.eclipse.equinox.p2.engine/.settings
+ sed -i "/repositories\/file/d" *.prefs ../profileRegistry/SDKProfile.profile/.data/.settings/*.prefs
+ sed -i "/repositories\/memory/d" *.prefs ../profileRegistry/SDKProfile.profile/.data/.settings/*.prefs
popd
+#ini file adjustements
+# Temporary fix until https://bugs.eclipse.org/294877 is resolved
+sed -i "s|-Xms40m|-Xms128m|g" eclipse.ini
+sed -i "s|-Xmx384m|-Xmx512m|g" eclipse.ini
+sed -i '1i-preventMasterEclipseLaunch' eclipse.ini
+
+cat << EOF >> eclipse.ini
+ -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
+ -XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding
+ -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=/usr/share/eclipse/dropins
+EOF
+
+popd #eclipse
+
%install
-# We don't need icon.xpm
-# https://bugs.eclipse.org/292472
-rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/icon.xpm
#install icons
install -D eclipse.platform/platform/org.eclipse.platform/eclipse32.png \
@@ -844,6 +581,9 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
ln -s /usr/share/icons/hicolor/256x256/apps/eclipse.png \
$RPM_BUILD_ROOT/usr/share/pixmaps/eclipse.png
+#desktop file
+install -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applications/eclipse.desktop
+
# Some directories we need
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -862,29 +602,12 @@ for i in `ls | grep "profile.gz"` ; do \
sed -i -e "s@${LOCAL_PWD}/eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse@%{_libdir}/eclipse at g" *.profile ; \
gzip *.profile ; \
done
-
-
-
-# TODO: some other paths
popd
-#delete all local repositories. We want to have only "original" by default.
-pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse/p2/org.eclipse.equinox.p2.engine/.settings
- sed -i "/repositories\/file/d" *.prefs ../profileRegistry/SDKProfile.profile/.data/.settings/*.prefs
- sed -i "/repositories\/memory/d" *.prefs ../profileRegistry/SDKProfile.profile/.data/.settings/*.prefs
-popd
-
-#clean cache
-pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse/p2/org.eclipse.equinox.p2.core/cache
- rm -rf *
-popd
-
#installation itself - copy it into right location
rsync -vrpl eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse \
$RPM_BUILD_ROOT%{_libdir}
-#desktop file
-install -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applications/eclipse.desktop
#eclipse compiler
chmod ugo+rx jdtcompilatorscript/efj.sh
@@ -907,50 +630,18 @@ zip "${SWT_JAR}.jar" ${SWT_JAR}/*
popd
ln -s %{_libdir}/%{name}/plugins/"${SWT_JAR}.jar" swt.jar
ln -s %{_libdir}/%{name}/plugins/"${SWT_JAR}.jar" swt-gtk.jar
+ ln -s ../%{name}/swt.jar ../java/swt.jar
popd
#eclipse ini
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/
pushd $RPM_BUILD_ROOT/%{_sysconfdir}/
-ln -s %{_libdir}/%{name}/eclipse.ini
+ ln -s %{_libdir}/%{name}/eclipse.ini
popd
#################################
### End of extraction #
#################################
-
-pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
-rm -rf icon.xpm
-popd
-
-# Temporary fix until https://bugs.eclipse.org/294877 is resolved
-sed -i "s|-Xms40m|-Xms128m|g" $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
-sed -i "s|-Xmx384m|-Xmx512m|g" $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
-echo "" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
-echo "-Dorg.eclipse.swt.browser.UseWebKitGTK=true" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
-echo "-Dhelp.lucene.tokenizer=standard" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
-
-# Prevent running master Eclipse in a shared configuration
-echo "-preventMasterEclipseLaunch" | cat - $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini > /tmp/out && mv -f /tmp/out $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
-
-echo "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
-
-# Deploy installation debug config
-echo -e "org.eclipse.equinox.p2.core/debug=true" > $RPM_BUILD_ROOT%{_libdir}/%{name}/.options
-echo -e "org.eclipse.equinox.p2.core/reconciler=true" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/.options
-
-# SWT JAR symlink in libdir
-pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
-ln -s ../%{name}/swt.jar ../java/swt.jar
-popd
-
# OSGI JAR symlinks in javadir and maven depmaps
pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.osgi_*.jar osgi.jar
@@ -1022,11 +713,11 @@ rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip
rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.bat
pushd $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/plugins
-%_symlink org.easymock_ easymock.jar
-
+rm -rf org.easymock_
rm -rf org.hamcrest.core_*
rm -rf com.junit_*
rm -rf org.junit4_*
+ln -s /usr/share/java/easymock.jar
popd
@@ -1062,7 +753,6 @@ rm -rf %{_bindir}/efj/
%dir %{_libdir}/%{name}/plugins
%{_libdir}/%{name}/notice.html
%{_libdir}/%{name}/eclipse.ini
-%{_libdir}/%{name}/.options
%{_libdir}/%{name}/epl-v10.html
%{_libdir}/%{name}/plugins/org.eclipse.swt_*
%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.*
@@ -1316,6 +1006,9 @@ rm -rf %{_bindir}/efj/
%{_mavendepmapfragdir}/%{name}-equinox-osgi
%changelog
+* Thu Jan 31 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.1.git20121217
+- Update to Kepler.
+
* Fri Jan 25 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.2-0.5.git20121217
- RHBZ#832053: Ship SWT and other native plugins as folders.
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 0124dad..9ae207f 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -3,7 +3,7 @@
rm -rf R4_platform-aggregator
rm eclipse-source.tar.bz2
-git clone -b R4_2_maintenance --recurse-submodules git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git R4_platform-aggregator
+git clone --recurse-submodules git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git R4_platform-aggregator
pushd R4_platform-aggregator
diff --git a/sources b/sources
index 91610c1..45a1f5c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-841919f98ced4d5c7df6496d09761c37 eclipse-source.tar.bz2
-102b0b7d9be171c8402dbf315b5e01b4 eclipse-build-7a327b17de5f606f47cba6b74e64619520186b7a.tar.xz
+be15c4f75e20fb30b4aaa6d3354b7683 eclipse-source.tar.bz2
+a2af33268ed29486706e3701163b59d7 eclipse-build-5d6f586d503faf96dc0397915882dbd9ca180b7e.tar.xz
More information about the scm-commits
mailing list