Try building only one e4 SDK
diff --git a/org.eclipse.e4.builder/builder/general/customTargets.xml b/org.eclipse.e4.builder/builder/general/customTargets.xml
index 8749cb5..8f24e76 100644
--- a/org.eclipse.e4.builder/builder/general/customTargets.xml
+++ b/org.eclipse.e4.builder/builder/general/customTargets.xml
@@ -227,20 +227,8 @@
<mkdir dir="${p2.output.base}" />
<property name="directorlog" value="${buildlogs}/director.txt" />
- <property name="p2.sdk.install.win32.win32.x86" value="${p2.output.base}/sdk.install.win32.win32.x86" />
- <mkdir dir="${p2.sdk.install.win32.win32.x86}" />
- <property name="p2.sdk.install.win32.win32.x86_64" value="${p2.output.base}/sdk.install.win32.win32.x86_64" />
- <mkdir dir="${p2.sdk.install.win32.win32.x86_64}" />
- <property name="p2.sdk.install.linux.gtk.x86" value="${p2.output.base}/sdk.install.linux.gtk.x86" />
- <mkdir dir="${p2.sdk.install.linux.gtk.x86}" />
- <property name="p2.sdk.install.linux.gtk.x86_64" value="${p2.output.base}/sdk.install.linux.gtk.x86_64" />
- <mkdir dir="${p2.sdk.install.linux.gtk.x86_64}" />
<property name="p2.sdk.install.linux.gtk.ppc" value="${p2.output.base}/sdk.install.linux.gtk.ppc" />
<mkdir dir="${p2.sdk.install.linux.gtk.ppc}" />
- <property name="p2.sdk.install.macosx.cocoa.x86" value="${p2.output.base}/sdk.install.macosx.cocoa.x86" />
- <mkdir dir="${p2.sdk.install.macosx.cocoa.x86}" />
- <property name="p2.sdk.install.macosx.cocoa.x86_64" value="${p2.output.base}/sdk.install.macosx.cocoa.x86_64" />
- <mkdir dir="${p2.sdk.install.macosx.cocoa.x86_64}" />
<antcall target="e4.product"/>
@@ -249,7 +237,7 @@
<delete file="${buildDirectory}/version.properties"/>
<antcall target="run.version.query">
- <param name="list.repo" value="file:${p2.sdk.install.linux.gtk.x86}/eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile" />
+ <param name="list.repo" value="file:${p2.sdk.install.linux.gtk.ppc}/eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile" />
<param name="list.iu" value="org.eclipse.e4.workbench.sdk,org.eclipse.emf,org.eclipse.gef,org.eclipse.sdk,org.eclipse.wst.jsdt.ui,org.eclipse.xsd,org.eclipse.wst.xml_ui.feature.feature.group" />
</antcall>
<property file="${buildDirectory}/version.properties"/>
@@ -363,6 +351,7 @@
</target>
<target name="provision.e4">
+ <!--
<antcall target="run.director">
<param name="p2.director.installIU" value="org.eclipse.e4.workbench.sdk" />
<param name="p2.director.profile" value="SDKProfile" />
@@ -402,7 +391,7 @@
<param name="p2.ws" value="gtk" />
<param name="p2.arch" value="x86_64" />
</antcall>
-
+ -->
<antcall target="run.director">
<param name="p2.director.installIU" value="org.eclipse.e4.workbench.sdk" />
<param name="p2.director.profile" value="SDKProfile" />
@@ -413,6 +402,7 @@
<param name="p2.arch" value="ppc" />
</antcall>
+ <!--
<antcall target="run.director">
<param name="p2.director.installIU" value="org.eclipse.e4.workbench.sdk" />
<param name="p2.director.profile" value="SDKProfile" />
@@ -432,7 +422,9 @@
<param name="p2.ws" value="cocoa" />
<param name="p2.arch" value="x86_64" />
</antcall>
+ -->
</target>
+
<target name="zip.install">
@@ -442,46 +434,6 @@
<parallel failonany="true" threadCount='4'>
<sequential>
- <!-- win32 win32 x86 -->
- <delete file="${buildDirectory}/${buildLabel}/eclipse-e4-SDK-incubation-${buildLabel}-win32.zip" failonerror="false" />
- <exec dir="${p2.sdk.install.win32.win32.x86}" executable="zip">
- <arg line="-q ${buildDirectory}/${buildLabel}/eclipse-e4-SDK-incubation-${buildLabel}-win32.zip -r ." />
- </exec>
- <!--antcall target="generateChecksums">
- <param name="archiveName" value="eclipse-e4-SDK-incubation-${buildLabel}-win32.zip" />
- </antcall-->
- </sequential>
- <sequential>
- <!-- win32 win32 x86_64 -->
- <delete file="${buildDirectory}/${buildLabel}/eclipse-e4-SDK-incubation-${buildLabel}-win32.x86_64.zip" failonerror="false" />
- <exec dir="${p2.sdk.install.win32.win32.x86_64}" executable="zip">
- <arg line="-q ${buildDirectory}/${buildLabel}/eclipse-e4-SDK-incubation-${buildLabel}-win32-x86_64.zip -r ." />
- </exec>
- <!--antcall target="generateChecksums">
- <param name="archiveName" value="eclipse-e4-SDK-incubation-${buildLabel}-win32.zip" />
- </antcall-->
- </sequential>
- <sequential>
- <!-- linux gtk x86 -->
- <antcall target="p2.tar">
- <param name="tar.base.dir" value="${p2.sdk.install.linux.gtk.x86}" />
- <param name="tar.base.filename" value="${buildDirectory}/${buildLabel}/eclipse-e4-SDK-incubation-${buildLabel}-linux-gtk.tar" />
- </antcall>
- <!--antcall target="generateChecksums">
- <param name="archiveName" value="eclipse-e4-SDK-incubation-${buildLabel}-linux-gtk.tar.gz" />
- </antcall-->
- </sequential>
- <sequential>
- <!-- linux gtk x86_64 -->
- <antcall target="p2.tar">
- <param name="tar.base.dir" value="${p2.sdk.install.linux.gtk.x86_64}" />
- <param name="tar.base.filename" value="${buildDirectory}/${buildLabel}/eclipse-e4-SDK-incubation-${buildLabel}-linux-gtk-x86_64.tar" />
- </antcall>
- <!--antcall target="generateChecksums">
- <param name="archiveName" value="eclipse-e4-SDK-incubation-${buildLabel}-linux-gtk.tar.gz" />
- </antcall-->
- </sequential>
- <sequential>
<!-- linux gtk ppc-->
<antcall target="p2.tar">
<param name="tar.base.dir" value="${p2.sdk.install.linux.gtk.ppc}" />
@@ -493,36 +445,6 @@
</sequential>
- <sequential>
- <!-- macosx -->
- <!-- temp fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=223319 -->
- <delete file="${p2.sdk.install.macosx.cocoa.x86}/eclipse/eclipse" failonerror="false" />
- <exec dir="${p2.sdk.install.macosx.cocoa.x86}/eclipse" executable="ln">
- <arg line="-s Eclipse.app/Contents/MacOS/eclipse eclipse" />
- </exec>
- <antcall target="p2.tar">
- <param name="tar.base.dir" value="${p2.sdk.install.macosx.cocoa.x86}" />
- <param name="tar.base.filename" value="${buildDirectory}/${buildLabel}/eclipse-e4-SDK-incubation-${buildLabel}-macosx-cocoa.tar" />
- </antcall>
- <!--antcall target="generateChecksums">
- <param name="archiveName" value="eclipse-e4-SDK-incubation-${buildLabel}-macosx-cocoa.tar.gz" />
- </antcall-->
- </sequential>
- <sequential>
- <!-- macosx -->
- <!-- temp fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=223319 -->
- <delete file="${p2.sdk.install.macosx.cocoa.x86_64}/eclipse/eclipse" failonerror="false" />
- <exec dir="${p2.sdk.install.macosx.cocoa.x86_64}/eclipse" executable="ln">
- <arg line="-s Eclipse.app/Contents/MacOS/eclipse eclipse" />
- </exec>
- <antcall target="p2.tar">
- <param name="tar.base.dir" value="${p2.sdk.install.macosx.cocoa.x86_64}" />
- <param name="tar.base.filename" value="${buildDirectory}/${buildLabel}/eclipse-e4-SDK-incubation-${buildLabel}-macosx-cocoa-x86_64.tar" />
- </antcall>
- <!--antcall target="generateChecksums">
- <param name="archiveName" value="eclipse-e4-SDK-incubation-${buildLabel}-macosx-cocoa.tar.gz" />
- </antcall-->
- </sequential>
</parallel>
</target>
