fix build upload
diff --git a/releng.control/checkout.xml b/releng.control/checkout.xml
index 0d1100a..096f846 100644
--- a/releng.control/checkout.xml
+++ b/releng.control/checkout.xml
@@ -19,9 +19,9 @@
<property file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
<!-- = = = end standard properties pattern = = = -->
- <!-- if not otherwise set, the following are standard values -->
+ <!-- if not otherwise set, the following are good default values -->
<property name="checkout.wtpbuilder.clean" value="true"/>
-
+ <property name="mapVersionTag" value="HEAD" />
<property name="codir"
value="${env.BUILD_HOME}/build-node/checkout/${checkoutprojectname}" />
diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties
index c411706..7161546 100644
--- a/releng.wtpbuilder/build.properties
+++ b/releng.wtpbuilder/build.properties
@@ -95,18 +95,7 @@
cvsProtocol=ext
cvsUser=david_williams
-# needs to be valid committer id, and ext to tag (non trial) builds
-mapVersionTag=HEAD
-mapCvsProtocol=pserver
-mapCvsUser=davidw
-# This parameter is specific to the compiler
-# being used (JDT Compiler, in our case).
-# 'showversion' causes the version of JDT Compiler to be
-# printed to the compiler log file.
-compilerArg=-showversion -encoding ISO-8859-1 -warn:-discouraged,serial
-
-##################################################
# Asks the compiler for verbose output. This should be set to true in order for *.bin.log files to be generated when
# using the JDT Compiler Adapter to compile.
javacVerbose=true
@@ -120,6 +109,5 @@
pde.build.scripts=${pde.builder.path}/plugins/org.eclipse.pde.build/scripts
buildDirectory=${env.BUILD_HOME}/${build.current}-${build.distribution}-${buildBranch}-${buildType}/${build.directory}
pde.builder.path=${env.BUILD_HOME}/builders/${eclipse.builder.version}/${eclipse.builder}
-builder=${basedir}/components/${component}
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/dali-sdk/customTargets.xml b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
index e309785..6844254 100644
--- a/releng.wtpbuilder/components/dali-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
@@ -9,7 +9,6 @@
<target name="allElements">
<echo message="Target:${target} " />
<echo message="basedir: ${basedir}" />
- <echo message="component: ${component}" />
<echo message="buildDirectory: ${buildDirectory}" />
<echo message="baseLocation: ${baseLocation}" />
<echo message="generic target: ${genericTargets}" />
diff --git a/releng.wtpbuilder/components/dali.tests/customTargets.xml b/releng.wtpbuilder/components/dali.tests/customTargets.xml
index fcc0ddf..5c65340 100644
--- a/releng.wtpbuilder/components/dali.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/dali.tests/customTargets.xml
@@ -9,7 +9,6 @@
<target name="allElements">
<echo message="Target: ${target} " />
<echo message="basedir: ${basedir}" />
- <echo message="component: ${component}" />
<echo message="buildDirectory: ${buildDirectory}" />
<echo message="baseLocation: ${baseLocation}" />
<echo message="generic target: ${genericTargets}" />
diff --git a/releng.wtpbuilder/components/dali/customTargets.xml b/releng.wtpbuilder/components/dali/customTargets.xml
index 8842fe5..c882128 100644
--- a/releng.wtpbuilder/components/dali/customTargets.xml
+++ b/releng.wtpbuilder/components/dali/customTargets.xml
@@ -10,7 +10,6 @@
<target name="allElements">
<echo message="Target: ${target} " />
<echo message="basedir: ${basedir}" />
- <echo message="component: ${component}" />
<echo message="buildDirectory: ${buildDirectory}" />
<echo message="baseLocation: ${baseLocation}" />
<echo message="generic target: ${genericTargets}" />
diff --git a/releng.wtpbuilder/components/jsf-sdk/customTargets.xml b/releng.wtpbuilder/components/jsf-sdk/customTargets.xml
index bb0ba25..9c996f0 100644
--- a/releng.wtpbuilder/components/jsf-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jsf-sdk/customTargets.xml
@@ -9,7 +9,6 @@
<target name="allElements">
<echo message="Target:${target} " />
<echo message="basedir: ${basedir}" />
- <echo message="component: ${component}" />
<echo message="buildDirectory: ${buildDirectory}" />
<echo message="baseLocation: ${baseLocation}" />
<echo message="generic target: ${genericTargets}" />
diff --git a/releng.wtpbuilder/components/jsf.tests/customTargets.xml b/releng.wtpbuilder/components/jsf.tests/customTargets.xml
index 82eade2..e21b768 100644
--- a/releng.wtpbuilder/components/jsf.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jsf.tests/customTargets.xml
@@ -9,7 +9,6 @@
<target name="allElements">
<echo message="Target: ${target} " />
<echo message="basedir: ${basedir}" />
- <echo message="component: ${component}" />
<echo message="buildDirectory: ${buildDirectory}" />
<echo message="baseLocation: ${baseLocation}" />
diff --git a/releng.wtpbuilder/components/jsf/customTargets.xml b/releng.wtpbuilder/components/jsf/customTargets.xml
index 0328ae9..35e77d7 100644
--- a/releng.wtpbuilder/components/jsf/customTargets.xml
+++ b/releng.wtpbuilder/components/jsf/customTargets.xml
@@ -9,7 +9,6 @@
<target name="allElements">
<echo message="Target: ${target}" />
<echo message="basedir: ${basedir}" />
- <echo message="component: ${component}" />
<echo message="buildDirectory: ${buildDirectory}" />
<echo message="baseLocation: ${baseLocation}" />
<echo message="generic target: ${genericTargets}" />
diff --git a/releng.wtpbuilder/components/jst-sdk/customTargets.xml b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
index 38a16da..3b921c1 100644
--- a/releng.wtpbuilder/components/jst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
@@ -13,7 +13,6 @@
<target name="allElements">
<echo message="Target:${target} " />
<echo message="basedir: ${basedir}" />
- <echo message="component: ${component}" />
<echo message="buildDirectory: ${buildDirectory}" />
<echo message="baseLocation: ${baseLocation}" />
<ant
diff --git a/releng.wtpbuilder/components/jst.tests/customTargets.xml b/releng.wtpbuilder/components/jst.tests/customTargets.xml
index 4338258..e66fd2c 100644
--- a/releng.wtpbuilder/components/jst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jst.tests/customTargets.xml
@@ -9,7 +9,6 @@
<target name="allElements">
<echo message="Target:${target} " />
<echo message="basedir: ${basedir}" />
- <echo message="component: ${component}" />
<echo message="buildDirectory: ${buildDirectory}" />
<echo message="baseLocation: ${baseLocation}" />
<ant
diff --git a/releng.wtpbuilder/components/jst/customTargets.xml b/releng.wtpbuilder/components/jst/customTargets.xml
index 09bfe2b..5401d30 100644
--- a/releng.wtpbuilder/components/jst/customTargets.xml
+++ b/releng.wtpbuilder/components/jst/customTargets.xml
@@ -10,7 +10,6 @@
<target name="allElements">
<echo message="Target:${target} " />
<echo message="basedir: ${basedir}" />
- <echo message="component: ${component}" />
<echo message="buildDirectory: ${buildDirectory}" />
<echo message="baseLocation: ${baseLocation}" />
<ant
diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
index d02b2bc..60c7d0b 100644
--- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
@@ -9,7 +9,6 @@
<target name="allElements">
<echo message="Target:${target} " />
<echo message="basedir: ${basedir}" />
- <echo message="component: ${component}" />
<echo message="buildDirectory: ${buildDirectory}" />
<echo message="baseLocation: ${baseLocation}" />
<echo message="generic target: ${genericTargets}" />
diff --git a/releng.wtpbuilder/components/wst.tests/customTargets.xml b/releng.wtpbuilder/components/wst.tests/customTargets.xml
index 5334f55..fe34e94 100644
--- a/releng.wtpbuilder/components/wst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wst.tests/customTargets.xml
@@ -11,7 +11,6 @@
<target name="allElements">
<echo message="Target:${target} " />
<echo message="basedir: ${basedir}" />
- <echo message="component: ${component}" />
<echo message="buildDirectory: ${buildDirectory}" />
<echo message="baseLocation: ${baseLocation}" />
<ant
diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml
index 47822ed..87c3ea4 100644
--- a/releng.wtpbuilder/components/wst/customTargets.xml
+++ b/releng.wtpbuilder/components/wst/customTargets.xml
@@ -9,7 +9,6 @@
<target name="allElements">
<echo message="Target:${target} " />
<echo message="basedir: ${basedir}" />
- <echo message="component: ${component}" />
<echo message="buildDirectory: ${buildDirectory}" />
<echo message="baseLocation: ${baseLocation}" />
<echo message="generic target: ${genericTargets}" />
diff --git a/releng.wtpbuilder/components/wtp-thirdparty/customTargets.xml b/releng.wtpbuilder/components/wtp-thirdparty/customTargets.xml
index 6bb7d2fa..c9da5ce 100644
--- a/releng.wtpbuilder/components/wtp-thirdparty/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-thirdparty/customTargets.xml
@@ -9,7 +9,6 @@
<target name="allElements">
<echo message="Target:${target} " />
<echo message="basedir: ${basedir}" />
- <echo message="component: ${component}" />
<echo message="buildDirectory: ${buildDirectory}" />
<echo message="baseLocation: ${baseLocation}" />
<ant
diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index 966d453..1169733 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -39,13 +39,12 @@
value="jst-sdk" />
</ant>
- <!--
<ant antfile="${buildTargets}">
<property
name="component"
value="jsf" />
</ant>
- -->
+
<ant antfile="${buildTargets}">
<property
name="component"
@@ -61,13 +60,13 @@
name="component"
value="dali-sdk" />
</ant>
-<!--
+
<ant antfile="${buildTargets}">
<property
name="component"
value="jsf-sdk" />
</ant>
--->
+
<ant antfile="${buildTargets}">
<property
@@ -84,13 +83,13 @@
name="component"
value="dali.tests" />
</ant>
-<!--
+
<ant antfile="${buildTargets}">
<property
name="component"
value="jsf.tests" />
</ant>
--->
+
<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
</target>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 423694d..3d88455 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -43,10 +43,10 @@
<unzip dest="${testRoot}" src="${buildDirectory}/${buildLabel}/wtp-wst-Automated-Tests-${buildLabel}.zip" overwrite="true" />
<unzip dest="${testRoot}" src="${buildDirectory}/${buildLabel}/wtp-jst-Automated-Tests-${buildLabel}.zip" overwrite="true" />
- <!--
+
<unzip dest="${testRoot}" src="${buildDirectory}/${buildLabel}/wtp-jsf-${buildLabel}.zip" overwrite="true" />
<unzip dest="${testRoot}" src="${buildDirectory}/${buildLabel}/wtp-jsf-Automated-Tests-${buildLabel}.zip" overwrite="true" />
- -->
+
<unzip dest="${testRoot}" src="${buildDirectory}/${buildLabel}/wtp-jpa-${buildLabel}.zip" overwrite="true" />
<unzip dest="${testRoot}" src="${buildDirectory}/${buildLabel}/wtp-jpa-Automated-Tests-${buildLabel}.zip" overwrite="true" />
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index bea21e3..99d3950 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -59,13 +59,10 @@
<!--run the build for the specified component-->
<echo message="basedir: ${basedir}" />
- <echo message="component: ${component}" />
<echo message="buildDirectory: ${buildDirectory}" />
<echo message="wtp.builder.home: ${wtp.builder.home}" />
<ant antfile="build.xml" dir="${pde.build.scripts}">
- <property name="builder"
- value="${wtp.builder.home}/components/${component}" />
<property name="wtp.builder.home"
value="${wtp.builder.home}" />
<property name="buildBranch"
@@ -153,7 +150,7 @@
</target>
<target name="runEclipseBuild" if="buildId">
- <java taskname="build-${build.distribution}-${component}"
+ <java taskname="build-${build.distribution}"
classpath="${pde.builder.path}/startup.jar"
fork="true"
classname="org.eclipse.core.launcher.Main"
@@ -171,7 +168,6 @@
<jvmarg value="-DcvsProtocol=${cvsProtocol}" />
<jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
<jvmarg value="-Dbuild.distribution=${build.distribution}" />
- <jvmarg value="-Dcomponent=${component}" />
<jvmarg value="-DJ2SE-1.5=${env.J2SE15}" />
<jvmarg value="-DJ2SE-1.4=${env.J2SE14}" />
<arg value="-application" />
@@ -183,7 +179,7 @@
</target>
<target name="runEclipseBuildStamped" unless="buildId">
- <java taskname="build-${build.distribution}-${component}"
+ <java taskname="build-${build.distribution}"
classpath="${pde.builder.path}/startup.jar"
fork="true"
classname="org.eclipse.core.launcher.Main"
@@ -200,7 +196,6 @@
<jvmarg value="-DcvsProtocol=${cvsProtocol}" />
<jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
<jvmarg value="-Dbuild.distribution=${build.distribution}" />
- <jvmarg value="-Dcomponent=${component}" />
<jvmarg value="-DJ2SE-1.5=${env.J2SE15}" />
<jvmarg value="-DJ2SE-1.4=${env.J2SE14}" />
<arg value="-application" />