Update to 4.1/0.11 builds
diff --git a/org.eclipse.e4.builder/builder/general/build.properties b/org.eclipse.e4.builder/builder/general/build.properties
index 6dc028e..b30d545 100644
--- a/org.eclipse.e4.builder/builder/general/build.properties
+++ b/org.eclipse.e4.builder/builder/general/build.properties
@@ -292,7 +292,7 @@
p2.flavor=tooling
#p2.publish.artifacts=true
p2.root.name=${topLevelElementId}
-p2.root.version=0.9.1.v${buildId}
+p2.root.version=0.11.0.v${buildId}
p2.repo.name=e4 build ${buildId}
eclipse.p2.mirrors=false
# This won't quite do what you want
diff --git a/org.eclipse.e4.builder/builder/general/customTargets.xml b/org.eclipse.e4.builder/builder/general/customTargets.xml
index 07603e5..887bd4e 100644
--- a/org.eclipse.e4.builder/builder/general/customTargets.xml
+++ b/org.eclipse.e4.builder/builder/general/customTargets.xml
@@ -8,7 +8,7 @@
<property name="allElementsFile" location="${eclipse.pdebuild.templates}/headless-build/allElements.xml" />
<loadproperties srcfile="${builder}/update_repo.properties" />
<property name="transformedRepoLocation" value="${targetDir}/${targetDownloadId}" />
- <property name="updateSite" value="${targetDir}/updates/2010" />
+ <property name="updateSite" value="${targetDir}/updates/0.11-I-builds" />
<property name="repoBaseline" value="${updateSite}" />
diff --git a/org.eclipse.e4.builder/scripts/masterBuild.sh b/org.eclipse.e4.builder/scripts/masterBuild.sh
index 992e801..a21687f 100755
--- a/org.eclipse.e4.builder/scripts/masterBuild.sh
+++ b/org.eclipse.e4.builder/scripts/masterBuild.sh
@@ -167,11 +167,11 @@
cd $WORKSPACE/builds
mkdir -p $WORKSPACE/builds/I
#mkdir -p $WORKSPACE/builds/transfer/files/testUpdates-I
-updateDir=$targetDir/updates/4.0
+updateDir=$targetDir/updates/4.1-I-builds
rm -f $updateDir/build_done.txt
$WORKSPACE/org.eclipse.releng.eclipsebuilder/bootstrapHudsone4.sh -test -skipTest -buildDirectory $WORKSPACE/builds/I -sign -updateSite $updateDir I
-/bin/bash $writableBuildRoot/sdk/template/sync.sh
-/bin/bash $writableBuildRoot/sdk/template/publishLong.sh
+/bin/bash ${builderDir}/scripts/sync.sh
+/bin/bash ${builderDir}/scripts/publishLong.sh
}
runSDKBuild () {
@@ -193,12 +193,12 @@
-Dbuilddate=$( date +%Y%m%d ) \
-Dbuildtime=$( date +%H%M ) \
-Dbase=$buildDir/40builds \
- -DupdateSite=$targetDir/updates/4.0
+ -DupdateSite=$targetDir/updates/4.1-I-builds
"
echo $cmd
$cmd
-/bin/bash $writableBuildRoot/sdk/template/sync.sh
-/bin/bash $writableBuildRoot/sdk/template/publish.sh
+/bin/bash ${builderDir}/scripts/sync.sh
+/bin/bash ${builderDir}/scripts/publish.sh
}
@@ -288,7 +288,7 @@
}
sendMail () {
- mailx -s "Integration Build: I$buildTimestamp" e4-dev@eclipse.org <<EOF
+ mailx -s "0.11 Integration Build: I$buildTimestamp" e4-dev@eclipse.org <<EOF
Check here for test results and update site:
http://download.eclipse.org/e4/downloads/drops/I$buildTimestamp
@@ -398,7 +398,7 @@
if [ ! -z "$publishDir" ]; then
echo Publishing $buildResults to "$publishDir"
scp -r $buildResults "$publishDir"
- rsync --recursive --delete ${targetDir}/updates/2010 \
+ rsync --recursive --delete ${targetDir}/updates/0.11-I-Builds \
"${publishUpdates}"
sendMail
sleep 60
diff --git a/org.eclipse.e4.builder/scripts/publish.sh b/org.eclipse.e4.builder/scripts/publish.sh
index 511e45c..c4107a6 100755
--- a/org.eclipse.e4.builder/scripts/publish.sh
+++ b/org.eclipse.e4.builder/scripts/publish.sh
@@ -29,7 +29,7 @@
#HUDSON_COMMON=/shared/eclipse/e4/build/e4/downloads/drops/4.0.0/workspace/builds/transfer/files
HUDSON_COMMON=/shared/eclipse/e4/build/e4/downloads/drops/4.0.0/40builds
HUDSON_DROPS=$HUDSON_COMMON
-HUDSON_REPO=/shared/eclipse/e4/build/e4/downloads/drops/4.0.0/targets/updates/4.0
+HUDSON_REPO=/shared/eclipse/e4/build/e4/downloads/drops/4.0.0/targets/updates/4.1-I-builds
#HUDSON_REPO=$HUDSON_COMMON/testUpdates-I
process_build () {
@@ -68,9 +68,9 @@
echo Done $buildId
- mailx -s "4.0 SDK Build: $buildId" e4-dev@eclipse.org <<EOF
+ mailx -s "4.1 short SDK Build: $buildId" e4-dev@eclipse.org <<EOF
-The 4.0 SDK build:
+The 4.1 SDK build:
http://download.eclipse.org/e4/sdk/drops/$buildId
EOF
diff --git a/org.eclipse.e4.builder/scripts/publishLong.sh b/org.eclipse.e4.builder/scripts/publishLong.sh
index 99084b1..3ee602d 100755
--- a/org.eclipse.e4.builder/scripts/publishLong.sh
+++ b/org.eclipse.e4.builder/scripts/publishLong.sh
@@ -29,7 +29,7 @@
HUDSON_COMMON=/shared/eclipse/e4/build/e4/downloads/drops/4.0.0/workspace/builds/transfer/files
#HUDSON_COMMON=/shared/eclipse/e4/build/e4/downloads/drops/4.0.0/40builds
HUDSON_DROPS=$HUDSON_COMMON/bogus/downloads/drops
-HUDSON_REPO=/shared/eclipse/e4/build/e4/downloads/drops/4.0.0/targets/updates/4.0
+HUDSON_REPO=/shared/eclipse/e4/build/e4/downloads/drops/4.0.0/targets/updates/4.1-I-builds
#HUDSON_REPO=$HUDSON_COMMON/testUpdates-I
process_build () {
@@ -68,9 +68,9 @@
echo Done $buildId
- mailx -s "4.0 SDK Build: $buildId" e4-dev@eclipse.org <<EOF
+ mailx -s "4.1 SDK Build: $buildId" e4-dev@eclipse.org <<EOF
-The 4.0 SDK build:
+The 4.1 SDK build:
http://download.eclipse.org/e4/sdk/drops/$buildId
EOF
diff --git a/org.eclipse.e4.builder/scripts/sync.sh b/org.eclipse.e4.builder/scripts/sync.sh
index 36f801a..c67de27 100755
--- a/org.eclipse.e4.builder/scripts/sync.sh
+++ b/org.eclipse.e4.builder/scripts/sync.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
-fromDir=/shared/eclipse/e4/build/e4/downloads/drops/4.0.0/targets/updates/4.0
+fromDir=/shared/eclipse/e4/build/e4/downloads/drops/4.0.0/targets/updates/4.1-I-builds
toDir="pwebster@dev.eclipse.org:/home/data/httpd/download.eclipse.org/eclipse/updates"
rsync --recursive --delete "${fromDir}" "${toDir}"
diff --git a/org.eclipse.e4.builder/scripts/update.sh b/org.eclipse.e4.builder/scripts/update.sh
index cdefc67..1b0f98b 100755
--- a/org.eclipse.e4.builder/scripts/update.sh
+++ b/org.eclipse.e4.builder/scripts/update.sh
@@ -9,6 +9,6 @@
update_http download downloads
update_http download sdk
-update_http archive downloads
-update_http archive sdk
+#update_http archive downloads
+#update_http archive sdk
