Author: nickboldt Date: 2009-11-12 14:36:38 -0500 (Thu, 12 Nov 2009) New Revision: 18669 Modified: trunk/common/releng/build.properties trunk/common/releng/hudson/run.sh Log: stop using JAVA16 variable Modified: trunk/common/releng/build.properties =================================================================== --- trunk/common/releng/build.properties 2009-11-12 19:32:39 UTC (rev 18668) +++ trunk/common/releng/build.properties 2009-11-12 19:36:38 UTC (rev 18669) @@ -14,11 +14,9 @@ build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup -# MY_JAVA_HOME is this Hudson slave's environment's JAVA_HOME, renamed to avoid collision with default in org.eclipse.dash.common.releng/server.properties -JAVA_HOME=${MY_JAVA_HOME} -JAVA14_HOME=${MY_JAVA_HOME} -JAVA50_HOME=${MY_JAVA_HOME} -JAVA60_HOME=${MY_JAVA_HOME} +JAVA14_HOME=${JAVA_HOME} +JAVA50_HOME=${JAVA_HOME} +JAVA60_HOME=${JAVA_HOME} dependencyURLs=\ http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\ Modified: trunk/common/releng/hudson/run.sh =================================================================== --- trunk/common/releng/hudson/run.sh 2009-11-12 19:32:39 UTC (rev 18668) +++ trunk/common/releng/hudson/run.sh 2009-11-12 19:36:38 UTC (rev 18669) @@ -29,9 +29,6 @@ export ANT_HOME=/opt/apache-ant-1.7.1 fi -# collect Hudson's version of Java as defined globally for a given node -MY_JAVA_HOME=${JAVA_HOME} - # cache of downloaded requirements and other binaries downloadsDir="${WORKSPACE}/downloads"; if [[ ! -d $downloadsDir ]]; then mkdir -p $downloadsDir; fi @@ -195,7 +192,7 @@ ./start.sh -projectid ${projectid} -version ${version} -buildType ${buildType} -buildTimestamp ${buildTimestamp} \ -writableBuildRoot ${writableBuildRoot} -thirdPartyJarsDir ${thirdPartyJarsDir} -downloadsDir ${downloadsDir} -buildDir ${buildDir} \ ${projRelengName} ${projRelengRoot} ${projRelengPath} ${projRelengBranch} \ - -thirdPartyDownloadLicenseAcceptance -javaHome ${JAVA16} ${EXTRAFLAGS} 2>&1 + -thirdPartyDownloadLicenseAcceptance -javaHome ${JAVA_HOME} ${EXTRAFLAGS} 2>&1 # remove file so workspace navigation is one click simpler rm -f ${writableBuildRoot}/.cvspass