Blame SOURCES/eclipse-secondary-arches.patch

10f0d1
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
10f0d1
index 6c567f8..969eafb 100644
10f0d1
--- a/eclipse-platform-parent/pom.xml
10f0d1
+++ b/eclipse-platform-parent/pom.xml
10f0d1
@@ -209,49 +209,19 @@
10f0d1
               <arch>s390x</arch>
10f0d1
             </environment>
10f0d1
             <environment>
10f0d1
-              <os>win32</os>
10f0d1
-              <ws>win32</ws>
10f0d1
-              <arch>x86</arch>
10f0d1
-            </environment>
10f0d1
-            <environment>
10f0d1
-              <os>win32</os>
10f0d1
-              <ws>win32</ws>
10f0d1
-              <arch>x86_64</arch>
10f0d1
-            </environment>
10f0d1
-            <environment>
10f0d1
-              <os>macosx</os>
10f0d1
-              <ws>cocoa</ws>
10f0d1
-              <arch>x86</arch>
10f0d1
-            </environment>
10f0d1
-            <environment>
10f0d1
-              <os>macosx</os>
10f0d1
-              <ws>cocoa</ws>
10f0d1
-              <arch>x86_64</arch>
10f0d1
-            </environment>
10f0d1
-            <environment>
10f0d1
-              <os>solaris</os>
10f0d1
-              <ws>gtk</ws>
10f0d1
-              <arch>sparc</arch>
10f0d1
-            </environment>
10f0d1
-            <environment>
10f0d1
-              <os>solaris</os>
10f0d1
-              <ws>gtk</ws>
10f0d1
-              <arch>x86</arch>
10f0d1
-            </environment>
10f0d1
-            <environment>
10f0d1
-              <os>hpux</os>
10f0d1
+              <os>linux</os>
10f0d1
               <ws>gtk</ws>
10f0d1
-              <arch>ia64</arch>
10f0d1
+              <arch>arm</arch>
10f0d1
             </environment>
10f0d1
             <environment>
10f0d1
-              <os>aix</os>
10f0d1
+              <os>linux</os>
10f0d1
               <ws>gtk</ws>
10f0d1
-              <arch>ppc</arch>
10f0d1
+              <arch>ppc64le</arch>
10f0d1
             </environment>
10f0d1
             <environment>
10f0d1
-              <os>aix</os>
10f0d1
+              <os>linux</os>
10f0d1
               <ws>gtk</ws>
10f0d1
-              <arch>ppc64</arch>
10f0d1
+              <arch>aarch64</arch>
10f0d1
             </environment>
10f0d1
           </environments>
10f0d1
         </configuration>
10f0d1
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
10f0d1
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
10f0d1
@@ -130,21 +130,6 @@
10f0d1
               <ws>gtk</ws>
10f0d1
               <arch>x86_64</arch>
10f0d1
             </environment>
10f0d1
-            <environment>
10f0d1
-              <os>win32</os>
10f0d1
-              <ws>win32</ws>
10f0d1
-              <arch>x86</arch>
10f0d1
-            </environment>
10f0d1
-            <environment>
10f0d1
-              <os>win32</os>
10f0d1
-              <ws>win32</ws>
10f0d1
-              <arch>x86_64</arch>
10f0d1
-            </environment>
10f0d1
-            <environment>
10f0d1
-              <os>macosx</os>
10f0d1
-              <ws>cocoa</ws>
10f0d1
-              <arch>x86_64</arch>
10f0d1
-            </environment>
10f0d1
           </environments>
10f0d1
         </configuration>
10f0d1
       </plugin>
10f0d1
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
10f0d1
index 80a32e4..85de879 100644
10f0d1
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
10f0d1
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
10f0d1
@@ -32,6 +32,12 @@ root.solaris.gtk.sparc.permissions.755=eclipse
10f0d1
 root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
10f0d1
 root.solaris.gtk.x86.permissions.755=eclipse
10f0d1
 
