Rebuild to pick latest deps.

rebuild to pick latest deps
Add _libdir/swt.jar back.
2013-12-16 08:41:54 +02:00 · 2013-07-01 14:36:29 +02:00 · 2013-03-20 20:23:26 +01:00 · 2013-03-15 09:30:32 +01:00 · 2013-03-04 15:00:28 +01:00 · 2013-03-01 14:59:57 +01:00
23 changed files with 2461 additions and 572 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,4 @@
 eclipse-*-src.tar.bz2
-eclipse-build-*
 *.rpm
 eclipse-build-db208c33d1a67591d17b02148ae7948fd178a80d.tar.xz
 eclipse-build-eb76edf3fb5bbeb115c59d1b076f4821a6d47d74.tar.xz
@ -25,3 +24,9 @@ eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz
 /eclipse-jdtpdeupdatesite.tar.bz2
 /x86_64
 /org.eclipse.linuxtools.eclipse-build-701400b0ca475ea73bd828c66b00fb63c5ec2c8c.tar.bz2
+/eclipse-build-621c5c36be5ab2d5f36b2b1434164532b74f779f.tar.xz
+/results_eclipse
+/eclipse-build-06227d455145aad68156ca408ce96a26beae4714.tar.xz
+/eclipse-build-264db10bec789532541d16baaa8889e4db52298d.tar.xz
+/eclipse-build-094a56b8b1222d3535f5dada20290dc91f14d102.tar.xz
+/eclipse-build-7a327b17de5f606f47cba6b74e64619520186b7a.tar.xz
--- a/eclipse-adjust-p2-server-dependencies.patch
+++ b/eclipse-adjust-p2-server-dependencies.patch
@ -0,0 +1,60 @@
+--- rt.equinox.bundles/features/org.eclipse.equinox.server.p2/pom.xml.bak	2012-09-18 12:45:36.000000000 +0200
+++ rt.equinox.bundles/features/org.eclipse.equinox.server.p2/pom.xml	2012-09-18 13:01:43.713664595 +0200
+@@ -35,7 +35,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>
+--- 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>
+--- rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/pom.xml.bak	2012-09-18 13:13:25.000000000 +0200
+++ rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/pom.xml	2012-09-18 13:29:57.556939493 +0200
+@@ -35,12 +35,7 @@
+               <requirement>
+                 <type>eclipse-plugin</type>
+                 <id>org.apache.commons.logging</id>
+-                <versionRange>[1.0,1.1)</versionRange>
+-              </requirement>
+-              <requirement>
+-                <type>eclipse-plugin</type>
+-                <id>org.apache.commons.logging.source</id>
+-                <versionRange>[1.0,1.1)</versionRange>
+                <versionRange>[1.0,1.2)</versionRange>
+               </requirement>
+             </extraRequirements>
+           </dependency-resolution>
+--- eclipse.platform.releng/features/master-equinox/pom.xml.bak	2012-09-18 13:31:23.000000000 +0200
+++ eclipse.platform.releng/features/master-equinox/pom.xml	2012-09-18 13:46:19.266892018 +0200
+@@ -38,7 +38,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> 
+--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak	2012-09-18 13:47:20.000000000 +0200
+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml	2012-09-18 13:54:41.142892715 +0200
+@@ -48,7 +48,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>
--- a/eclipse-build-filesystem-native-libs.patch
+++ b/eclipse-build-filesystem-native-libs.patch
@ -0,0 +1,142 @@
+--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x86/pom.xml
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x86/pom.xml
+@@ -45,4 +45,66 @@
+       </plugin>
+     </plugins>
+   </build>
+
+  <profiles>
+    <profile>
+      <id>build-natives</id>
+      <activation>
+        <property>
+          <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+          <name>native</name>
+          <value>gtk.linux.x86</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+                <id>natives</id>
+                <phase>process-resources</phase>
+                <configuration>
+                  <target>
+                    <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
+           <copy todir="os/linux/x86" >
+           <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
+               <include name="libunixfile_*.so"/>
+           </fileset>
+           </copy>
+                  </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>
+  </profiles>
+ </project>
+--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x86_64/pom.xml
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x86_64/pom.xml
+@@ -45,4 +45,67 @@
+       </plugin>
+     </plugins>
+   </build>
+
+  <profiles>
+    <profile>
+      <id>build-natives</id>
+      <activation>
+        <property>
+          <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+          <name>native</name>
+          <value>gtk.linux.x86_64</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+                <id>natives</id>
+                <phase>process-resources</phase>
+                <configuration>
+                  <target>
+                    <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
+           <mkdir dir="os/linux/x86_64/"/>
+           <copy todir="os/linux/x86_64/" >
+           <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
+               <include name="libunixfile_*.so"/>
+           </fileset>
+           </copy>
+                  </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>
+  </profiles>
+ </project>
+-- 
+1.7.10.4
+
--- a/eclipse-build-network-native-libs.patch
+++ b/eclipse-build-network-native-libs.patch
@ -0,0 +1,146 @@
+--- eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/pom.xml
+++ eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/pom.xml
+@@ -42,4 +42,65 @@
+     </plugins>
+   </build>
+ 
+  <profiles>
+    <profile>
+      <id>build-natives</id>
+      <activation>
+        <property>
+          <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+          <name>native</name>
+          <value>gtk.linux.x86</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+                <id>natives</id>
+                <phase>process-resources</phase>
+                <configuration>
+                  <target>
+                    <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/>
+           <copy todir="." >
+           <fileset dir="../../natives/unix/linux/">
+               <include name="libgnomeproxy-*.so"/>
+           </fileset>
+           </copy>
+                  </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>
+  </profiles>
+ </project>
+--- eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml
+++ eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml
+@@ -43,4 +43,66 @@
+       </plugin>
+     </plugins>
+   </build>
+
+  <profiles>
+    <profile>
+      <id>build-natives</id>
+      <activation>
+        <property>
+          <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+          <name>native</name>
+          <value>gtk.linux.x86_64</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+                <id>natives</id>
+                <phase>process-resources</phase>
+                <configuration>
+                  <target>
+                    <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/>
+           <copy todir="." >
+           <fileset dir="../../natives/unix/linux/">
+               <include name="libgnomeproxy-*.so"/>
+           </fileset>
+           </copy>
+                  </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>
+  </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>
--- a/eclipse-change-build-packagings.patch
+++ b/eclipse-change-build-packagings.patch
@ -1,48 +1,53 @@
--- pom.xml.bak	2012-08-28 09:57:16.432181359 +0200
-+++ pom.xml	2012-08-28 09:58:00.791440793 +0200
-@@ -49,10 +49,13 @@
+--- 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>TMP/org.eclipse.sdk.epp</module>
-+    <module>TMP/jdtpde</module>
-+    
-     <module>TMP/eclipse-junit-tests</module>
-   </modules>
- </project>
--- TMP/org.eclipse.sdk.epp/pom.xml.bak	2012-08-28 09:35:00.000000000 +0200
-+++ TMP/org.eclipse.sdk.epp/pom.xml	2012-08-28 10:02:35.739112336 +0200
-@@ -46,7 +46,7 @@
+     <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 @@
               <profile>SDKProfile</profile>
               <products>
                 <product>
-                  <id>org.eclipse.sdk.epp</id>
+-                  <id>org.eclipse.platform.ide</id>
 +                  <id>org.fedoraproject.eclipse.platform</id>
                   <rootFolder>eclipse</rootFolder>
                 </product>
               </products>
--- TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product.bak	2012-08-28 10:04:10.214701605 +0200
-+++ TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product	2012-08-28 10:04:29.568822865 +0200
+              <!--source>repository</source-->
+             </configuration>
+           </execution>
+           <execution>
+--- 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product uid="org.eclipse.sdk.epp" name="Eclipse SDK" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.2.0.qualifier" useFeatures="true" includeLaunchers="true">
-+<product uid="org.fedoraproject.eclipse.platform" name="Eclipse SDK" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.2.0.qualifier" useFeatures="true" includeLaunchers="true">
+-<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">
 
    <configIni use="default">
    </configIni>
-@@ -159,7 +159,8 @@
-    </plugins>
- 
-    <features>
-      <feature id="org.eclipse.sdk"/>
-+      <feature id="org.eclipse.platform"/>
-+      <feature id="org.eclipse.cvs"/>
+@@ -159,6 +159,7 @@
+       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.equinox.p2.user.ui"/>
-       <!--
       <feature id="org.eclipse.rcp.configuration"/>
