Bug 579795 Create stand-alone AArch64 builds for Mac, Linux
Second go
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=579795
Change-Id: I70ea7d96bfcd24cc941d5d795bb406b99cae8189
diff --git a/org.eclipse.mat.product/pom.xml b/org.eclipse.mat.product/pom.xml
index 44d9d26..20e27a5 100644
--- a/org.eclipse.mat.product/pom.xml
+++ b/org.eclipse.mat.product/pom.xml
@@ -101,7 +101,7 @@
<version>1.7</version>
<executions>
<execution>
- <id>tidyp2</id>
+ <id>tidyp2-x86_64</id>
<phase>package</phase>
<goals>
<goal>run</goal>
@@ -110,13 +110,44 @@
<target>
<!-- Remove unneeded executable -->
<delete includeemptydirs="false" failonerror="false">
- <fileset dir="${project.build.directory}/products/org.eclipse.mat.ui.rcp.MemoryAnalyzer/macosx/cocoa/${arch}/mat.app/Contents/Eclipse/p2/org.eclipse.equinox.p2.core/cache/">
+ <fileset dir="${project.build.directory}/products/org.eclipse.mat.ui.rcp.MemoryAnalyzer/macosx/cocoa/x86_64/mat.app/Contents/Eclipse/p2/org.eclipse.equinox.p2.core/cache/">
<include name="**" />
</fileset>
</delete>
<!-- Sign library -->
<first id="eclipse.so">
- <fileset dir="${project.build.directory}/products/org.eclipse.mat.ui.rcp.MemoryAnalyzer/macosx/cocoa/${arch}/mat.app/Contents/Eclipse/plugins" includes="**/*.so" />
+ <fileset dir="${project.build.directory}/products/org.eclipse.mat.ui.rcp.MemoryAnalyzer/macosx/cocoa/x86_64/mat.app/Contents/Eclipse/plugins" includes="**/*.so" />
+ </first>
+ <exec dir="${project.build.directory}" executable="curl">
+ <arg value="--output"/>
+ <arg value="${toString:eclipse.so}"/>
+ <arg value="--form"/>
+ <arg value="file=@${toString:eclipse.so}"/>
+ <arg value="--silent"/>
+ <arg value="--show-error"/>
+ <arg value="--fail"/>
+ <arg value="https://cbi.eclipse.org/macos/codesign/sign"/>
+ </exec>
+ </target>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tidyp2-aarch64</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- Remove unneeded executable -->
+ <delete includeemptydirs="false" failonerror="false">
+ <fileset dir="${project.build.directory}/products/org.eclipse.mat.ui.rcp.MemoryAnalyzer/macosx/cocoa/aarch64/mat.app/Contents/Eclipse/p2/org.eclipse.equinox.p2.core/cache/">
+ <include name="**" />
+ </fileset>
+ </delete>
+ <!-- Sign library -->
+ <first id="eclipse.so">
+ <fileset dir="${project.build.directory}/products/org.eclipse.mat.ui.rcp.MemoryAnalyzer/macosx/cocoa/aarch64/mat.app/Contents/Eclipse/plugins" includes="**/*.so" />
</first>
<exec dir="${project.build.directory}" executable="curl">
<arg value="--output"/>
@@ -203,12 +234,26 @@
<version>${cbi-plugins.version}</version>
<executions>
<execution>
+ <id>dmg-package-mat-x86_64</id>
<goals>
<goal>package-dmg</goal>
</goals>
<phase>integration-test</phase>
<configuration>
- <source>${project.build.directory}/products/org.eclipse.mat.ui.rcp.MemoryAnalyzer-macosx.cocoa.${arch}.zip</source>
+ <source>${project.build.directory}/products/org.eclipse.mat.ui.rcp.MemoryAnalyzer-macosx.cocoa.x86_64.zip</source>
+ <timeoutMillis>600000</timeoutMillis> <!-- 10 min -->
+ <continueOnFail>${macSigner.forceContinue}</continueOnFail>
+ <sign>true</sign>
+ </configuration>
+ </execution>
+ <execution>
+ <id>dmg-package-mat-aarch64</id>
+ <goals>
+ <goal>package-dmg</goal>
+ </goals>
+ <phase>integration-test</phase>
+ <configuration>
+ <source>${project.build.directory}/products/org.eclipse.mat.ui.rcp.MemoryAnalyzer-macosx.cocoa.aarch64.zip</source>
<timeoutMillis>600000</timeoutMillis> <!-- 10 min -->
<continueOnFail>${macSigner.forceContinue}</continueOnFail>
<sign>true</sign>