10f0d1
+root.linux.gtk.arm=target/resources/linux.gtk.arm,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/arm
10f0d1
+root.linux.gtk.arm.permissions.755=eclipse 
10f0d1
+root.linux.gtk.aarch64=target/resources/linux.gtk.aarch64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/aarch64
10f0d1
+root.linux.gtk.aarch64.permissions.755=eclipse 
10f0d1
+root.linux.gtk.ppc64le=rootfiles/linux.gtk.ppc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64le
10f0d1
+root.linux.gtk.ppc64le.permissions.755=eclipse
10f0d1
 root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
10f0d1
 root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse
10f0d1
 root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
10f0d1
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
10f0d1
index 7dd0536..66d79ee 100644
10f0d1
--- a/eclipse.platform.swt.binaries/pom.xml
10f0d1
+++ b/eclipse.platform.swt.binaries/pom.xml
066e0a
@@ -54,6 +54,8 @@
066e0a
     <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
10f0d1
     <module>bundles/org.eclipse.swt.gtk.linux.s390</module>
10f0d1
     <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
10f0d1
+    <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
10f0d1
+    <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
10f0d1
     <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
10f0d1
     <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
10f0d1
     <module>bundles/org.eclipse.swt.gtk.solaris.sparc</module>
10f0d1
diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
10f0d1
index b46cdc6..0fb36a5 100644
10f0d1
--- a/rt.equinox.framework/pom.xml
10f0d1
+++ b/rt.equinox.framework/pom.xml
066e0a
@@ -55,6 +55,8 @@
10f0d1
     <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module>
10f0d1
     <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module>
10f0d1
     <module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64</module>
10f0d1
+    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module>
10f0d1
+    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
10f0d1
     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc</module>
10f0d1
     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
066e0a
     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
10f0d1
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
10f0d1
index f5fb504..1187e84 100644
10f0d1
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
10f0d1
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
10f0d1
@@ -425,6 +425,7 @@
10f0d1
 				<equals arg1="${swt.arch}" arg2="ppc64"/>
10f0d1
 				<equals arg1="${swt.arch}" arg2="ppc64le"/>
10f0d1
 				<equals arg1="${swt.arch}" arg2="s390x"/>
10f0d1
+				<equals arg1="${swt.arch}" arg2="aarch64"/>
10f0d1
 			</or>
10f0d1
 		</condition>
10f0d1
 		<echo>Is64=${is64}</echo>
10f0d1
diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
10f0d1
index 7e1f520..734dd10 100644
10f0d1
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
10f0d1
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
066e0a
@@ -419,6 +419,26 @@
10f0d1
          install-size="0"
10f0d1
          version="0.0.0"
10f0d1
          fragment="true"/>
10f0d1
+         
10f0d1
+   
10f0d1
+         id="org.eclipse.equinox.launcher.gtk.linux.arm"
10f0d1
+         os="linux"
10f0d1
+         ws="gtk"
10f0d1
+         arch="arm"
10f0d1
+         download-size="0"
10f0d1
+         install-size="0"
10f0d1
+         version="0.0.0"
10f0d1
+         fragment="true"/>
10f0d1
+
10f0d1
+   
10f0d1
+         id="org.eclipse.equinox.launcher.gtk.linux.aarch64"
10f0d1
+         os="linux"
10f0d1
+         ws="gtk"
10f0d1
+         arch="aarch64"
10f0d1
+         download-size="0"
10f0d1
+         install-size="0"
10f0d1
+         version="0.0.0"
10f0d1
+         fragment="true"/>
10f0d1
 
10f0d1
    
10f0d1
          id="org.eclipse.equinox.launcher.gtk.linux.x86"
066e0a
@@ -583,6 +613,28 @@
10f0d1
          version="0.0.0"
10f0d1
          fragment="true"
10f0d1
          unpack="false"/>