+      <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 @@
+     <module>rcp.config</module>
+     <module>rcp.sdk</module>
+     <module>sdk</module>
+    <module>jdtpde</module>
+   </modules>
+ </project>
--- a/eclipse-debug-symbols.patch
+++ b/eclipse-debug-symbols.patch
@ -0,0 +1,35 @@
+--- 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 @@
+ WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
+ GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
+ 
+-CFLAGS = -O -Wall \
+CFLAGS = -g -O -Wall \
+ 		-DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
+ 		-DLINUX -DGTK \
+@@ -116,12 +116,6 @@
+ 		${SWT_PTR_CFLAGS}
+ LFLAGS = -shared -fPIC ${SWT_LFLAGS}
+ 
+-ifndef NO_STRIP
+-	AWT_LFLAGS := $(AWT_LFLAGS) -s
+-	MOZILLALFLAGS := $(MOZILLALFLAGS) -s
+-	LFLAGS := $(LFLAGS) -s
+-endif
+-
+ 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\""
+ LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic 
+-CFLAGS = ${M_ARCH} -g -s -Wall\
+CFLAGS = ${M_ARCH} -g -Wall\
+ 	-fpic \
+ 	-DLINUX \
+ 	-DMOZILLA_FIX \
--- a/eclipse-drop-user-profile-on-platform-change.patch
+++ b/eclipse-drop-user-profile-on-platform-change.patch
@ -1,32 +0,0 @@
--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java
-@@ -100,7 +100,10 @@
- 				URL userConfigURL = userConfig.toURL();
- 				List userBundles = SimpleConfiguratorUtils.readConfiguration(userConfigURL, base);
- 
-				return (userBundles.containsAll(sharedBundles)) ? userConfigURL : sharedConfigURL;
-+				boolean useUserConfigArea = userBundles.containsAll(sharedBundles);
-+				System.setProperty("org.eclipse.equinox.simpleconfigurator.shared.useUser", "" + System.currentTimeMillis());
-+
-+				return useUserConfigArea ? userConfigURL : sharedConfigURL;
- 			}
- 		} catch (MalformedURLException e) {
- 			return null;
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
-@@ -236,8 +236,14 @@
- 		if (SELF.equals(id))
- 			id = self;
- 		Profile profile = getProfileMap().get(id);
-		if (profile == null && self != null && self.equals(id))
-+		String s = System.getProperty("org.eclipse.equinox.simpleconfigurator.shared.useUser");
-+		if (s != null && profile != null && (profile.getTimestamp() < new Long(s))) {
-+			profile = null;
-+		}
-+		if (profile == null && self != null && self.equals(id)) {
- 			profile = createSurrogateProfile(id);
-+			
-+		}
- 
- 		return profile;
- 	}
--- a/eclipse-explicit-jdt-in-platform.patch
+++ b/eclipse-explicit-jdt-in-platform.patch
@ -0,0 +1,14 @@
+--- 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
--- a/eclipse-fix-compatibility-class.patch
+++ b/eclipse-fix-compatibility-class.patch
@ -1,10 +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,58 @@
-   <artifactId>org.eclipse.core.runtime.compatibility.registry</artifactId>
-   <version>3.5.100-SNAPSHOT</version>
-   <packaging>eclipse-plugin</packaging>
-+  
+--- eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml.bak	2013-02-20 13:23:25.000000000 +0100
+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml	2013-02-20 13:54:06.484832003 +0100
+@@ -30,4 +30,57 @@
+       </resource>
+     </resources>
+   </build>
 +  <profiles>
 +  <profile>
 +    <activation>
@ -20,7 +19,7 @@
 +            <executions>
 +              <execution>
 +                <id>natives</id>
-+                <phase>process-resources</phase>
+                <phase>generate-resources</phase>
 +                <configuration>
 +                  <target>
 +                    <copy todir="classes/org/eclipse/core/runtime" file="../org.eclipse.core.runtime/target/classes/org/eclipse/core/runtime/IPluginDescriptor.class"/>
--- a/eclipse-fix-master-equinox.patch
+++ b/eclipse-fix-master-equinox.patch
@ -1,235 +1,47 @@
--- eclipse.platform.releng/features/master-equinox/feature.xml.bak	2012-07-25 17:26:52.000000000 +0200
-+++ eclipse.platform.releng/features/master-equinox/feature.xml	2012-07-27 14:02:59.042494959 +0200
-@@ -7,173 +7,153 @@
-    <includes
-          id="org.eclipse.equinox.sdk"
-          version="0.0.0"/>
-           
-    <plugin
-+
-+   <includes
-+         id="org.eclipse.equinox.starterkit.product.feature"
-+         version="0.0.0"/>
-+
-+   <includes
-+         id="org.eclipse.pde.build.product.feature"
-+         version="0.0.0"/>
-+
-+   <plugin
-          id="org.eclipse.equinox.supplement"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-         unpack="false"/>                         
-         
-    <plugin
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.eclipse.equinox.http.registry"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-         unpack="false"/> 
-             
-    <plugin
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.eclipse.equinox.http.jetty"
-          download-size="0"
-          install-size="0"
-         version="0.0.0" 
-         unpack="false"/> 
-           
-    <plugin
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.eclipse.equinox.http.servlet"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
-         
-    <plugin
-         id="org.eclipse.equinox.http.servletbridge"         	
-+
-+   <plugin
-+         id="org.eclipse.equinox.http.servletbridge"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
-         
-    <plugin
-         id="org.eclipse.equinox.servletbridge"         	
-+
-+   <plugin
-+         id="org.eclipse.equinox.servletbridge"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
-                                    
-    <plugin
-+
-+   <plugin
-          id="javax.servlet"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-         unpack="false"/>        
-     
-    <plugin
-+         unpack="false"/>
-+
-+   <plugin
-          id="javax.el"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-         unpack="false"/> 
-        
-    <plugin
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.apache.commons.logging"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-         unpack="false"/>        
-   
-    <plugin
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.eclipse.jetty.continuation"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-         unpack="false"/>   
-    
-     <plugin
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.eclipse.jetty.http"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-         unpack="false"/>   
-    
-     <plugin
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.eclipse.jetty.io"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
-    
-    <plugin
-+
-+   <plugin
-          id="org.eclipse.jetty.security"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
- 
-    <plugin
-+   <plugin
-          id="org.eclipse.jetty.server"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
- 
-<plugin
-+   <plugin
-          id="org.eclipse.jetty.servlet"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
- 
-<plugin
-+   <plugin
-          id="org.eclipse.jetty.util"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
-    
-    <plugin
-+
-+   <plugin
-          id="org.apache.felix.gogo.runtime"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-         unpack="false"/>      
-      
-+         unpack="false"/>
-+
+--- eclipse.platform.releng/features/master-equinox/feature.xml.orig	2012-12-17 15:17:55.000000000 +0100
+++ eclipse.platform.releng/features/master-equinox/feature.xml	2012-12-18 09:50:45.413972005 +0100
+@@ -128,13 +128,13 @@
+          unpack="false"/>      
+       
    <plugin
 -         id="org.slf4j.api"
 +         id="slf4j.api"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>       
-         
+          unpack="false"/>       
+          
 -    <plugin
-+         unpack="false"/>
-+
-+   <plugin
+    <!--plugin
          id="org.apache.mina.core"
          download-size="0"
          install-size="0"
-          version="0.0.0"
-         unpack="false"/> 
-      
-    <plugin
-         id="org.apache.sshd.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-          unpack="false"/>
-         
-     <plugin
-         id="org.apache.jasper.glassfish"
-+
-+   <plugin
-+         id="org.apache.sshd.core"
+@@ -146,10 +146,10 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-          unpack="false"/>
- 
- <!-- see bug 368488 and bug 377314           
+-         unpack="false"/>
+         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"
+@@ -160,13 +160,13 @@
+          id="master-equinox-p2"
+          version="0.0.0"/>        
+  -->         
 - <includes
-         id="master-equinox-p2"
-         version="0.0.0"/>        
- -->         
- <includes
-         id="master-equinox-weaving"
-         version="0.0.0"/>
-         
- <includes
-         id="org.eclipse.equinox.weaving.sdk"
+ <!--includes //no weaving for e-b
+          id="master-equinox-weaving"
+          version="0.0.0"/>
+          
+  <includes
+          id="org.eclipse.equinox.weaving.sdk"
 -         version="0.0.0"/>    
+         version="0.0.0"/-->    
 
