diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties index ed2ac2216169540de161328a115caeb33d9df6d3..69a117b5432cc27399b5745da20356b3f4256816 100644 --- a/releng.wtpbuilder/build.properties +++ b/releng.wtpbuilder/build.properties @@ -1,19 +1,4 @@ -# uncomment if its desired to skip unit tests -# (if not already defined from elsewhere) -# skipUnitTests=yes - -# javacFailOnError must be false otherwise the -# build will terminated at the first compile error -javacFailOnError=false -javacDebugInfo=true - -# 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 - - # This is the eclipse releng driver # It is only used to drive the build process # it must be relative to the build home @@ -46,10 +31,6 @@ archivesFormat=*,*,*-antZip #compilerArg=-showversion -encoding ISO-8859-1 -warn:-discouraged,serial,raw compilerArg=-showversion -encoding ISO-8859-1 -warn:-serial,raw,typeHiding,unchecked -logExtension=.xml -# 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 ############################################################# @@ -90,10 +71,6 @@ build.directory=workdir # It must be relative to the buildHome build.local.repository=downloads -# 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 - ############################################################# # Other inline resolved properties diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml index 918ac5b892dc3099e3114c3fe0c6277af37bbcc7..9b029efd69c1fa290de0665381c0827737452c65 100644 --- a/releng.wtpbuilder/scripts/build/runbuild.xml +++ b/releng.wtpbuilder/scripts/build/runbuild.xml @@ -309,9 +309,10 @@ name="J2SE-1.5" value="${env.JAVA_5_HOME}/jre/lib/core.jar:${env.JAVA_5_HOME}/jre/lib/vm.jar:${env.JAVA_5_HOME}/jre/lib/xml.jar:${env.JAVA_5_HOME}/jre/lib/graphics.jar:${env.JAVA_5_HOME}/jre/lib/server.jar:${env.JAVA_5_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_5_HOME}/jre/lib/security.jar" /> + <!-- local builds must set build.trial to true, in runbuild.properties, to avoid erroneous time stamps --> <property name="build.trial" - value="true" /> + value="false" /> <fail unless="J2SE-1.5" diff --git a/releng.wtpbuilder/scripts/upload/upload.xml b/releng.wtpbuilder/scripts/upload/upload.xml index ee1db7aace0a646c9928886bf731b78848ffa8d1..0cb42b7c0003858dfb6d4401bea039e88dcd10dd 100644 --- a/releng.wtpbuilder/scripts/upload/upload.xml +++ b/releng.wtpbuilder/scripts/upload/upload.xml @@ -3,11 +3,6 @@ default="upload" basedir="."> - <!-- if site-sub-dir not set by caller, assume its committers --> - <property - name="site-sub-dir" - value="committers" /> - <!-- = = = standard properties pattern = = = --> <!-- Note to be cross-platform, "environment variables" are only appropriate for @@ -28,6 +23,11 @@ <!-- if not otherwise set, these are standard properties --> + + <property + name="site-sub-dir" + value="committers" /> + <property name="uploadUser" @@ -85,7 +85,9 @@ <condition property="doUpload"> <equals arg1="${env.BUILD_UPLOAD}" - arg2="true" /> + arg2="true" + casesensitive="false" + trim="true"/> </condition> </target>