10f0d1
+         
10f0d1
+   
10f0d1
+         id="org.eclipse.swt.gtk.linux.arm"
10f0d1
+         os="linux"
10f0d1
+         ws="gtk"
10f0d1
+         arch="arm"
10f0d1
+         download-size="0"
10f0d1
+         install-size="0"
10f0d1
+         version="0.0.0"
10f0d1
+         fragment="true"
10f0d1
+         unpack="false"/>
10f0d1
+
10f0d1
+   
10f0d1
+         id="org.eclipse.swt.gtk.linux.aarch64"
10f0d1
+         os="linux"
10f0d1
+         ws="gtk"
10f0d1
+         arch="aarch64"
10f0d1
+         download-size="0"
10f0d1
+         install-size="0"
10f0d1
+         version="0.0.0"
10f0d1
+         fragment="true"
10f0d1
+         unpack="false"/>
10f0d1
 
10f0d1
    
10f0d1
          id="org.eclipse.swt.gtk.linux.ppc"
10f0d1
diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
10f0d1
index 29d3871..45526c8 100644
10f0d1
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
10f0d1
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
10f0d1
@@ -119,6 +125,16 @@
10f0d1
 				defaultJava=DEFAULT_JAVA_EXEC
10f0d1
 				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
10f0d1
 				;;
10f0d1
+			arm*)
10f0d1
+				defaultOSArch="arm"
10f0d1
+				defaultJava=DEFAULT_JAVA_EXEC
10f0d1
+				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
10f0d1
+				;;
10f0d1
+			"aarch64")
10f0d1
+				defaultOSArch="aarch64"
10f0d1
+				defaultJava=DEFAULT_JAVA_EXEC
10f0d1
+				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
10f0d1
+				;;
10f0d1
 			*)
10f0d1
 				echo "*** Unknown MODEL <${MODEL}>"
10f0d1
 				;;
10f0d1
diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
10f0d1
index fac13bf..e487001 100644
10f0d1
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
10f0d1
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
066e0a
@@ -219,6 +219,189 @@
10f0d1
         </plugins>
10f0d1
       </build>
10f0d1
     </profile>