- <includes
-         id="org.eclipse.equinox.starterkit.product.feature"
-         version="0.0.0"/>      
-    
- <includes
-         id="org.eclipse.pde.build.product.feature"
-         version="0.0.0"/>
-                  
- </feature>
+  <includes
+          id="org.eclipse.equinox.starterkit.product.feature"
--- a/eclipse-fix-sshd-id.patch
+++ b/eclipse-fix-sshd-id.patch
@ -1,16 +0,0 @@
--- rt.equinox.incubator/console/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF.bak	2012-07-26 16:40:00.000000000 +0200
-+++ rt.equinox.incubator/console/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF	2012-07-26 16:40:17.896441807 +0200
-@@ -5,4 +5,4 @@
- Bundle-Version: 1.0.0.qualifier
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- DynamicImport-Package: org.eclipse.equinox.console.jaas
-Fragment-Host: org.apache.sshd.core;bundle-version="0.5.0"
-+Fragment-Host: org.apache.sshd.core
--- rt.equinox.bundles/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF.bak	2012-07-25 17:41:27.000000000 +0200
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF	2012-07-27 09:17:27.641681636 +0200
-@@ -7,4 +7,4 @@
- Bundle-Version: 1.0.0.qualifier
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- DynamicImport-Package: org.eclipse.equinox.console.jaas
-Fragment-Host: org.apache.sshd.core;bundle-version="0.5.0"
-+Fragment-Host: org.apache.sshd.core
--- a/eclipse-help-feature-adjust-dependencies.patch
+++ b/eclipse-help-feature-adjust-dependencies.patch
@ -52,58 +52,40 @@ diff -r -Nu eclipse-3.8.0-M1-src/plugins/org.eclipse.help.base/META-INF/MANIFEST
  org.eclipse.ant.core;bundle-version="3.2.200";resolution:=optional,
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.help;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
--- eclipse.platform.ua/org.eclipse.help.base/pom.xml.bak	2012-07-25 17:39:10.000000000 +0200
-+++ eclipse.platform.ua/org.eclipse.help.base/pom.xml	2012-07-26 14:34:22.971863419 +0200
-@@ -33,7 +33,7 @@
-             <extraRequirements>
-               <requirement>
-                 <type>eclipse-plugin</type>
-                <id>org.apache.lucene</id>
-+                <id>org.apache.lucene.core</id>
-                 <versionRange>[2.9,3.0)</versionRange>
-               </requirement>
-               <requirement>
--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak	2012-07-25 17:26:52.000000000 +0200
-+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml	2012-07-27 14:39:44.824536490 +0200
-@@ -37,7 +37,7 @@
+--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.orig	2012-09-17 15:30:40.000000000 +0200
+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml	2012-09-18 11:49:09.843325313 +0200
+@@ -37,13 +37,13 @@
             <extraRequirements> 
               <requirement> 
                 <type>eclipse-plugin</type> 
 -                <id>org.apache.lucene</id> 
-+                <id>org.apache.lucene.core</id> 
-                 <versionRange>[2.9,3.0)</versionRange> 
-               </requirement>
-               <requirement>
--- eclipse.platform.ua/org.eclipse.help.base/pom.xml.bak	2012-08-28 09:32:59.754115174 +0200
-+++ eclipse.platform.ua/org.eclipse.help.base/pom.xml	2012-08-28 09:28:24.281350613 +0200
-@@ -34,12 +34,12 @@
-               <requirement>
-                 <type>eclipse-plugin</type>
-                 <id>org.apache.lucene.core</id>
-                <versionRange>[2.9,3.0)</versionRange>
-+                <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>
-             </extraRequirements>
-           </dependency-resolution>
--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak   2012-08-28 09:30:36.530197639 +0200
-+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml   2012-08-28 09:28:24.276350580 +0200
-@@ -38,12 +38,12 @@
-               <requirement> 
-                 <type>eclipse-plugin</type> 
-                 <id>org.apache.lucene.core</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>
+--- eclipse.platform.ua/pom.xml.bak	2012-09-18 12:21:35.000000000 +0200
+++ eclipse.platform.ua/pom.xml	2012-09-18 12:35:35.157870857 +0200
+@@ -49,13 +49,13 @@
+             <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>
             </extraRequirements>
