Bug 325776 - [releng] S-4.1M2-201009161954 doesn't include eclipse 3.7 M2
Adapt to the new build.eclipse.org configuration.
diff --git a/org.eclipse.e4.builder/builder/general/customTargets.xml b/org.eclipse.e4.builder/builder/general/customTargets.xml
index ef24375..ad25918 100644
--- a/org.eclipse.e4.builder/builder/general/customTargets.xml
+++ b/org.eclipse.e4.builder/builder/general/customTargets.xml
@@ -405,6 +405,8 @@
<param name="p2.ws" value="gtk" />
<param name="p2.arch" value="x86" />
</antcall>
+ -->
+
<antcall target="run.director">
<param name="p2.director.installIU" value="org.eclipse.e4.workbench.sdk" />
@@ -415,7 +417,8 @@
<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" />
@@ -426,7 +429,6 @@
<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" />
@@ -458,10 +460,10 @@
<parallel failonany="true" threadCount='4'>
<sequential>
- <!-- linux gtk ppc-->
+ <!-- linux gtk x86_64 -->
<antcall target="p2.tar">
- <param name="tar.base.dir" value="${p2.sdk.install.linux.gtk.ppc}" />
- <param name="tar.base.filename" value="${buildDirectory}/${buildLabel}/eclipse-e4-SDK-incubation-${buildLabel}-linux-gtk-ppc.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-ppc.tar.gz" />
@@ -552,7 +554,7 @@
<!--invoke sign script and wait-->
<echo message="invoke sign script and wait" />
<exec dir="." executable="${signexec}" output="signing.txt" append="true">
- <arg line=" ${signUser}${signhost} ${signquote}/usr/bin/sign ${stagingDirectory}/${archiveName} nomail ${stagingDirectoryOutput}${signquote}" />
+ <arg line=" ${signUser}${signhost} ${signquote}/usr/local/bin/sign ${stagingDirectory}/${archiveName} nomail ${stagingDirectoryOutput}${signquote}" />
</exec>
<!--Wait for build to be available -->
diff --git a/org.eclipse.e4.builder/scripts/masterBuild.sh b/org.eclipse.e4.builder/scripts/masterBuild.sh
index fb7fb5b..07b9fda 100755
--- a/org.eclipse.e4.builder/scripts/masterBuild.sh
+++ b/org.eclipse.e4.builder/scripts/masterBuild.sh
@@ -3,8 +3,8 @@
quietCVS=-Q
writableBuildRoot=/shared/eclipse/e4
projRelengBranch="HEAD"; # default set below
-arch="x86"
-archProp=""
+arch="x86_64"
+archProp="-x86_64"
processor=$( uname -p )
if [ $processor = ppc -o $processor = ppc64 ]; then
archProp="-ppc"
@@ -55,7 +55,7 @@
}
commonProperties () {
- javaHome=/opt/public/common/ibm-java2-ppc-50
+ javaHome=/opt/public/common/jdk-1.6.x86_64
buildTimestamp=${builddate}-${buildtime}
buildDir=$writableBuildRoot/build/e4/downloads/drops/4.0.0
targetDir=${buildDir}/targets
@@ -389,7 +389,7 @@
#generateSwtZip
# try some tests
-runTheTests e4less
+#runTheTests e4less
cp /shared/eclipse/e4/logs/current.log \
$buildResults/buildlog.txt
