Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorEike Stepper2010-02-16 16:19:29 +0000
committerEike Stepper2010-02-16 16:19:29 +0000
commit87dd368d689fb9f8b7322f40eda402f3b518b1e7 (patch)
tree41deccbec7fd84f050de7469f02a86c6a2f87274 /releng
parenta0dcad729557e6c53dfd1fa4cb958f79e6432a20 (diff)
downloadcdo-87dd368d689fb9f8b7322f40eda402f3b518b1e7.tar.gz
cdo-87dd368d689fb9f8b7322f40eda402f3b518b1e7.tar.xz
cdo-87dd368d689fb9f8b7322f40eda402f3b518b1e7.zip
local mspec
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.emf.cdo.releng/build.properties15
-rw-r--r--releng/org.eclipse.emf.cdo.releng/build.xml29
-rw-r--r--releng/org.eclipse.emf.cdo.releng/local.properties14
3 files changed, 17 insertions, 41 deletions
diff --git a/releng/org.eclipse.emf.cdo.releng/build.properties b/releng/org.eclipse.emf.cdo.releng/build.properties
index b74bbb295f..0d3a71a539 100644
--- a/releng/org.eclipse.emf.cdo.releng/build.properties
+++ b/releng/org.eclipse.emf.cdo.releng/build.properties
@@ -1,7 +1,5 @@
-#cvs.repository=:local:/cvsroot/modeling
cvs.repository=:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling
cvs.branch=HEAD
-eclipse.downloads=file:///home/data/httpd/download.eclipse.org
buckminster.output.root=${workspace.root}/_temp
@@ -14,18 +12,13 @@ target.arch=*
site.pack200=false
site.signing=false
-
signing.type=eclipse.local
-#signing.type=eclipse.remote
#cbi.include.source=false
-cdo.download.area=/home/data/httpd/download.eclipse.org/modeling/emf/cdo
-eclipse.download.prefix=file:/home/data/httpd/download.eclipse.org
-bm.headless.site=file:/home/data/httpd/download.eclipse.org/tools/buckminster/headless-3.6
-jdk1.4.dir=/shared/common/ibm-java2-142
+eclipse.downloads=file:/home/data/httpd/download.eclipse.org
+bm.headless.path=tools/buckminster/headless-3.6
+director.path=tools/buckminster/products/director_latest.zip
+cdo.download.area=/home/data/httpd/download.eclipse.org/modeling/emf/cdo
eclipse.staging.area=${env.HUDSON_HOME}/jobs/${env.JOB_NAME}/signing
-director.url=file:/home/data/httpd/download.eclipse.org/tools/buckminster/products/director_latest.zip
-#template.workspace.site=http://www.eclipse.org/buckminster/dev
-
diff --git a/releng/org.eclipse.emf.cdo.releng/build.xml b/releng/org.eclipse.emf.cdo.releng/build.xml
index d69ea3f26b..72bb9216c6 100644
--- a/releng/org.eclipse.emf.cdo.releng/build.xml
+++ b/releng/org.eclipse.emf.cdo.releng/build.xml
@@ -37,10 +37,6 @@
<property name="buckminster.output.root" location="${result}/output" />
<property name="buckminster.output.temp" location="${result}/temp" />
- <property name="workspace.gzip" value="workspace-template.tar.gz" />
- <property name="template.dir" location="${tools}/templates" />
- <property name="local.workspace.gzip" location="${template.dir}/${workspace.gzip}" />
-
<!-- This macro executes the default application of an eclipse installation
that resides in the folder ${buildtools}/@app -->
<macrodef name="eclipse.launch">
@@ -97,8 +93,6 @@
<target name="init.checks">
<available file="${tools}/director/director" property="director.exists" />
<available file="${tools}/buckminster/buckminster" property="buckminster.exists" />
- <available file="${local.workspace.gzip}" property="workspace.gzip.exists" />
- <available file="${workspace}" type="dir" property="workspace.exists" />
</target>
<target name="get.director" unless="director.exists">
@@ -108,7 +102,7 @@
suffix=".zip"
property="director.zip"
deleteonexit="true" />
- <get src="${director.url}" dest="${director.zip}" />
+ <get src="${eclipse.downloads}/${director.path}" dest="${director.zip}" />
<mkdir dir="${tools}" />
<unzip src="${director.zip}" dest="${tools}" />
<delete file="${director.zip}" />
@@ -121,7 +115,7 @@
<jvmarg value="-Declipse.p2.mirrors=false" />
<jvmarg value="-Dorg.eclipse.update.jarprocessor.pack200=${org.eclipse.update.jarprocessor.pack200}" />
<arg value="-r" />
- <arg value="${bm.headless.site}" />
+ <arg value="${eclipse.downloads}/${bm.headless.path}" />
<arg value="-d" />
<arg value="${tools}/buckminster" />
<arg value="-p" />
@@ -138,21 +132,14 @@
</eclipse.launch>
</target>
- <!--
- <target name="get.workspace" unless="workspace.gzip.exists">
- <echo message="Fetching workspace template from ${template.workspace.site}/${workspace.gzip}" />
- <mkdir dir="${template.dir}" />
- <get src="${template.workspace.site}/${workspace.gzip}" dest="${local.workspace.gzip}" />
- </target>
-
- <target name="init.workspace" depends="get.workspace" unless="workspace.exists">
- <mkdir dir="${workspace}" />
- <untar src="${local.workspace.gzip}" compression="gzip" dest="${workspace}" />
- </target>
- -->
-
<target name="init.workspace" unless="workspace.exists">
<mkdir dir="${workspace}" />
+ <delete>
+ <fileset dir=".">
+ <include name="site.p2/**" />
+ </fileset>
+ </delete>
+
</target>
<target name="init.build.properties">
diff --git a/releng/org.eclipse.emf.cdo.releng/local.properties b/releng/org.eclipse.emf.cdo.releng/local.properties
index 222b6eb088..01c98ed4c0 100644
--- a/releng/org.eclipse.emf.cdo.releng/local.properties
+++ b/releng/org.eclipse.emf.cdo.releng/local.properties
@@ -1,6 +1,5 @@
cvs.repository=:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling
cvs.branch=HEAD
-eclipse.downloads=http://download.eclipse.org
buckminster.output.root=${workspace.root}/_temp
@@ -13,17 +12,14 @@ target.arch=*
site.pack200=false
site.signing=false
-
-#signing.type=eclipse.local
-#signing.type=eclipse.remote
+signing.type=eclipse.remote
#cbi.include.source=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
+eclipse.downloads=http://download.eclipse.org
+bm.headless.path=tools/buckminster/headless-3.6
+director.path=tools/buckminster/products/director_latest.zip
+#cdo.download.area=/home/data/httpd/download.eclipse.org/modeling/emf/cdo
#eclipse.staging.area=${env.HUDSON_HOME}/jobs/${env.JOB_NAME}/signing
-director.url=http://download.eclipse.org/tools/buckminster/products/director_latest.zip
-#template.workspace.site=http://www.eclipse.org/buckminster/dev

Back to the top