--- a/eclipse-improve-core-net-makefile.patch
+++ b/eclipse-improve-core-net-makefile.patch
@ -0,0 +1,77 @@
+--- eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/makefile.orig	2012-10-01 11:49:37.000000000 +0200
+++ eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/makefile	2012-10-19 14:44:01.556024807 +0200
+@@ -1,5 +1,5 @@
+ #**********************************************************************
+-# Copyright (c) 2008, 2010 Oakland Software Incorporated and others.
+# Copyright (c) 2008, 2012 Oakland Software Incorporated and others.
+ # All rights reserved. This program and the accompanying materials 
+ # are made available under the terms of the Eclipse Public License v1.0
+ # which accompanies this distribution, and is available at
+@@ -20,11 +20,11 @@
+ 
+ OS_TYPE = linux
+ JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
+-INCLUDE = -I/usr/include/gconf/2/ -I/usr/include/orbit-2.0/ -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/
+-COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32
+INCLUDE = `pkg-config --cflags gconf-2.0`
+COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 ${TARGET_ENVIRONMENT}
+ 
+-LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0
+-LINKER_FLAGS= -m32
+LIBS := `pkg-config --libs gconf-2.0`
+LINKER_FLAGS= ${TARGET_ENVIRONMENT}
+ 
+ all: link
+ 
+--- eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/x86_64/makefile	2012-10-01 11:49:37.000000000 +0200
+++ /dev/null	2012-10-13 13:36:07.457201187 +0200
+@@ -1,48 +0,0 @@
+-#**********************************************************************
+-# Copyright (c) 2008, 2010 Oakland Software Incorporated and others.
+-# All rights reserved. This program and the accompanying materials 
+-# are made available under the terms of the Eclipse Public License v1.0
+-# which accompanies this distribution, and is available at
+-# http://www.eclipse.org/legal/epl-v10.html
+-#
+-# Contributors:
+-#	Oakland Software Incorporated - initial submission
+-#	IBM Corporation - refactoring, bug 245849
+-#	Tristan Tarrant - x86_64 support, bug 273072
+-#
+-#********************************************************************** 
+-#
+-# makefile for libgnomeproxy-1.0.0.so
+-
+-GNOMEPROXY.C = ../../gnomeproxy.c
+-GNOMEPROXY.O = gnomeproxy.o
+-LIB_NAME = gnomeproxy.so
+-LIB_NAME_FULL = libgnomeproxy-1.0.0.so
+-
+-OS_TYPE = 
+-JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
+-INCLUDE = `pkg-config --cflags gconf-2.0`
+-COMPILER_FLAGS= -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m64
+-
+-LIBS := `pkg-config --libs gconf-2.0`
+-LINKER_FLAGS= -m64
+-
+-all: link
+-
+-compile:
+-	@echo "Building file: $(GNOMEPROXY.O)"
+-	@echo "Invoking: GCC C Compiler"
+-	gcc $(INCLUDE) $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C)
+-	@echo "Finished building: $(GNOMEPROXY.O)"
+-	@echo " "
+-
+-link: compile
+-	@echo "Building target: $(LIB_NAME_FULL)"
+-	@echo "Invoking: GCC C Linker"
+-	gcc $(LINKER_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(LIBS) $(GNOMEPROXY.O) -lc
+-	@echo "Finished building target: $(LIB_NAME_FULL)"
+-	@echo " "
+-
+-clean:
+-	-$(RM) $(GNOMEPROXY.O) $(LIB_NAME_FULL)
+-	-@echo " "
+\ No newline at end of file
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@ -443,15 +443,15 @@
 --- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.bak	2012-07-25 17:40:44.000000000 +0200
 +++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml	2012-07-30 16:28:44.017838079 +0200
@@ -67,6 +67,12 @@
-                 <plugin id="org.eclipse.swt.gtk.aix.ppc" />
-                 <plugin id="org.eclipse.swt.gtk.aix.ppc64" />
-                 <plugin id="org.eclipse.swt.gtk.hpux.ia64_32" />
+                 <plugin id="org.w3c.css.sac" />
+                 <plugin id="org.w3c.dom.smil" />
+                 <plugin id="org.w3c.dom.svg" />
 +
 +		<plugin id="org.w3c.dom.svg" /><plugin id="org.apache.batik.css"/><plugin id="org.apache.batik.util"/>
 +		<plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" /><plugin id="org.apache.batik.util.gui"/>
 +		<plugin id=" org.apache.felix.gogo.command" /><plugin id="javax.inject"/>
 +		<plugin id="org.apache.felix.gogo.runtime" /><plugin id="org.w3c.css.sac"/>
-+		<plugin id="org.apache.felix.gogo.shell" />
+		<plugin id="org.apache.felix.gogo.shell" /><plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc"/><plugin id="org.eclipse.equinox.launcher.gtk.linux.arm"/>
               </excludes>
             </configuration>
           </execution>
@ -488,7 +488,7 @@
 +                <plugin id="org.apache.tomcat" /><plugin id="org.eclipse.jetty.continuation" /><plugin id="org.eclipse.jetty.http" />
 +                <plugin id="org.apache.juli" /><plugin id="org.eclipse.jetty.io" /><plugin id="org.eclipse.jetty.security" />
 +                <plugin id="org.eclipse.jetty.util" /><plugin id="org.eclipse.jetty.server" />
-+                <plugin id="org.apache.jasper" /><plugin id="org.eclipse.jetty.servlet" />
+                <plugin id="org.glassfish.web.javax.servlet.jsp" /><plugin id="org.eclipse.jetty.servlet" />
 +                <plugin id="org.apache.commons.el" /><plugin id="org.glassfish.web.javax.servlet.jsp" />
 +              </excludes>
 +            </configuration>
@ -502,7 +502,7 @@
                 <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.apache.ant"/><plugin id="org.eclipse.core.filesystem.linux.ppc"/><plugin id="org.eclipse.core.filesystem.linux.ppc64"/><plugin id="org.eclipse.core.filesystem.linux.arm"/><plugin id="org.eclipse.core.filesystem.linux.s390"/><plugin id="org.eclipse.core.filesystem.linux.s390x"/>
               </excludes>
             </configuration>
           </execution>
--- a/eclipse-osgi-serverside-patch-additional-imports.patch
+++ b/eclipse-osgi-serverside-patch-additional-imports.patch
@ -6,7 +6,7 @@
          unpack="false"/>
 +
 +  <plugin
-+         id="org.apache.jasper"
+         id="org.glassfish.web.javax.servlet.jsp"
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
--- a/eclipse-remove-jaas.patch
+++ b/eclipse-remove-jaas.patch
@ -0,0 +1,72 @@
+--- rt.equinox.incubator/console/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF.bak	2012-07-26 16:40:00.000000000 +0200
+++ rt.equinox.incubator/console/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF	2012-07-26 16:40:17.896441807 +0200
+@@ -5,4 +5,4 @@
+ Bundle-Version: 1.0.0.qualifier
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ DynamicImport-Package: org.eclipse.equinox.console.jaas
+-Fragment-Host: org.apache.sshd.core;bundle-version="0.5.0"
+Fragment-Host: org.apache.sshd.core
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF.bak	2012-07-25 17:41:27.000000000 +0200
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF	2012-07-27 09:17:27.641681636 +0200
+@@ -7,4 +7,4 @@
+ Bundle-Version: 1.0.0.qualifier
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ DynamicImport-Package: org.eclipse.equinox.console.jaas
+-Fragment-Host: org.apache.sshd.core;bundle-version="0.5.0"
+Fragment-Host: org.apache.sshd.core
+--- rt.equinox.framework/features/org.eclipse.equinox.core.sdk/feature.xml.bak	2012-09-07 14:34:00.000000000 +0200
+++ rt.equinox.framework/features/org.eclipse.equinox.core.sdk/feature.xml	2012-09-07 14:42:44.111687873 +0200
+@@ -340,13 +340,13 @@
+          version="0.0.0"
+          unpack="false"/>
+ 
+-   <plugin
+   <!--plugin
+          id="org.eclipse.equinox.console.jaas.fragment"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          fragment="true"
+-         unpack="false"/>
+         unpack="false"/-->
+ 
+    <plugin
+          id="org.apache.felix.gogo.command"
+@@ -369,7 +369,7 @@
+          version="0.0.0"
+          unpack="false"/>
+ 
+-   <plugin
+   <!--plugin
+          id="org.apache.mina.core"
+          download-size="0"
+          install-size="0"
+@@ -381,7 +381,7 @@
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>
+         unpack="false"/-->
+ 
+    <plugin
+          id="org.eclipse.equinox.bidi"
+--- rt.equinox.framework/features/org.eclipse.equinox.core.sdk/feature.xml.bak	2012-09-07 17:38:22.000000000 +0200
+++ rt.equinox.framework/features/org.eclipse.equinox.core.sdk/feature.xml	2012-09-07 17:46:04.368180213 +0200
+@@ -326,7 +326,7 @@
+          version="0.0.0"
+          unpack="false"/>
+ 
+-   <plugin
+   <!--plugin
+          id="org.eclipse.equinox.console.ssh"
+          download-size="0"
+          install-size="0"
+@@ -338,7 +338,7 @@
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>
+         unpack="false"/-->
+ 
+    <!--plugin
+          id="org.eclipse.equinox.console.jaas.fragment"
--- a/eclipse-remove-jgit-provider.patch
+++ b/eclipse-remove-jgit-provider.patch
@ -1,22 +1,33 @@
--- eclipse-parent/pom.xml.bak	2012-08-09 16:08:45.000000000 +0200
-+++ eclipse-parent/pom.xml	2012-08-09 16:10:22.504134998 +0200
-@@ -165,19 +165,9 @@
-           <groupId>org.eclipse.tycho</groupId>
+--- eclipse-parent/pom.xml.orig	2012-12-17 15:03:11.000000000 +0100
+++ eclipse-parent/pom.xml	2012-12-18 10:01:03.641488185 +0100
+@@ -207,7 +207,7 @@
           <artifactId>tycho-packaging-plugin</artifactId>
           <version>${tycho.version}</version>
-          <dependencies>
+           <dependencies>
 -            <dependency>
-              <groupId>org.eclipse.tycho.extras</groupId>
-              <artifactId>tycho-buildtimestamp-jgit</artifactId>
-              <version>${tycho-extras.version}</version>
+            <!-- dependency>
+               <groupId>org.eclipse.tycho.extras</groupId>
+               <artifactId>tycho-buildtimestamp-jgit</artifactId>
+               <version>${tycho-extras.version}</version>
+@@ -216,18 +216,18 @@
+               <groupId>org.eclipse.tycho.extras</groupId>
+               <artifactId>tycho-sourceref-jgit</artifactId>
+               <version>${tycho-extras.version}</version>
 -            </dependency>
-          </dependencies>
+            </dependency -->
+           </dependencies>
           <configuration>
             <strictBinIncludes>false</strictBinIncludes>
             <format>'v'yyyyMMdd-HHmm</format>
 -            <timestampProvider>jgit</timestampProvider>
-            <jgit.ignore>
-            </jgit.ignore>
+            <!--timestampProvider>jgit</timestampProvider>
+             <jgit.ignore>
+ 		pom.xml
+             </jgit.ignore>
+             <sourceReferences>
+               <generate>true</generate>
+-            </sourceReferences>
+            </sourceReferences -->
           </configuration>
         </plugin>
         <plugin>
--- a/eclipse-remove-tomcat6.patch
+++ b/eclipse-remove-tomcat6.patch
@ -0,0 +1,391 @@
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.http/pom.xml.bak	2012-09-06 16:02:03.000000000 +0200
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http/pom.xml	2012-09-07 11:37:32.943823238 +0200
+@@ -41,19 +41,6 @@
+               <removeAll />
+             </filter>
+           </filters>
+-          <dependency-resolution>
+-            <extraRequirements>
+-              <!--
+-                new methods were introduced in ServletContext and possibly other interfaces implemented by this bundle
+-                in javax.servlet 3.0. Because of this we need to make sure to compile against earlier version.  
+-              -->
+-              <requirement>
+-                <type>eclipse-plugin</type>
+-                <id>javax.servlet</id>
+-                <versionRange>[2.4.0,2.6.0)</versionRange>
+-              </requirement>
+-            </extraRequirements>
+-          </dependency-resolution>
+         </configuration>
+       </plugin>
+     </plugins>
+diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF rt.equinox.bundles/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF
+index 8b76fdc..b730678 100644
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF
+@@ -1,18 +1,19 @@
+ Bundle-ManifestVersion: 2
+ Bundle-Vendor: %bundleVendor
+-Bundle-Version: 1.0.500.qualifier
+Bundle-Version: 1.0.500.qualifier
+ Bundle-Activator: org.eclipse.equinox.http.Activator
+ Bundle-SymbolicName: org.eclipse.equinox.http
+ Bundle-Name: %bundleName
+-Import-Package: javax.servlet,
+Import-Package: javax.net;resolution:=optional,
+ javax.servlet,
+ javax.servlet.descriptor,
+  javax.servlet.http,
+- javax.net; resolution:="optional",
+ org.eclipse.osgi.util,
+  org.osgi.framework;version="1.0",
+  org.osgi.service.cm;version="1.0",
+  org.osgi.service.http;version="[1.2,1.3)",
+  org.osgi.service.log;version="1.0",
+- org.osgi.util.tracker;version="1.1",
+- org.eclipse.osgi.util
+ org.osgi.util.tracker;version="1.1"
+ Export-Package: org.eclipse.equinox.http;x-internal:=true,
+  org.eclipse.equinox.http.servlet;x-internal:=true,
+  org.eclipse.equinox.socket;x-internal:=true,
+diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java
+index d1520e0..3b5788c 100644
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 1999, 2009 IBM Corporation and others.
+ * Copyright (c) 1999, 2012 IBM Corporation and others.
+  * All rights reserved. This program and the accompanying materials
+  * are made available under the terms of the Eclipse Public License v1.0
+  * which accompanies this distribution, and is available at
+@@ -7,14 +7,14 @@
+  *
+  * Contributors:
+  *     IBM Corporation - initial API and implementation
+ *     Red Hat, Inc. - Bug 389033 - get rid off javax.servlet < 2.6 dependency
+  *******************************************************************************/
+ package org.eclipse.equinox.http.servlet;
+ 
+ import java.io.*;
+ import java.security.Principal;
+ import java.util.*;
+-import javax.servlet.RequestDispatcher;
+-import javax.servlet.ServletInputStream;
+import javax.servlet.*;
+ import javax.servlet.http.*;
+ import org.eclipse.equinox.http.*;
+ import org.eclipse.equinox.socket.SocketInterface;
+@@ -1435,4 +1435,64 @@ public class HttpServletRequestImpl implements HttpServletRequest {
+ 	public int getRemotePort() {
+ 		throw new UnsupportedOperationException(HttpMsg.HTTP_ONLY_SUPPORTS_2_1);
+ 	}
+
+	public AsyncContext getAsyncContext() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public DispatcherType getDispatcherType() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public ServletContext getServletContext() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public boolean isAsyncStarted() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean isAsyncSupported() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public AsyncContext startAsync() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public AsyncContext startAsync(ServletRequest arg0, ServletResponse arg1) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public boolean authenticate(HttpServletResponse arg0) throws IOException, ServletException {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public Part getPart(String arg0) throws IOException, IllegalStateException, ServletException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public Collection getParts() throws IOException, IllegalStateException, ServletException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public void login(String arg0, String arg1) throws ServletException {
+		// TODO Auto-generated method stub
+
+	}
+
+	public void logout() throws ServletException {
+		// TODO Auto-generated method stub
+
+	}
+ }
+diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletResponseImpl.java rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletResponseImpl.java
+index 12020c0..8bb68ee 100644
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletResponseImpl.java
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletResponseImpl.java
+@@ -858,4 +858,24 @@ public class HttpServletResponseImpl implements HttpServletResponse {
+ 		throw new UnsupportedOperationException(HttpMsg.HTTP_ONLY_SUPPORTS_2_1);
+ 
+ 	}
+
+	public String getHeader(String arg0) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public Collection getHeaderNames() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public Collection getHeaders(String arg0) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public int getStatus() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+ }
+diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/RequestDispatcherImpl.java rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/RequestDispatcherImpl.java
+index 09fca65..d75e450 100644
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/RequestDispatcherImpl.java
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/RequestDispatcherImpl.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 1999, 2009 IBM Corporation and others.
+ * Copyright (c) 1999, 2012 IBM Corporation and others.
+  * All rights reserved. This program and the accompanying materials
+  * are made available under the terms of the Eclipse Public License v1.0
+  * which accompanies this distribution, and is available at
+@@ -7,11 +7,13 @@
+  *
+  * Contributors:
+  *     IBM Corporation - initial API and implementation
+ *     Red Hat, Inc. - Bug 389033 - get rid off javax.servlet < 2.6 dependency
+  *******************************************************************************/
+ package org.eclipse.equinox.http.servlet;
+ 
+ import java.io.IOException;
+ import java.io.PrintWriter;
+import java.util.Collection;
+ import java.util.Locale;
+ import javax.servlet.*;
+ import javax.servlet.http.Cookie;
+@@ -198,6 +200,26 @@ public class RequestDispatcherImpl implements RequestDispatcher {
+ 
+ 		}
+ 
+		public String getHeader(String arg0) {
+			// TODO Auto-generated method stub
+			return null;
+		}
+
+		public Collection getHeaderNames() {
+			// TODO Auto-generated method stub
+			return null;
+		}
+
+		public Collection getHeaders(String arg0) {
+			// TODO Auto-generated method stub
+			return null;
+		}
+
+		public int getStatus() {
+			// TODO Auto-generated method stub
+			return 0;
+		}
+
+ 	}
+ 
+ 	public RequestDispatcherImpl(Registration reg, String requestURI) {
+diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java
+index 015e488..02ef245 100644
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 1999, 2009 IBM Corporation and others.
+ * Copyright (c) 1999, 2012 IBM Corporation and others.
+  * All rights reserved. This program and the accompanying materials
+  * are made available under the terms of the Eclipse Public License v1.0
+  * which accompanies this distribution, and is available at
+@@ -7,6 +7,7 @@
+  *
+  * Contributors:
+  *     IBM Corporation - initial API and implementation
+ *     Red Hat, Inc. - Bug 389033 - get rid off javax.servlet < 2.6 dependency
+  *******************************************************************************/
+ package org.eclipse.equinox.http.servlet;
+ 
+@@ -16,7 +17,11 @@ import java.net.MalformedURLException;
+ import java.net.URL;
+ import java.util.*;
+ import javax.servlet.*;
+import javax.servlet.FilterRegistration.Dynamic;
+import javax.servlet.ServletRegistration;
+import javax.servlet.descriptor.JspConfigDescriptor;
+ import org.eclipse.equinox.http.*;
+import org.eclipse.equinox.http.Registration;
+ import org.osgi.service.http.HttpContext;
+ 
+ public class ServletContextImpl implements ServletContext {
+@@ -447,4 +452,134 @@ public class ServletContextImpl implements ServletContext {
+ 		throw new UnsupportedOperationException(HttpMsg.HTTP_ONLY_SUPPORTS_2_1);
+ 	}
+ 
+	public Dynamic addFilter(String arg0, String arg1) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public Dynamic addFilter(String arg0, Filter arg1) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public Dynamic addFilter(String arg0, Class arg1) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public void addListener(Class arg0) {
+		// TODO Auto-generated method stub
+
+	}
+
+	public void addListener(String arg0) {
+		// TODO Auto-generated method stub
+
+	}
+
+	public void addListener(EventListener arg0) {
+		// TODO Auto-generated method stub
+
+	}
+
+	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, String arg1) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, Servlet arg1) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, Class arg1) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public Filter createFilter(Class arg0) throws ServletException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public EventListener createListener(Class arg0) throws ServletException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public Servlet createServlet(Class arg0) throws ServletException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public void declareRoles(String[] arg0) {
+		// TODO Auto-generated method stub
+
+	}
+
+	public ClassLoader getClassLoader() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public Set getDefaultSessionTrackingModes() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public int getEffectiveMajorVersion() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	public int getEffectiveMinorVersion() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	public Set getEffectiveSessionTrackingModes() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public FilterRegistration getFilterRegistration(String arg0) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public Map getFilterRegistrations() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public JspConfigDescriptor getJspConfigDescriptor() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public ServletRegistration getServletRegistration(String arg0) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public Map getServletRegistrations() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public SessionCookieConfig getSessionCookieConfig() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public boolean setInitParameter(String arg0, String arg1) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public void setSessionTrackingModes(Set arg0) throws IllegalStateException, IllegalArgumentException {
+		// TODO Auto-generated method stub
+
+	}
+
+ }
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@ -0,0 +1,482 @@
+--- 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>
+ 
+     <!-- 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>
+--- 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 @@
+          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 @@
+          version="0.0.0"
+          fragment="true"
+          unpack="false"/>
+         
+   <plugin
+         id="org.eclipse.core.net.linux.ppc"
+         os="linux"
+         arch="ppc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+ 
+    <plugin
+         id="org.eclipse.core.net.linux.ppc64"
+         os="linux"
+         arch="ppc64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+         
+   <plugin
+         id="org.eclipse.core.net.linux.arm"
+         os="linux"
+         arch="arm"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+   <plugin
+         id="org.eclipse.core.net.linux.s390"
+         os="linux"
+         arch="s390"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+   <plugin
+         id="org.eclipse.core.net.linux.s390x"
+         os="linux"
+         arch="s390x"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+         
+   <plugin
+          id="org.eclipse.core.resources"
+          download-size="0"
+          install-size="0"
+@@ -396,7 +426,54 @@
+          version="0.0.0"
+          fragment="true"
+          unpack="false"/>
+-
+         
+   <plugin
+         id="org.eclipse.core.filesystem.linux.ppc"
+         os="linux"
+         arch="ppc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+<plugin
+         id="org.eclipse.core.filesystem.linux.ppc64"
+         os="linux"
+         arch="ppc64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+   <plugin
+         id="org.eclipse.core.filesystem.linux.s390"
+         os="linux"
+         arch="s390"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+<plugin
+         id="org.eclipse.core.filesystem.linux.s390x"
+         os="linux"
+         arch="s390x"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+         
+<plugin
+         id="org.eclipse.core.filesystem.linux.arm"
+         os="linux"
+         arch="arm"
+         download-size="0"
+         install-size="0"
+         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 @@
+         </plugins>
+       </build>
+     </profile>
+    
+        <profile>
+      <id>build-native-launchers-gtk.linux.ppc</id>
+      <activation>
+        <property>
+          <name>native</name>
+          <value>gtk.linux.ppc</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <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-gtk.linux.ppc64</id>
+      <activation>
+        <property>
+          <name>native</name>
+          <value>gtk.linux.ppc64</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-gtk.linux.arm</id>
+      <activation>
+        <property>
+          <name>native</name>
+          <value>gtk.linux.arm</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version> 1.7 </version>
+            <executions>
+              <execution>
+                <id>compile-executable-natives</id>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <target>
+                    <ant antfile="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"
+ 				;;
+			armv*)
+				defaultOSArch="arm"
+				defaultJava=DEFAULT_JAVA_EXEC
+				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
+				;;
+ 			*)
+ 				echo "*** Unknown MODEL <${MODEL}>"
+ 				;;
+--- 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,25 @@
+             </configuration>
+           </execution>
+           <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.s390</id>
+             <phase>validate</phase>
+             <goals>
+--- eclipse.platform.resources/pom.xml.orig	2013-02-20 13:23:15.000000000 +0100
+++ eclipse.platform.resources/pom.xml	2013-02-20 14:28:57.484752489 +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_32</module>
+     <module>bundles/org.eclipse.core.filesystem.hpux.PA_RISC</module>
+     <module>bundles/org.eclipse.core.filesystem.linux.ppc</module>
+--- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties.orig	2013-02-20 13:15:06.000000000 +0100
+++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties	2013-02-20 14:33:26.482928362 +0100
+@@ -37,6 +37,8 @@
+ root.linux.gtk.s390x.permissions.755=eclipse
+ root.linux.gtk.s390=target/resources/linux.gtk.s390,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390
+ root.linux.gtk.s390.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.ia64=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/ia64
+ # Need to be fixed to reflect eventual change into feature.xml
--- a/eclipse-test-support.patch
+++ b/eclipse-test-support.patch
@ -0,0 +1,330 @@
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig	2012-12-17 15:03:11.000000000 +0100
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml	2012-12-18 11:08:09.033309587 +0100
+@@ -164,98 +164,14 @@
+ 	<!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
+     <target name="setupPlatform">
+         <echo message="os.arch ${os.arch}" />
+-        <property file="equinoxp2tests.properties" />
+-        <condition
+-            property="platformArchive"
+-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux}">
+-            <and>
+-                <os family="unix" />
+-                <not>
+-                    <or>
+-                        <or>
+-                            <os arch="x86_64" />
+-                            <os arch="amd64" />
+-                        </or>
+-                        <os family="mac" />
+-                    </or>
+-                </not>
+-            </and>
+-        </condition>
+-        <condition
+-            property="platformArchive"
+-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64}">
+-            <and>
+-                <os family="mac" />
+-                <os family="unix" />
+-                <or>
+-                    <os arch="x86_64" />
+-                    <os arch="amd64" />
+-                </or>
+-            </and>
+-        </condition>
+-        <condition
+-            property="platformArchive"
+-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx}">
+-            <and>
+-                <os family="mac" />
+-                <os family="unix" />
+-                <!-- should not need, as long as x86_64 rules (above) comes first
+-                <os arch="i386" />
+-                -->
+-            </and>
+-        </condition>
+-        <condition
+-            property="platformArchive"
+-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32}">
+-            <and>
+-                <os family="windows" />
+-                <os arch="x86" />
+-            </and>
+-        </condition>
+-        <condition
+-            property="platformArchive"
+-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64}">
+-            <and>
+-                <os family="windows" />
+-                <or>
+-                    <os arch="x86_64" />
+-                    <os arch="amd64" />
+-                </or>
+-            </and>
+-        </condition>
+-        <condition
+-            property="platformArchive"
+-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64}">
+-            <and>
+-                <os family="unix" />
+-                <or>
+-                    <os arch="x86_64" />
+-                    <os arch="amd64" />
+-                </or>
+-            </and>
+-        </condition>
+-
+-        <fail
+-            unless="platformArchive"
+-            message="platformArchive is not defined. Check that condidtions cover os arch ${os.arch}. May be VM dependent.)" />
+-
+-        <condition
+-            property="platformTarget"
+-            value="platform-zip">
+-            <contains
+-                string="${platformArchive}"
+-                substring=".zip" />
+        <property name="platformArchive" value="${runtimeArchive}" />
+        
+        <condition property="platformTarget" value="platform-zip">
+            <contains string="${platformArchive}" substring=".zip" />
+         </condition>
+-        <condition
+-            property="platformTarget"
+-            value="platform-tar.gz">
+-            <contains
+-                string="${platformArchive}"
+-                substring=".tar.gz" />
+        <condition property="platformTarget" value="platform-tar.gz">
+            <contains string="${platformArchive}" substring=".tar.gz" />
+         </condition>
+-        <fail
+-            unless="platformTarget"
+-            message="platformTarget is not defined. Check that platformArchive variable and value is defined correctly, such as in equinoxp2tests.properties in the appropriate testConfig" />
+         <echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" />
+         <antcall target="${platformTarget}" />
+     </target>
+@@ -283,7 +199,7 @@
+         <exec
+             dir="${platformLocation}"
+             executable="tar">
+-            <arg line="-xzf ${platformArchive}" />
+            <arg line="-xzf ../${platformArchive}" />
+         </exec>
+     </target>
+ 
+@@ -815,6 +731,17 @@
+                     arg2="" />
+             </not>
+         </condition>
+        
+        <!-- swt needs this property to run tests -->
+        <dirset id="test.plugin.folder" dir="${eclipse-home}/plugins/">
+            <include name="${testPlugin}_*" />
+        </dirset>
+        <property name="testPluginFolder" refid="test.plugin.folder" />
+        <echo>trying to find ${testPluginFolder}</echo>
+        <condition property="org.eclipse.swt.tests" value="${testPluginFolder}">
+                <equals arg1="${testPlugin}" arg2="org.eclipse.swt.tests"/>
+        </condition>
+        
+         <antcall target="runSuite" />
+         <antcall target="genResults" />
+     </target>
+@@ -1252,7 +1179,7 @@
+ 
+     <target name="all">
+ 
+-        <antcall target="markCurrentTime">
+        <!-- antcall target="markCurrentTime">
+             <param
+                 name="message"
+                 value="start relEng" />
+@@ -1262,7 +1189,7 @@
+             <param
+                 name="message"
+                 value="end relEng" />
+-        </antcall>
+        </antcall -->
+ 
+         <antcall target="markCurrentTime">
+             <param
+@@ -1374,7 +1301,7 @@
+          hang, during performance testss 
+          -->
+     <target name="platformLR">
+-        <antcall target="teamcvs" />
+        <!-- antcall target="teamcvs" / -->
+         <antcall target="jface" />
+         <antcall target="swt" />
+         <antcall target="uiperformance" />
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh.orig	2012-12-17 15:03:11.000000000 +0100
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh	2012-12-18 11:21:53.867638480 +0100
+@@ -1,5 +1,74 @@
+ #!/usr/bin/env bash
+ 
+
+function findXvncAndSetDisplay() {
+#   if [ ${headless} == 1 ]; then
+        # Try to find Xvnc
+        xvnc=
+        if [ -a /usr/bin/Xvnc ]
+        then
+            xvnc=/usr/bin/Xvnc
+            setupXvnc
+        else
+            if [ -a /usr/X11/bin/Xvnc ]
+            then
+                xvnc=/usr/X11/bin/Xvnc
+                setupXvnc
+            else
+                echo "Couldn't find Xvnc (/usr/bin/Xvnc or /usr/X11/bin/Xvnc).  Using DISPLAY=0:0"
+                DISPLAY=`$HOST`:0.0
+            fi
+        fi
+        export DISPLAY
+#   fi
+}
+
+function setupXvnc() {
+    # Pick a high display number.
+    port=`expr '(' $RANDOM '*' 9 / 32767 ')' + 58`
+    echo localhost > Xvnc.cfg
+    echo "Setting up Xvnc on port ${port} with password VNCpassword1"
+    $xvnc :$port -screen 1 1024x768x32 -auth Xvnc.cfg -localhost -PasswordFile eclipse-tests-vncpwd &> Xvnc.log &
+    Xvncpid=$!
+    DISPLAY=`$HOST`:$port
+}
+
+function setArch() {
+    if [ "x$buildArch" = "x" ]
+    then
+        if uname -m > /dev/null 2>&1; then
+            arch=`uname -m`
+        else
+            arch=`uname -p`
+        fi
+        # Massage arch for Eclipse-uname differences
+        case $arch in
+            i[0-9]*86)
+                arch=x86 ;;
+            ia64)
+                arch=ia64 ;;
+            ppc)
+                arch=ppc ;;
+            x86_64)
+                arch=x86_64 ;;
+            *)
+                echo "Unrecognized architecture:  $arch" 1>&2
+                exit 1 ;;
+        esac
+        echo >&2 "Architecture not specified.  Assuming host architecture: $arch"
+    fi
+}
+
+function cleanupXvnc() {
+    # Clean up if we used Xvnc
+    if [ -e Xvnc.cfg ]
+    then
+        kill $Xvncpid
+        rm Xvnc.cfg
+    fi
+}
+
+
+ # This file should never exist or be needed for production machine,
+ # but allows an easy way for a "local user" to provide this file
+ # somewhere on the search path ($HOME/bin is common),
+@@ -92,11 +161,17 @@
+ #necessary when invoking this script through rsh
+ cd $dir
+ 
+
+    mkdir -p /tmp/eclipse-tests-directory
+    pushd /tmp/eclipse-tests-directory
+    rm -rf *
+
+     if [ ! -r eclipse ]
+     then
+-        tar -xzf eclipse-SDK-*.tar.gz
+-        # note, the file pattern to match, must not start with */plugins because there is no leading '/' in the zip file, since they are repos.
+-        unzip -qq -o -C eclipse-junit-tests-*.zip plugins/org.eclipse.test* -d eclipse/dropins/
+        pushd @libdir@
+            tar czf /tmp/eclipse-tests-directory/eclipse-SDK-temp-linux-gtk-x86_64.tar.gz eclipse
+        popd
+        cp -rf @libdir@/eclipse eclipse
+     fi
+ 
+     # run tests
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh.bak	2012-12-21 14:20:27.000000000 +0100
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh	2012-12-21 14:24:27.800161644 +0100
+@@ -178,45 +178,16 @@
+     launcher=`ls eclipse/plugins/org.eclipse.equinox.launcher_*.jar`
+ 
+ 
+-    # make sure there is a window manager running. See bug 379026
+-    # we should not have to, but may be a quirk/bug of hudson setup
+-    # assuming metacity attaches to "current" display by default (which should have
+-    # already been set by Hudson). We echo its value here just for extra reference/cross-checks.
+   findXvncAndSetDisplay
+   setArch
+   
+   ant \
+-file "/usr/share/java/eclipse-testing/test.xml" $tests \
+-Dws=$ws -Dos=$os -Darch=$arch -Dos.arch=$arch \
+-DbuildId=v20120903-1347 -Dbasedir="/tmp/eclipse-tests-directory" \
+-DruntimeArchive="eclipse-SDK-temp-linux-gtk-x86_64.tar.gz" \
+-DrepoLocation="/usr/share/java/eclipse-testing/" \
+-Dorg.eclipse.test="3.3.100" \
+-D$installmode=true $properties
+ 
+-    echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz):"
+-    wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz" | grep -v egrep)
+-    echo "Window Manager processes: $wmpss"
+-    echo
+-
+-    if [[ -z $wmpss ]]
+-    then
+-             echo "No window managers processes found running, so will start metacity"
+-             metacity --replace --sm-disable  &
+-             METACITYPID=$!
+-             echo $METACITYPID > epmetacity.pid
+-     else
+-             echo "Existing window manager found running, so did not force start of metacity"
+-    fi
+-
+-    echo
+-
+-    # list out metacity processes so overtime we can see if they accumulate, or if killed automatically
+-    # when our process exits. If not automatic, should use epmetacity.pid to kill it when we are done.
+-    echo "Current metacity processes running (check for accumulation):"
+-    ps -ef | grep "metacity" | grep -v grep
+-    echo
+-
+-    echo "Triple check if any window managers are running (at least metacity should be!):"
+-    wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz" | grep -v egrep)
+-    echo "Window Manager processes: $wmpss"
+-    echo
+-    echo "extdirprop in runtest: ${extdirprop}"
+-    echo "extdirproperty in runtest: ${extdirproperty}"
+-
+-    # -Dtimeout=300000 "${ANT_OPTS}"
+- if [[ ! -z "${extdirproperty}" ]]
+- then
+-	$vmcmd "${extdirproperty}" -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
+- else
+-	$vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch  -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
+- fi
+cleanupXvnc
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.bak	2012-12-21 19:31:12.000000000 +0100
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml	2012-12-27 08:26:23.767346326 +0100
+@@ -1291,7 +1291,7 @@
+         <antcall target="debug" />
+         <antcall target="ui" />
+         <antcall target="equinoxds" />
+-        <antcall target="equinoxp2discovery" />
+        <!-- antcall target="equinoxp2discovery" /-->
+         <antcall target="bidi" />
+         <antcall target="ltkuirefactoringtests" />
+         <antcall target="ltkcorerefactoringtests" />
--- a/eclipse.spec
+++ b/eclipse.spec
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@ -1,9 +1,12 @@
 #!/bin/bash

 rm -rf R4_platform-aggregator
