From 9ae13be685254213b124cb5e2cc3128b5dcad592 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Mon, 20 Aug 2007 07:17:07 +0000
Subject: [PATCH] move to improved Cruise Control
---
releng.wtpbuilder/build.properties | 6 +++---
releng.wtpbuilder/scripts/build/runbuild.xml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties
index 48f2f515e..633132e66 100644
--- a/releng.wtpbuilder/build.properties
+++ b/releng.wtpbuilder/build.properties
@@ -63,7 +63,7 @@ javacVerbose=true
# It must be relative to the build home
# Final name will include the ditribution name and build type
# e.g: build-wtp-I
-build.current=build
+build.current=projects
# Set this to the relative path for the
@@ -71,7 +71,7 @@ build.current=build
# It must be relative to the build home
# Final name will include the component and build type
# e.g: test-wtp-I
-build.tests=test
+build.tests=tests
# Set this to the relative path for the
# directory to be used for the peformance test.
@@ -120,5 +120,5 @@ eclipse.launcher=${pde.builder.path}/plugins/org.eclipse.equinox.launcher.jar
# in 3.2 based builds, pde's directory no longer has version number
#pde.build.scripts=${pde.builder.path}/plugins/org.eclipse.pde.build_${eclipse.base.version}/scripts
pde.build.scripts=${pde.builder.path}/plugins/org.eclipse.pde.build/scripts
-buildDirectory=${env.BUILD_HOME}/${build.current}-${build.distribution}-${buildBranch}-${buildType}/${build.directory}
+buildDirectory=${env.BUILD_HOME}/${build.current}/${build.distribution}-${buildBranch}-${buildType}/${build.directory}
pde.builder.path=${env.BUILD_HOME}/builders/${eclipse.builder.version}/${eclipse.builder}
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index 79e3d7695..b65f48bea 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -122,16 +122,16 @@
value="${env.LOCAL_PREREQS_CACHE}" />
<property
name="baseLocation"
- value="${env.BUILD_HOME}/${build.current}-${build.distribution}-${buildBranch}-${buildType}/${base.location}" />
+ value="${env.BUILD_HOME}/${build.current}/${build.distribution}-${buildBranch}-${buildType}/${base.location}" />
<property
name="build.pack-all-in-one"
value="${build.pack-all-in-one}" />
<property
name="buildRoot"
- value="${env.BUILD_HOME}/${build.current}-${build.distribution}-${buildBranch}-${buildType}" />
+ value="${env.BUILD_HOME}/${build.current}/${build.distribution}-${buildBranch}-${buildType}" />
<property
name="testRoot"
- value="${env.BUILD_HOME}/${build.tests}-${build.distribution}-${buildBranch}-${buildType}" />
+ value="${env.BUILD_HOME}/${build.tests}/${build.distribution}-${buildBranch}-${buildType}" />
<property
name="performanceRoot"
value="${env.BUILD_HOME}/${build.perf.tests}-${buildType}" />
--
GitLab