diff options
4 files changed, 14 insertions, 13 deletions
diff --git a/releng/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs b/releng/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs index 6d0d76b244..391c0e7e07 100644 --- a/releng/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs +++ b/releng/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ -#Thu Feb 11 09:28:44 CET 2010 +#Mon Feb 15 12:07:35 CET 2010 eclipse.preferences.version=1 encoding/build.rmap=UTF-8 +encoding/local.mspec=UTF-8 diff --git a/releng/org.eclipse.emf.cdo.releng/build.rmap b/releng/org.eclipse.emf.cdo.releng/build.rmap index 56913d5963..2bf1bc39e8 100644 --- a/releng/org.eclipse.emf.cdo.releng/build.rmap +++ b/releng/org.eclipse.emf.cdo.releng/build.rmap @@ -115,8 +115,8 @@ <rm:provider componentTypes="eclipse.feature" readerType="cvs"> <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/features/{1}-feature,{2}"> <bc:propertyRef key="cvs.repository"/> - <bc:propertyRef key="cvs.branch"/> <bc:propertyRef key="buckminster.component"/> + <bc:propertyRef key="cvs.branch"/> </rm:uri> </rm:provider> </rm:searchPath> diff --git a/releng/org.eclipse.emf.cdo.releng/build.xml b/releng/org.eclipse.emf.cdo.releng/build.xml index 9def403ac9..be0827e939 100644 --- a/releng/org.eclipse.emf.cdo.releng/build.xml +++ b/releng/org.eclipse.emf.cdo.releng/build.xml @@ -5,6 +5,10 @@ <isset property="server.build" /> </condition> + <condition property="mspec.file" value="build.mspec" else="local.mspec"> + <isset property="server.build" /> + </condition> + <property file="${properties.file}" /> <property environment="env" /> @@ -12,6 +16,10 @@ <isset property="env.WORKSPACE" /> </condition> + <condition property="buckminster.loglevel" value="${env.BUCKMINSTER_LOGLEVEL}" else="INFO"> + <isset property="env.BUCKMINSTER_LOGLEVEL" /> + </condition> + <condition property="site.pack200" value="${env.SITE_PACK200}"> <isset property="env.SITE_PACK200" /> </condition> @@ -74,7 +82,7 @@ <arg value="-data" /> <arg value="@{workspace}" /> <arg value="--loglevel" /> - <arg value="${env.BUCKMINSTER_LOGLEVEL}" /> + <arg value="${buckminster.loglevel}" /> <arg value="--displaystacktrace" /> <globargs /> <arg value="@{command}" /> @@ -173,13 +181,6 @@ <target name="provision" depends="init.checks,init.workspace,install.buckminster,init.build.properties"> <echo message="Importing projects into workspace ${workspace} and binaries into target platform ${targetPlatformPath}" /> - <buckminster command="installJRE"> - <cmdargs> - <arg value="--location" /> - <arg value="${jdk1.4.dir}" /> - </cmdargs> - </buckminster> - <buckminster command="setpref"> <cmdargs> <arg value="targetPlatformPath=${targetPlatformPath}" /> @@ -189,8 +190,8 @@ <buckminster command="import"> <cmdargs> <arg value="-P" /> - <arg value="${basedir}/build.properties" /> - <arg value="${basedir}/build.mspec" /> + <arg value="${basedir}/${properties.file}" /> + <arg value="${basedir}/${mspec.file}" /> </cmdargs> </buckminster> </target> diff --git a/releng/org.eclipse.emf.cdo.releng/local.properties b/releng/org.eclipse.emf.cdo.releng/local.properties index 0caffa1a88..222b6eb088 100644 --- a/releng/org.eclipse.emf.cdo.releng/local.properties +++ b/releng/org.eclipse.emf.cdo.releng/local.properties @@ -22,7 +22,6 @@ site.signing=false #cdo.download.area=/home/data/httpd/download.eclipse.org/modeling/emf/cdo eclipse.download.prefix=http://download.eclipse.org bm.headless.site=http://download.eclipse.org/tools/buckminster/headless-3.6 -jdk1.4.dir=/shared/common/ibm-java2-142 #eclipse.staging.area=${env.HUDSON_HOME}/jobs/${env.JOB_NAME}/signing director.url=http://download.eclipse.org/tools/buckminster/products/director_latest.zip |