+rm eclipse-source.tar.bz2

-git clone -b Juno_RC4_R4 --recurse-submodules  git://git.eclipse.org/gitroot/cbi/platform-aggregator.git R4_platform-aggregator
+git clone -b R4_2_maintenance --recurse-submodules  git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git R4_platform-aggregator

+
+pushd R4_platform-aggregator
 find . -type d -name ".git" -exec rm -rf {} \;

 find . -type f -name "*.class" -exec rm -rf {} \;
@ -13,5 +16,5 @@ find . -name *.jar -exec rm -rf {} \;
 find . -type f -name *.so -exec rm -rf {} \;
 find . -type f -name *.dll -exec rm -rf {} \;
 find . -type f -name *.jnilib -exec rm -rf {} \;
-
-tar cjf eclipse-source.tar.bz R4_platform-aggregator
+popd 
+tar cjf eclipse-source.tar.bz2 R4_platform-aggregator
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-cb058e425a067773e648a78d4e3ada27  eclipse-source.tar.bz2
-0caade338914415a37f767b7758148ea  org.eclipse.linuxtools.eclipse-build-701400b0ca475ea73bd828c66b00fb63c5ec2c8c.tar.bz2
+b59b115fcf1f37fef8bfa0c51dd6d163  eclipse-source.tar.bz2
+102b0b7d9be171c8402dbf315b5e01b4  eclipse-build-7a327b17de5f606f47cba6b74e64619520186b7a.tar.xz
Author	SHA1	Message	Date
Alexander Kurtakov	f41f25c93d	Rebuild to pick latest deps.	2013-12-16 08:41:54 +02:00
Krzysztof Daniel	32bbf049bd	rebuild to pick latest deps	2013-07-01 14:36:29 +02:00
Krzysztof Daniel	a51340e464	Add _libdir/swt.jar back.	2013-03-20 20:23:26 +01:00
Krzysztof Daniel	8933ea9476	Add stricter requires to xml-commons-apis.	2013-03-15 09:30:32 +01:00
Krzysztof Daniel	2b17d882da	Drop the linkage patch. Rebuild with latest xml-commons-apis.	2013-03-04 15:00:28 +01:00
Krzysztof Daniel	b6e946a4a7	remove all org.w3c.css	2013-03-01 14:59:57 +01:00
Krzysztof Daniel	5fd560af5c	Fix the /usr/lib/java/swt.jar symlink.	2013-02-27 14:41:53 +01:00
Krzysztof Daniel	5101c77b33	Update to upstream 4.2.2 release.	2013-02-21 09:22:58 +01:00
Krzysztof Daniel	d5ece62ff7	Yet another fix for RHBZ#912664.	2013-02-20 10:13:21 +01:00
Krzysztof Daniel	2b71e0b459	Remove merge artifacts.	2013-02-19 17:54:49 +01:00
Krzysztof Daniel	12661d4bfe	- RHBZ#912664 - eclipse-swt should put swt.jar into /usr/lib/java even on 64 bit systems. - RHBZ#903537 - [abrt] java-1.7.0-openjdk-1.7.0.9-2.3.4.fc18: gtk_widget_real_map (SIGABRT) Conflicts: eclipse.spec	2013-02-19 16:12:57 +01:00
Krzysztof Daniel	ef924f4106	Do really fix the swt.jar (RHBZ#908112)	2013-02-06 09:44:14 +01:00
Krzysztof Daniel	4d3abf6115	Fix the generated swt.jar.	2013-02-05 13:31:50 +01:00
Krzysztof Daniel	07ac0436c7	RHBZ#832053: Ship SWT and other native plugins as folders.	2013-01-26 11:21:12 +01:00
Krzysztof Daniel	8ffa944ea3	RHBZ#893774: file shipped twice in eclipse-platform and eclipse-equinox-osgi	2013-01-17 13:10:58 +01:00
Krzysztof Daniel	1a1736b24b	Fix missing about files on arm and ppc.	2013-01-05 17:26:47 +01:00
Krzysztof Daniel	2f7c6ac5e5	Reenable bootstrap (for the purpose of arm build). Fix the launcher build for arm. Fix the s390 build issue.	2013-01-04 11:20:03 +01:00
Krzysztof Daniel	135a65f240	Update to pre - SR2.	2012-12-27 14:26:27 +01:00
Krzysztof Daniel	ebb857413e	Update to pre - SR2 - work in progress	2012-12-27 14:26:20 +01:00
Krzysztof Daniel	c19d091132	Enable javadoc build.	2012-12-14 14:33:17 +01:00
Krzysztof Daniel	a5ee645c59	wip	2012-12-14 14:33:08 +01:00
Krzysztof Daniel	0178e3267d	Remove javax.xml removal patch declaration.	2012-11-26 12:18:12 +01:00
Krzysztof Daniel	1256696a9c	Restore javax.xml. Changes to remove the javax.xml must be done across the entire Eclipse and java stack. Unfortunately, removing the javax.xml in Eclipse breaks other bundles in too many places preventing Eclipse from discovering bundles in dropins or even starting. This should not be done in f18.	2012-11-26 12:14:58 +01:00
Krzysztof Daniel	6d94ae06ce	Excluded ResolverState from JIT to fix arm build.	2012-11-26 12:14:47 +01:00
Krzysztof Daniel	369feb9678	Get rid off javax.xml. Fix building launcher on arm. Fix RHBZ #878210 . The launcher was not built properly because Equinox Launcher build script had no support for arm architectures, therefore it did not knew where to copy the binary. javax.xml is provided by the VM so there is no need to bundle it. Due to inconsistencies in packaging, some errors appear (see RHBZ #710815). This is removal in a first place (eclipse-dtp and eclipse-mylyn updates will follow). Additionally, the binary class was not copied properly into the compatibility bundle. We can't build it properly (because it was some old, unknown version), but we can build current version and hope for the best.	2012-11-26 12:14:39 +01:00
Krzysztof Daniel	3d81a4ed45	Don't package non-existing fragments on s390, s390x. Add BR to GConf-2-devel	2012-11-13 18:38:31 +01:00
Krzysztof Daniel	b48bbca8c3	Added debug symbols to SWT. Restored the debug package. Removed the debug flag from the build.	2012-11-08 11:12:52 +01:00
Krzysztof Daniel	ea93fcdb07	Simplify initial repo creation. The eclipse-build initial repo with two manifests is now already unpacked into a right place, so there is no need to move it. Tycho bundled jars are no longer unpacked, as Tycho manages to work properly without them now.	2012-11-07 19:18:31 +01:00
Krzysztof Daniel	0b1589fa0a	Export java home before using ant to build native part of launchers. mvn-rpmbuild does it automatically, but in this case we are workarounding an issue with cbi that launchers are built to late and are not included into final product.	2012-11-06 16:00:57 +01:00
Krzysztof Daniel	02a5be5b0b	- Reduce the memory available for Tycho build. - Reduce the build time. - Use the upstream help generation patch.	2012-11-06 16:00:43 +01:00
Krzysztof Daniel	ffd0be0b9d	Remove the reference to org.apache.jasper (replaced by glassfish)	2012-11-06 16:00:19 +01:00
Alexander Kurtakov	653ba96242	Small cleanups. - Bump release to be bigger than F-18. Conflicts: eclipse.spec	2012-11-06 15:59:59 +01:00
Krzysztof Daniel	92ab63dcc7	Make the removal of the icon more error prone. Conflicts: eclipse.spec	2012-10-24 13:34:11 +02:00
Krzysztof Daniel	0d3ec92fc3	Remove a hack for building executable. Conflicts: eclipse.spec	2012-10-24 13:31:16 +02:00
Krzysztof Daniel	a4d7865ece	Add profiles in the equinox executable for ppc and arm. Conflicts: eclipse.spec	2012-10-24 13:29:15 +02:00
Krzysztof Daniel	b6e1e8e24c	- Moved launcher version change after secondary fragments creation. - Created some directories when creating secondary fragments. Conflicts: eclipse.spec	2012-10-24 13:27:47 +02:00
Krzysztof Daniel	9012fb4897	Correct the glassfish version.	2012-10-19 17:45:27 +02:00
Krzysztof Daniel	2cf254c253	Delete the patch that dropped a user profile (unwanted side effects). Move sytem.bundle to equinox package. Fix building of core.net on secondary arches. Removed recursive dependency to eclipse-rcp.	2012-10-19 17:17:01 +02:00
Krzysztof Daniel	1ce7b5d63e	Use glassfish-jsp-api instead of tomcat-jsp-api. Conflicts: eclipse.spec	2012-10-19 17:16:49 +02:00
Krzysztof Daniel	7a9bc2d15d	Support for secondary arches (arm, ppc, ppc64, x86, x86_64, s390, s390x).	2012-10-19 17:15:22 +02:00
Krzysztof Daniel	63bd83c628	prepare spec for building without circular deps. Conflicts: eclipse.spec	2012-10-19 17:14:43 +02:00
Krzysztof Daniel	7bc5723de7	Bump emf version to 2.8.1.	2012-10-02 14:32:23 +02:00
Krzysztof Daniel	dae5ba0972	Rebuild with latest emf 2.8.1. Conflicts: eclipse.spec	2012-10-01 19:56:22 +02:00
Krzysztof Daniel	0373b984f7	861037: Eclipse does not start in rawhide There is an unwanted wiring during bundles resolution here. Many UI packages required package org.w3.dom.css which was provided by a bundle in the upstream Eclipse, but is provided by vm SDK in Fedora. The problem is that it is also provided by javax.xml, and since there are duplicates, some classes are loaded from javax.xml bundle in some bundles and others from SDK in other bundles, causing LinkageErrors and/or class cast exceptions. The solution is to remove imports from the UI code to ensure that javax.xml is not searched during class resolution, and that proper classes from SDK are used. https://bugzilla.redhat.com/show_bug.cgi?id=861037 Conflicts: eclipse.spec	2012-10-01 19:55:03 +02:00
Krzysztof Daniel	7edc8bcde1	Remove duplicated patch (an effect of cherry-pick).	2012-10-01 14:27:29 +02:00
Krzysztof Daniel	3507f89ae4	Remove build artifacts from P2 files.	2012-09-21 08:59:04 +02:00
Krzysztof Daniel	1cce069e34	Build the jdt.debug.launching internal jar.	2012-09-21 08:58:53 +02:00
Krzysztof Daniel	8b5fc08999	Update to SR1 RC4.	2012-09-21 08:58:43 +02:00
Krzysztof Daniel	ca60188ef3	Add BR/R tomcat-jsp-2.2-api tp platform. Conflicts: eclipse.spec	2012-09-21 08:58:31 +02:00
Krzysztof Daniel	a1101cf3e3	This was done in the past - jdt.core should be a part of platform to avoid cyclic dependencies. Conflicts: eclipse.spec	2012-09-21 08:54:49 +02:00
Krzysztof Daniel	a9dfdd8be9	Ammend the BR for glassfish to work in f18. Should be 2.2.5, was 2.2.6.	2012-09-10 11:11:55 +02:00
Krzysztof Daniel	eb056cece3	This was done in the past - jdt.core should be a part of platform to avoid cyclic dependencies.	2012-09-10 10:49:35 +02:00
Krzysztof Daniel	bf3fde19bc	yet another version of the previous patch.	2012-09-10 10:43:14 +02:00
Krzysztof Daniel	10cd1aab0f	- Remove remaining mina-core dependency.	2012-09-10 10:43:06 +02:00
Krzysztof Daniel	a80ea2fc73	Packaging improvements after review. Removed unnecessary dependencies, changed installation group, used osgi style dependencies for jetty, excluded console.jaas from build since it;s not used anyway. Conflicts: eclipse.spec	2012-09-10 10:42:56 +02:00
Krzysztof Daniel	a97837256b	complete help built.	2012-09-10 10:42:01 +02:00
Krzysztof Daniel	a4a73fe8dd	Workaround a problem with documentation not being build due to the tycho issue.	2012-09-10 10:41:53 +02:00
Krzysztof Daniel	dd8b2ea2de	Ammend the test.xml to support SWT tests. SWT needs to know a priori where tests are installed because it's test.xml refers to existing resources that are passed to the browser.	2012-09-10 10:41:47 +02:00
Krzysztof Daniel	d08e1d71f0	Generated help contents.	2012-09-10 10:41:39 +02:00
Krzysztof Daniel	7d34457771	Improvement to the test.	2012-09-10 10:41:06 +02:00
Krzysztof Daniel	9ab9a1d24a	Tests! Also, eclipse.spec contains help patch (not-working).	2012-09-10 10:41:03 +02:00
Krzysztof Daniel	70a4b5c5e6	- Native network support added. - Native filesystem support added.	2012-09-10 10:40:54 +02:00
Krzysztof Daniel	638be38dbe	use glassfish 2.2.5 dont install jdt into platform (to be explained later). remove webapp patches (not needed, because jsp compilation works now).	2012-09-05 12:26:48 +02:00