10f0d1
+
10f0d1
+    <profile>
10f0d1
+      <id>build-native-launchers-gtk.linux.ppc</id>
10f0d1
+      <activation>
10f0d1
+        <property>
10f0d1
+          <name>native</name>
10f0d1
+          <value>gtk.linux.ppc</value>
10f0d1
+        </property>
10f0d1
+      </activation>
10f0d1
+      <build>
10f0d1
+        <plugins>
10f0d1
+          <plugin>
10f0d1
+            <artifactId>maven-antrun-plugin</artifactId>
10f0d1
+            <executions>
10f0d1
+              <execution>
10f0d1
+                <id>compile-executable-natives</id>
10f0d1
+                <phase>generate-resources</phase>
10f0d1
+                <configuration>
10f0d1
+                  <target>
10f0d1
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
10f0d1
+                  </target>
10f0d1
+                </configuration>
10f0d1
+                <goals>
10f0d1
+                  <goal>run</goal>
10f0d1
+                </goals>
10f0d1
+              </execution>
10f0d1
+            </executions>
10f0d1
+          </plugin>
10f0d1
+        </plugins>
10f0d1
+      </build>
10f0d1
+    </profile>
10f0d1
+    <profile>
10f0d1
+      <id>build-native-launchers-gtk.linux.ppc64</id>
10f0d1
+      <activation>
10f0d1
+        <property>
10f0d1
+          <name>native</name>
10f0d1
+          <value>gtk.linux.ppc64</value>
10f0d1
+        </property>
10f0d1
+      </activation>
10f0d1
+      <build>
10f0d1
+        <plugins>
10f0d1
+          <plugin>
10f0d1
+            <artifactId>maven-antrun-plugin</artifactId>
10f0d1
+            <executions>
10f0d1
+              <execution>
10f0d1
+                <id>compile-executable-natives</id>
10f0d1
+                <phase>generate-resources</phase>
10f0d1
+                <configuration>
10f0d1
+                  <target>
10f0d1
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
10f0d1
+                  </target>
10f0d1
+                </configuration>
10f0d1
+                <goals>
10f0d1
+                  <goal>run</goal>
10f0d1
+                </goals>
10f0d1
+              </execution>
10f0d1
+            </executions>
10f0d1
+          </plugin>
10f0d1
+        </plugins>
10f0d1
+      </build>
10f0d1
+    </profile>
10f0d1
+
10f0d1
+    <profile>
10f0d1
+      <id>build-native-launchers-gtk.linux.arm</id>
10f0d1
+      <activation>
10f0d1
+        <property>
10f0d1
+          <name>native</name>
10f0d1
+          <value>gtk.linux.arm</value>
10f0d1
+        </property>
10f0d1
+      </activation>
10f0d1
+      <build>
10f0d1
+        <plugins>
10f0d1
+          <plugin>
10f0d1
+            <artifactId>maven-antrun-plugin</artifactId>
10f0d1
+            <executions>
10f0d1
+              <execution>
10f0d1
+                <id>compile-executable-natives</id>
10f0d1
+                <phase>generate-resources</phase>
10f0d1
+                <configuration>
10f0d1
+                  <target>
10f0d1
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
10f0d1
+                  </target>
10f0d1
+                </configuration>
10f0d1
+                <goals>
10f0d1
+                  <goal>run</goal>
10f0d1
+                </goals>
10f0d1
+              </execution>
10f0d1
+            </executions>
10f0d1
+          </plugin>
10f0d1
+        </plugins>
10f0d1
+      </build>
10f0d1
+    </profile>
10f0d1
+    <profile>
10f0d1
+      <id>build-native-launchers-gtk.linux.aarch64</id>
10f0d1
+      <activation>
10f0d1
+        <property>
10f0d1
+          <name>native</name>
10f0d1
+          <value>gtk.linux.aarch64</value>
10f0d1
+        </property>
10f0d1
+      </activation>
10f0d1
+      <build>
10f0d1
+        <plugins>
10f0d1
+          <plugin>
10f0d1
+            <artifactId>maven-antrun-plugin</artifactId>
10f0d1
+            <executions>
10f0d1
+              <execution>
10f0d1
+                <id>compile-executable-natives</id>
10f0d1
+                <phase>generate-resources</phase>
10f0d1
+                <configuration>
10f0d1
+                  <target>
10f0d1
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
10f0d1
+                  </target>
10f0d1
+                </configuration>
10f0d1
+                <goals>
10f0d1
+                  <goal>run</goal>
10f0d1
+                </goals>
10f0d1
+              </execution>
10f0d1
+            </executions>
10f0d1
+          </plugin>
10f0d1
+        </plugins>
10f0d1
+      </build>
10f0d1
+    </profile>
066e0a
+    <profile>
066e0a
+      <id>build-native-launchers-gtk.linux.s390x</id>
066e0a
+      <activation>
066e0a
+        <property>
066e0a
+          <name>native</name>
066e0a
+          <value>gtk.linux.s390x</value>
066e0a
+        </property>
066e0a
+      </activation>
066e0a
+      <build>
066e0a
+        <plugins>
066e0a
+          <plugin>
066e0a
+            <artifactId>maven-antrun-plugin</artifactId>
066e0a
+            <executions>
066e0a
+              <execution>
066e0a
+                <id>compile-executable-natives</id>
066e0a
+                <phase>generate-resources</phase>
066e0a
+                <configuration>
066e0a
+                  <target>
066e0a
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
066e0a
+                  </target>
066e0a
+                </configuration>
066e0a
+                <goals>
066e0a
+                  <goal>run</goal>
066e0a
+                </goals>
066e0a
+              </execution>
066e0a
+            </executions>
066e0a
+          </plugin>
066e0a
+        </plugins>
066e0a
+      </build>
066e0a
+    </profile>
066e0a
+    <profile>
066e0a
+      <id>build-native-launchers-gtk.linux.s390</id>
066e0a
+      <activation>
066e0a
+        <property>
066e0a
+          <name>native</name>
066e0a
+          <value>gtk.linux.s390</value>
066e0a
+        </property>
066e0a
+      </activation>
066e0a
+      <build>
066e0a
+        <plugins>
066e0a
+          <plugin>
066e0a
+            <artifactId>maven-antrun-plugin</artifactId>
066e0a
+            <executions>
066e0a
+              <execution>
066e0a
+                <id>compile-executable-natives</id>
066e0a
+                <phase>generate-resources</phase>
066e0a
+                <configuration>
066e0a
+                  <target>
066e0a
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
066e0a
+                  </target>
066e0a
+                </configuration>
066e0a
+                <goals>
066e0a
+                  <goal>run</goal>
066e0a
+                </goals>
066e0a
+              </execution>
066e0a
+            </executions>
066e0a
+          </plugin>
066e0a
+        </plugins>
066e0a
+      </build>
066e0a
+    </profile>
10f0d1
+
10f0d1
     <profile>
