Bug 268772 [releng] Move e4 up to M6
diff --git a/org.eclipse.e4.builder/builder/general/build.properties b/org.eclipse.e4.builder/builder/general/build.properties
index 3395923..94b8ff9 100644
--- a/org.eclipse.e4.builder/builder/general/build.properties
+++ b/org.eclipse.e4.builder/builder/general/build.properties
@@ -301,7 +301,7 @@
#p2.category.site=file:${buildDirectory}/features/${topLevelElementId}/site.xml
# a list of archived p2 repos to compile against
-repoBaseLocation=${targetDir}/${untransformed.dir}
-transformedRepoLocation=${targetDir}/${untransformed.dir}-trans
+repoBaseLocation=${untransformed.dir}
+transformedRepoLocation=${untransformed.dir}-trans
diff --git a/org.eclipse.e4.builder/builder/general/tests/test.xml b/org.eclipse.e4.builder/builder/general/tests/test.xml
index 44f025f..c2a3147 100644
--- a/org.eclipse.e4.builder/builder/general/tests/test.xml
+++ b/org.eclipse.e4.builder/builder/general/tests/test.xml
@@ -19,7 +19,7 @@
<property name="repoLocation" value="${basedir}/../../${e4.buildLabel}/repository"/>
- <property name="galileoRepo" value="${basedir}/../../../targets/galileo-us-m6-cand-runnable"/>
+ <property name="galileoRepo" value="${repo.dir}"/>
<property name="testRepo" value="${basedir}/testRepo"/>
<!-- The directory that will contain all files containing information on the tests that ran.-->
diff --git a/org.eclipse.e4.builder/scripts/masterBuild.sh b/org.eclipse.e4.builder/scripts/masterBuild.sh
index 40ea5b7..1cda8fa 100755
--- a/org.eclipse.e4.builder/scripts/masterBuild.sh
+++ b/org.eclipse.e4.builder/scripts/masterBuild.sh
@@ -30,7 +30,7 @@
# available builds
#basebuilderBranch=$( grep v2009 /cvsroot/eclipse/org.eclipse.releng.basebuilder/about.html,v | head -1 | cut -f1 -d: | tr -d "[:blank:]" )
#eclipseIBuild=$( ls -d /home/data/httpd/download.eclipse.org/eclipse/downloads/drops/I*/eclipse-SDK-I*-linux-gtk${archProp}.tar.gz | tail -1 | cut -d/ -f9 )
- basebuilderBranch=v20090316
+ basebuilderBranch=v20090316a
eclipseIBuild=I20090313-0100
}
@@ -46,7 +46,7 @@
buildtime=$( date +%H%M )
projRoot=':pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse'
- basebuilderBranch=v20090316
+ basebuilderBranch=v20090316a
eclipseIBuild=I20090313-0100
}
@@ -55,7 +55,9 @@
javaHome=/opt/public/common/ibm-java2-ppc-50
buildTimestamp=${builddate}-${buildtime}
buildDir=${supportDir}/downloads/drops/4.0.0
- targetZips=$buildDir/targets/downloads
+ targetDir=${buildDir}/targets
+ targetZips=$targetDir/downloads
+ untransformedRepo=${targetDir}/galileo-repo-m6-cand
buildDirectory=$buildDir/I$buildTimestamp
testDir=$buildDirectory/tests
buildResults=$buildDirectory/I$buildTimestamp
@@ -150,6 +152,7 @@
cat $buildDirectory/test.properties >> test.properties
cat $buildDirectory/label.properties >> label.properties
+ echo repo.dir=${untransformedRepo}-trans >repo.properties
#for f in $buildResults/*.zip; do
# FN=$( basename $f )
@@ -160,7 +163,7 @@
cp -r $supportDir/org.eclipse.e4.builder/builder/general/tests/* .
./runtests -os linux -ws gtk \
- -arch ${arch} e4
+ -arch ${arch} -properties repo.properties e4
mkdir -p $buildResults/results
cp -r results/* $buildResults/results
@@ -192,6 +195,7 @@
-Dbuilddate=$builddate \
-Dbuildtime=$buildtime \
-DeclipseBuildId=$eclipseIBuild \
+ -Duntransformed.dir=${untransformedRepo}
${archJavaProp} \
-DbuildArea=$buildDir \
-DbuildDirectory=$buildDirectory \