10f0d1
       <id>build-native-launchers-win32.win32.x86_64</id>
10f0d1
       <activation>
066e0a
@@ -530,8 +530,8 @@
066e0a
                         <include name="gtk/solaris/x86/**/*" />
066e0a
                         <include name="win32/win32/x86/**/*" />
066e0a
                         <include name="win32/win32/x86_64/**/*" />
066e0a
-                      </fileset>
066e0a
-                      <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/">
066e0a
+                        <include name="gtk/linux/arm/**/*" />
066e0a
+                        <include name="gtk/linux/aarch64/**/*" />
066e0a
                         <include name="gtk/linux/s390/**/*" />
066e0a
                         <include name="gtk/linux/s390x/**/*" />
066e0a
                       </fileset>
10f0d1
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml	2014-05-26 19:20:28.958177815 +0300
10f0d1
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml	2014-05-26 19:33:42.942025740 +0300
066e0a
@@ -30,6 +30,44 @@
10f0d1
         <version>2.6</version>
10f0d1
         <executions>
10f0d1
           <execution>
10f0d1
+            <id>copy-resources-gtk.linux.aarch64</id>
10f0d1
+            <phase>validate</phase>
10f0d1
+            <goals>
10f0d1
+              <goal>copy-resources</goal>
10f0d1
+            </goals>
10f0d1
+            <configuration>
10f0d1
+              <outputDirectory>${basedir}/target/resources/linux.gtk.aarch64</outputDirectory>
10f0d1
+              <resources>
10f0d1
+                <resource>
10f0d1
+                  <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.aarch64</directory>
10f0d1
+                  <includes>
10f0d1
+                    <include>about_files/*</include>
10f0d1
+                    <include>about.html</include>
10f0d1
+                  </includes>
10f0d1
+                </resource>
10f0d1
+              </resources>
10f0d1
+            </configuration>
10f0d1
+          </execution>
10f0d1
+        <execution>
10f0d1
+            <id>copy-resources-gtk.linux.arm</id>
10f0d1
+            <phase>validate</phase>
10f0d1
+            <goals>
10f0d1
+              <goal>copy-resources</goal>
10f0d1
+            </goals>
10f0d1
+            <configuration>
10f0d1
+              <outputDirectory>${basedir}/target/resources/linux.gtk.arm</outputDirectory>
10f0d1
+              <resources>
10f0d1
+                <resource>
10f0d1
+                  <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.arm</directory>
10f0d1
+                  <includes>
10f0d1
+                    <include>about_files/*</include>
10f0d1
+                    <include>about.html</include>
10f0d1
+                  </includes>
10f0d1
+                </resource>
10f0d1
+              </resources>
10f0d1
+            </configuration>
10f0d1
+          </execution>
10f0d1
+          <execution>
10f0d1
             <id>copy-resources-gtk.linux.x86</id>
10f0d1
             <phase>validate</phase>
10f0d1
             <goals>