Switch to CDO style build
diff --git a/releng/org.eclipse.graphiti.releng/ant_common.xml b/releng/org.eclipse.graphiti.releng/ant_common.xml
deleted file mode 100644
index 1bb0281..0000000
--- a/releng/org.eclipse.graphiti.releng/ant_common.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-Copyright (c) 2010 SAP AG.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Cloudsmith Inc - build.xml for Buckminster project
- Martin Taal - changes for Teneo
- Michael Wenz - changes Graphiti
-
-The Teneo ant_common.xml was used as a template for creating this file:
-http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf.teneo/releng/org.eclipse.emf.teneo.releng.buckminster/ant_common.xml?root=Modeling_Project&view=log
-
-Some important parts have been copied from Buckminster's own build setup:
-http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/build.xml?root=Tools_BUCKMINSTER&view=markup
--->
-
-<project>
- <!-- This macro executes the default application of an eclipse installation that resides
- in the folder ${buildtools}/@app
- -->
- <macrodef name="eclipse.launch">
- <attribute name="app" />
- <element name="args" optional="true" />
- <sequential>
- <!-- We assume that the eclipse installation is beneath ${buildtools} -->
- <property name="@{app}.deploy.dir" value="${toolsPath}/@{app}" />
-
- <!-- Find the Eclipse launcher and adding its location to the @{app}.launcher property -->
- <pathconvert property="@{app}.launcher">
- <first count="1">
- <sort>
- <fileset dir="${@{app}.deploy.dir}/plugins" includes="**/org.eclipse.equinox.launcher_*.jar" />
- <reverse xmlns="antlib:org.apache.tools.ant.types.resources.comparators">
- <date />
- </reverse>
- </sort>
- </first>
- </pathconvert>
-
- <!-- Launch the eclipse application -->
- <java fork="true" jar="${@{app}.launcher}" dir="${@{app}.deploy.dir}">
- <!-- Uncomment to debug <jvmarg value="-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=y"/> -->
- <args />
- </java>
- </sequential>
- </macrodef>
-
- <macrodef name="buckminster">
- <attribute name="command" />
- <attribute name="workspace" />
- <element name="globargs" optional="true" />
- <element name="cmdargs" optional="true" />
- <sequential>
- <eclipse.launch app="buckminster">
- <args>
- <jvmarg value="-Xmx1024m" />
- <jvmarg value="-Dbugfix.288796=true" />
- <arg value="-data" />
- <arg value="@{workspace}" />
- <arg value="--loglevel" />
- <arg value="${buckminster.loglevel}" />
- <arg value="--displaystacktrace" />
- <arg value="@{command}" />
- <globargs />
- <arg value="-P" />
- <arg value="${properties.tmp}" />
- <cmdargs />
- </args>
- </eclipse.launch>
- </sequential>
- </macrodef>
-
-</project>
diff --git a/releng/org.eclipse.graphiti.releng/buckminster.ant b/releng/org.eclipse.graphiti.releng/buckminster.ant
new file mode 100644
index 0000000..b336ea8
--- /dev/null
+++ b/releng/org.eclipse.graphiti.releng/buckminster.ant
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<project name="project">
+ <condition property="legal.directory">
+ <matches pattern="^/[^/]+/.*" string="${directory}"/>
+ </condition>
+ <target name="do.clear.directory" if="legal.directory">
+ <delete includeemptydirs="true" quiet="true">
+ <fileset dir="${directory}" includes="**/*" defaultexcludes="false"/>
+ </delete>
+ </target>
+ <target name="dont.clear.directory" unless="legal.directory">
+ <fail message="Directory "${directory}" is invalid"/>
+ </target>
+ <target name="clear.directory" depends="do.clear.directory,dont.clear.directory"/>
+</project>
diff --git a/releng/org.eclipse.graphiti.releng/buckminster.cspec b/releng/org.eclipse.graphiti.releng/buckminster.cspec
new file mode 100644
index 0000000..74a6966
--- /dev/null
+++ b/releng/org.eclipse.graphiti.releng/buckminster.cspec
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.emf.cdo.releng" componentType="buckminster" version="0.7.0.qualifier">
+ <cs:dependencies>
+ <cs:dependency name="org.eclipse.graphiti.site" componentType="eclipse.feature"/>
+ <cs:dependency name="org.eclipse.graphiti.tests-feature" componentType="eclipse.feature"/>
+ </cs:dependencies>
+ <cs:actions>
+ <cs:public name="clear.site" actor="ant" always="true">
+ <cs:actorProperties>
+ <cs:property key="buildFile" value="buckminster.ant"/>
+ <cs:property key="targets" value="clear.directory"/>
+ </cs:actorProperties>
+ <cs:properties>
+ <cs:property key="directory" value="${graphiti.download.area}/updates/0.7.0/"/>
+ </cs:properties>
+ </cs:public>
+ <cs:public name="promote.site" actor="ant">
+ <cs:actorProperties>
+ <cs:property key="buildFileId" value="buckminster.pdetasks"/>
+ <cs:property key="targets" value="copy.group"/>
+ </cs:actorProperties>
+ <cs:prerequisites alias="action.requirements">
+ <cs:attribute name="clear.site" contributor="false"/>
+ <cs:attribute name="site.p2" component="org.eclipse.graphiti.site"/>
+ </cs:prerequisites>
+ <cs:products alias="action.output" base="${graphiti.download.area}/updates/0.7.0/"/>
+ </cs:public>
+ <cs:public name="promote.site.to.archive" actor="ant">
+ <cs:actorProperties>
+ <cs:property key="buildFileId" value="buckminster.pdetasks"/>
+ <cs:property key="targets" value="copy.group"/>
+ </cs:actorProperties>
+ <cs:prerequisites alias="action.requirements">
+ <cs:attribute name="site.p2.zip" component="org.eclipse.graphiti.site"/>
+ </cs:prerequisites>
+ <cs:products alias="action.output" base="${graphiti.download.area}/archives/0.7.0/"/>
+ </cs:public>
+ </cs:actions>
+ <cs:groups>
+ <cs:public name="promote">
+ <cs:attribute name="promote.site"/>
+ <cs:attribute name="promote.site.to.archive"/>
+ </cs:public>
+ </cs:groups>
+</cs:cspec>
diff --git a/releng/org.eclipse.graphiti.releng/buckminster.properties b/releng/org.eclipse.graphiti.releng/buckminster.properties
deleted file mode 100644
index 04c877c..0000000
--- a/releng/org.eclipse.graphiti.releng/buckminster.properties
+++ /dev/null
@@ -1,52 +0,0 @@
-# buckminster.properties
-# ----------------------
-# These properties control how buckminster performs a build, where output should be placed,
-# where temporary files should be kept, and where options for signing, packing, and
-# platforms are stated.
-
-# Is used to select the dependency location in the rmap
-# build.type=N
-
-# Where all the output should go
-#buckminster.output.root=${user.home}/mydata/Projects/Graphiti/build/builds/output
-
-# Where the temp files should go
-#buckminster.temp.root=${user.home}/mydata/Projects/Graphiti/build/builds/tempoutput
-buckminster.temp.root=${rootPath}/_temp
-
-# How .qualifier in versions should be replaced
-
-#qualifier.replacement.*=generator:lastModified
-#generator.lastModified.format='v'yyyyMMdd-HHmm
-#qualifier.replacement.*=generator:lastRevision
-#generator.lastRevision.format=r{0,number,00000}
-qualifier.replacement.*=generator:buildTimestamp
-generator.buildTimestamp.format='v'yyyyMMddHHmm
-
-# If a site should use pack200, turn off for faster build
-# commented out, is controlled by the hudson interface
-#site.pack200=false
-
-# If a site should be signed
-#site.signing=false
-
-# Should source bundles be built and included
-cbi.include.source=true
-
-# What platforms should be built, * for "all"
-target.os=*
-target.ws=*
-target.arch=*
-
-signing.type=eclipse.local
-#signing.type=eclipse.remote
-
-graphiti.download.area=file:/home/data/httpd/download.eclipse.org/modeling/gmp/graphiti
-buckminster.p2.site=http://download.eclipse.org/tools/buckminster/headless-3.6
-director.url=http://download.eclipse.org/tools/buckminster/products/director_latest.zip
-eclipse.staging.area=${env.HUDSON_HOME}/jobs/${env.JOB_NAME}/signing
-
-# Add and adapt the following line to enable the local building and testing
-# The folder must be the result folder of the local build, e.g. a folder
-# "build" that resides in the same folder as the Graphiti releng project.
-#buildSitePath=/C:/Development/GraphitiBuild/Workspace/build/result/p2site
diff --git a/releng/org.eclipse.graphiti.releng/build.cquery b/releng/org.eclipse.graphiti.releng/build.cquery
new file mode 100644
index 0000000..d1477e7
--- /dev/null
+++ b/releng/org.eclipse.graphiti.releng/build.cquery
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="build.rmap">
+ <cq:rootRequest name="org.eclipse.graphiti.releng" componentType="buckminster"/>
+ <cq:advisorNode namePattern="^org\.eclipse\.graphiti(\..+)?\.source*" skipComponent="true"/>
+ <cq:advisorNode namePattern=".*" useMaterialization="false" useTargetPlatform="false"/>
+</cq:componentQuery>
diff --git a/releng/org.eclipse.graphiti.releng/build.mspec b/releng/org.eclipse.graphiti.releng/build.mspec
new file mode 100644
index 0000000..1d76193
--- /dev/null
+++ b/releng/org.eclipse.graphiti.releng/build.mspec
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mspec:mspec xmlns:mspec="http://www.eclipse.org/buckminster/MetaData-1.0" installLocation="" materializer="p2" name="build.mspec" url="build.cquery">
+ <mspec:property key="target.os" value="*"/>
+ <mspec:property key="target.ws" value="*"/>
+ <mspec:property key="target.arch" value="*"/>
+ <mspec:mspecNode materializer="workspace" filter="(buckminster.source=true)"/>
+</mspec:mspec>
diff --git a/releng/org.eclipse.graphiti.releng/build.properties b/releng/org.eclipse.graphiti.releng/build.properties
new file mode 100644
index 0000000..d7bbba5
--- /dev/null
+++ b/releng/org.eclipse.graphiti.releng/build.properties
@@ -0,0 +1,20 @@
+cvs.repository=:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling
+
+buckminster.output.root=${workspace.root}/_temp
+
+qualifier.replacement.*=generator:lastModified
+generator.lastModified.format='v'yyyyMMdd-HHmm
+
+target.os=*
+target.ws=*
+target.arch=*
+
+signing.type=eclipse.local
+#cbi.include.source=false
+
+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
+
+graphiti.download.area=/home/data/httpd/download.eclipse.org/graphiti
+eclipse.staging.area=${env.HUDSON_HOME}/jobs/${env.JOB_NAME}/signing
diff --git a/releng/org.eclipse.graphiti.releng/build.rmap b/releng/org.eclipse.graphiti.releng/build.rmap
new file mode 100644
index 0000000..450aa8b
--- /dev/null
+++ b/releng/org.eclipse.graphiti.releng/build.rmap
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rm:rmap xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
+ <rm:property key="build.type" mutable="true" value="N"/>
+ <rm:locator pattern="^org\.eclipse\.graphiti\.releng.*" searchPathRef="releng"/>
+ <rm:locator pattern="^org\.eclipse\.graphiti\.*" searchPathRef="sources"/>
+ <rm:locator searchPathRef="orbit" failOnError="false"/>
+ <rm:locator searchPathRef="platform.binaries"/>
+ <rm:searchPath name="releng">
+ <rm:provider componentTypes="buckminster,osgi.bundle" readerType="cvs">
+ <rm:uri format="{0},org.eclipse.gmp/org.eclipse.gmp.graphiti/releng/{1}">
+ <bc:propertyRef key="cvs.repository"/>
+ <bc:propertyRef key="buckminster.component"/>
+ </rm:uri>
+ </rm:provider>
+ <rm:provider componentTypes="eclipse.feature" readerType="cvs">
+ <rm:uri format="{0},org.eclipse.gmp/org.eclipse.gmp.graphiti/features/{1}">
+ <bc:propertyRef key="cvs.repository"/>
+ <bc:propertyRef key="buckminster.component"/>
+ </rm:uri>
+ </rm:provider>
+ </rm:searchPath>
+ <rm:searchPath name="sources">
+ <rm:provider componentTypes="osgi.bundle" readerType="cvs">
+ <rm:uri format="{0},org.eclipse.gmp/org.eclipse.gmp.graphiti/plugins/{1}">
+ <bc:propertyRef key="cvs.repository"/>
+ <bc:propertyRef key="buckminster.component"/>
+ </rm:uri>
+ </rm:provider>
+ <rm:provider componentTypes="osgi.bundle" readerType="cvs">
+ <rm:uri format="{0},org.eclipse.gmp/org.eclipse.gmp.graphiti/examples/{1}">
+ <bc:propertyRef key="cvs.repository"/>
+ <bc:propertyRef key="buckminster.component"/>
+ </rm:uri>
+ </rm:provider>
+ <rm:provider componentTypes="eclipse.feature" readerType="cvs">
+ <rm:uri format="{0},org.eclipse.gmp/org.eclipse.gmp.graphiti/features/{1}">
+ <bc:propertyRef key="cvs.repository"/>
+ <bc:propertyRef key="buckminster.component"/>
+ </rm:uri>
+ </rm:provider>
+ <rm:provider componentTypes="osgi.bundle" readerType="cvs">
+ <rm:uri format="{0},org.eclipse.gmp/org.eclipse.gmp.graphiti/tests/{1}">
+ <bc:propertyRef key="cvs.repository"/>
+ <bc:propertyRef key="buckminster.component"/>
+ </rm:uri>
+ </rm:provider>
+ </rm:searchPath>
+ <rm:searchPath name="orbit">
+ <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
+ <rm:uri format="{0}/tools/orbit/downloads/drops/R20100519200754/updateSite">
+ <bc:propertyRef key="eclipse.downloads"/>
+ </rm:uri>
+ </rm:provider>
+ </rm:searchPath>
+ <rm:searchPath name="platform.binaries">
+ <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
+ <rm:uri format="{0}/modeling/emf/emf/updates/2.6milestones/">
+ <bc:propertyRef key="eclipse.downloads"/>
+ </rm:uri>
+ </rm:provider>
+ <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
+ <rm:uri format="{0}/tools/gef/updates/milestones/">
+ <bc:propertyRef key="eclipse.downloads"/>
+ </rm:uri>
+ </rm:provider>
+ <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
+ <rm:uri format="{0}/eclipse/updates/3.6milestones">
+ <bc:propertyRef key="eclipse.downloads"/>
+ </rm:uri>
+ </rm:provider>
+ <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(|(build.type=N)(build.type=I))">
+ <rm:uri format="{0}/releases/helios">
+ <bc:propertyRef key="eclipse.downloads"/>
+ </rm:uri>
+ </rm:provider>
+ <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(|(build.type=M)(build.type=S)(build.type=R))">
+ <rm:uri format="{0}/releases/staging">
+ <bc:propertyRef key="eclipse.downloads"/>
+ </rm:uri>
+ </rm:provider>
+ </rm:searchPath>
+</rm:rmap>
diff --git a/releng/org.eclipse.graphiti.releng/build.xml b/releng/org.eclipse.graphiti.releng/build.xml
index 5e4654f..a22f0fd 100644
--- a/releng/org.eclipse.graphiti.releng/build.xml
+++ b/releng/org.eclipse.graphiti.releng/build.xml
@@ -1,168 +1,152 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-Copyright (c) 2010 SAP AG.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
+<?xml version="1.0"?>
+<project name="CDO">
-Contributors:
- Cloudsmith Inc - build.xml for Buckminster project
- Martin Taal - changes for Teneo
- Michael Wenz - changes Graphiti
+ <condition property="properties.file" value="build.properties" else="local.properties">
+ <isset property="server.build" />
+ </condition>
-The Teneo build.xml was used as a template for creating this file:
-http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf.teneo/releng/org.eclipse.emf.teneo.releng.buckminster/build.xml?root=Modeling_Project&view=log
+ <condition property="mspec.file" value="build.mspec" else="local.mspec">
+ <isset property="server.build" />
+ </condition>
-Some important parts have been copied from Buckminster's own build setup:
-http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/build.xml?root=Tools_BUCKMINSTER&view=markup
--->
-
-<project default="build.and.test" name="Graphiti Build and Test Run">
- <!-- load properties and set timestamp for the build -->
+ <property file="${properties.file}" />
<property environment="env" />
- <tstamp>
- <format property="buildTimestamp" pattern="yyyyMMddHHmm" />
- </tstamp>
-
- <property file="buckminster.properties" />
-
- <condition property="hudsonWorkSpacePath" value="${env.WORKSPACE}" else="${basedir}/../">
+ <condition property="build.root" value="${env.WORKSPACE}" else="${basedir}/../build">
<isset property="env.WORKSPACE" />
</condition>
- <condition property="graphiti.update.site.type" value="${env.GRAPHITI_UPDATE_SITE_TYPE}" else="interim">
- <isset property="env.GRAPHITI_UPDATE_SITE_TYPE" />
- </condition>
-
- <condition property="site.pack200" value="${env.SITE_PACK200}" else="false">
- <isset property="env.SITE_PACK200" />
- </condition>
-
- <condition property="site.signing" value="${env.SITE_SIGNING}" else="false">
- <isset property="env.SITE_SIGNING" />
- </condition>
-
- <condition property="buckminster.loglevel" value="${env.BUCKMINSTER_LOGLEVEL}" else="info">
+ <condition property="buckminster.loglevel" value="${env.BUCKMINSTER_LOGLEVEL}" else="INFO">
<isset property="env.BUCKMINSTER_LOGLEVEL" />
</condition>
- <!-- Is used in buck.minster also -->
- <condition property="build.type" value="${env.BUILDTYPE}" else="N">
- <isset property="env.BUILDTYPE" />
- </condition>
-
- <condition property="graphiti.version" value="${env.VERSION}" else="0.7.0">
- <isset property="env.VERSION" />
- </condition>
-
<condition property="clean.tools" value="true">
<equals arg1="${env.CLEAN_TOOLS}" arg2="true" />
</condition>
- <property name="buildsPath" location="${hudsonWorkSpacePath}/build" />
+ <condition property="clean.tp" value="true">
+ <equals arg1="${env.CLEAN_TP}" arg2="true" />
+ </condition>
- <!--property name="rootPath" location="${buildsPath}/${build.type}${buildTimestamp}"/-->
- <property name="rootPath" location="${buildsPath}" />
+ <condition property="clean.workspace" value="true">
+ <equals arg1="${env.CLEAN_WORKSPACE}" arg2="true" />
+ </condition>
- <property name="buildRoot" location="${rootPath}/build" />
- <property name="testRoot" location="${rootPath}/test" />
- <property name="toolsPath" location="${rootPath}/tools" />
- <property name="buildSitePath" location="${rootPath}/result/p2site" />
- <property name="buildZipsPath" location="${rootPath}/result/zips" />
- <property name="testResultsPath" location="${rootPath}/result/test" />
+ <condition property="clean.output" value="true">
+ <equals arg1="${env.CLEAN_OUTPUT}" arg2="true" />
+ </condition>
- <property name="promoteUpdateSite" location="${graphiti.download.area}/updates/${graphiti.update.site.type}" />
- <property name="promoteDropsLocation" location="${graphiti.download.area}/downloads/drops" />
+ <condition property="build.type" value="${env.BUILD_TYPE}" else="N">
+ <isset property="env.BUILD_TYPE" />
+ </condition>
- <property name="buckminster.output.root" location="${rootPath}/output" />
- <property name="buckminster.temp.root" location="${rootPath}/temp" />
+ <condition property="build.nightly" value="true">
+ <equals arg1="${build.type}" arg2="N" />
+ </condition>
- <import file="ant_common.xml" />
+ <condition property="site.pack200" value="${env.SITE_PACK200}" else="true">
+ <isset property="env.SITE_PACK200" />
+ </condition>
- <target name="build.and.test" depends="init, init.checks, install.buckminster">
- <echo message=""/>
- <echo message="=========================================================================================="/>
- <echo message="Building" />
- <ant dir="${basedir}/build" antfile="graphiti_build.xml" target="run" inheritRefs="true" />
+ <condition property="site.signing" value="false" else="true">
+ <isset property="build.nightly" />
+ </condition>
- <echo message=""/>
- <echo message="=========================================================================================="/>
- <echo message="Testing" />
- <ant dir="${basedir}/test" antfile="graphiti_test.xml" target="run" inheritRefs="true" />
- </target>
+ <!-- Default properties intended to be overridden by entries in the above property file -->
+ <property name="tools" location="${build.root}/tools" />
+ <property name="result" location="${build.root}/result" />
+ <property name="workspace" location="${result}/workspace" />
+ <property name="targetPlatformPath" location="${result}/tp" />
+ <property name="buckminster.output.root" location="${result}/output" />
+ <property name="buckminster.temp.root" location="${result}/temp" />
+ <property name="site.p2.dir" location="${workspace}/_temp/org.eclipse.graphiti.site_1.0.0-eclipse.feature/site.p2" />
- <target name="promote" depends="init.build.properties">
- <echo message="Promoting build update site" />
- <echo message="from ${buildSitePath}" />
- <echo message="to ${promoteUpdateSite}" />
+ <!-- This macro executes the default application of an eclipse installation
+ that resides in the folder ${buildtools}/@app -->
+ <macrodef name="eclipse.launch">
+ <attribute name="app" />
+ <element name="args" optional="true" />
+ <sequential>
+ <!-- We assume that the eclipse installation is beneath ${buildtools} -->
+ <property name="@{app}.deploy.dir" value="${tools}/@{app}" />
- <delete dir="${promoteUpdateSite}" />
- <mkdir dir="${promoteUpdateSite}"/>
- <mkdir dir="${promoteUpdateSite}/plugins"/>
- <mkdir dir="${promoteUpdateSite}/features"/>
-
- <copy todir="${promoteUpdateSite}">
- <fileset dir="${buildSitePath}">
- <include name="**/*" />
- <include name="**" />
- </fileset>
- </copy>
+ <!-- Find the Eclipse launcher and assing its location to the @{app}.launcher property -->
+ <pathconvert property="@{app}.launcher">
+ <first count="1">
+ <sort>
+ <fileset dir="${@{app}.deploy.dir}/plugins" includes="**/org.eclipse.equinox.launcher_*.jar" />
+ <reverse xmlns="antlib:org.apache.tools.ant.types.resources.comparators">
+ <date />
+ </reverse>
+ </sort>
+ </first>
+ </pathconvert>
- <mkdir dir="${promoteDropsLocation}"/>
- <mkdir dir="${promoteDropsLocation}/${graphiti.version}"/>
- <mkdir dir="${promoteDropsLocation}/${graphiti.version}/${build.type}${buildTimestamp}"/>
- <copy todir="${promoteDropsLocation}/${graphiti.version}/${build.type}${buildTimestamp}">
- <fileset dir="${buildZipsPath}">
- <include name="*.zip" />
- </fileset>
- </copy>
- </target>
+ <!-- Launch the eclipse application -->
+ <java fork="true" jar="${@{app}.launcher}" dir="${@{app}.deploy.dir}" failonerror="true">
+ <!-- Uncomment to debug <jvmarg value="-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=y"/> -->
+ <args />
+ </java>
+ </sequential>
+ </macrodef>
- <target name="clean.all">
- <echo message="Removing previous build" />
- <delete dir="${rootPath}" quiet="true" />
- </target>
+ <macrodef name="buckminster">
+ <attribute name="command" />
+ <attribute name="workspace" default="${workspace}" />
+ <element name="globargs" optional="true" />
+ <element name="cmdargs" optional="true" />
+ <sequential>
+ <eclipse.launch app="buckminster">
+ <args>
+ <jvmarg value="-Dbugfix.288796=true" />
+ <jvmarg value="-Xmx1024m" />
+ <arg value="-data" />
+ <arg value="@{workspace}" />
+ <arg value="--loglevel" />
+ <arg value="${buckminster.loglevel}" />
+ <arg value="--displaystacktrace" />
+ <globargs />
+ <arg value="@{command}" />
+ <arg value="-P" />
+ <arg value="${properties.tmp}" />
+ <cmdargs />
+ </args>
+ </eclipse.launch>
+ </sequential>
+ </macrodef>
<target name="init.clean.tools" if="clean.tools">
- <delete dir="${toolsPath}" failonerror="true" quiet="true" />
+ <antcall target="clean.tools" />
</target>
- <target name="init.checks" depends="init.clean.tools">
- <available file="${toolsPath}/director/director" property="director.exists" />
- <available file="${toolsPath}/buckminster/buckminster" property="buckminster.exists" />
+ <target name="init.clean.tp" if="clean.tp">
+ <antcall target="clean.tp" />
</target>
- <target name="init" depends="clean.all">
+ <target name="init.clean.workspace" if="clean.workspace">
+ <antcall target="clean.workspace" />
+ </target>
- <echo message="Creating main directories" />
- <echo message="rootPath: ${rootPath}" />
- <echo message="buildRoot: ${buildRoot}" />
- <echo message="testRoot: ${testRoot}" />
- <echo message="buildSitePath: ${buildSitePath}" />
- <echo message="buildZipsPath: ${buildZipsPath}" />
- <echo message="testResultsPath: ${testResultsPath}" />
- <mkdir dir="${rootPath}" />
- <mkdir dir="${buildRoot}" />
- <mkdir dir="${testRoot}" />
- <mkdir dir="${toolsPath}" />
- <mkdir dir="${buildSitePath}" />
- <mkdir dir="${buildZipsPath}" />
- <mkdir dir="${testResultsPath}" />
- <mkdir dir="${testResultsPath}/output" />
+ <target name="init.clean.output" if="clean.output">
+ <antcall target="clean.output" />
+ </target>
+ <target name="init.checks" depends="init.clean.tools,init.clean.tp,init.clean.workspace,init.clean.output">
+ <echo message="Sourcing ${properties.file}" />
<available file="${tools}/director/director" property="director.exists" />
<available file="${tools}/buckminster/buckminster" property="buckminster.exists" />
-
</target>
<target name="get.director" unless="director.exists">
<echo message="Fetching headless director application" />
- <tempfile destdir="${java.io.tmpdir}" prefix="director-" suffix=".zip" property="director.zip" deleteonexit="true" />
- <get src="${director.url}" dest="${director.zip}" />
+ <tempfile destdir="${java.io.tmpdir}"
+ prefix="director-"
+ suffix=".zip"
+ property="director.zip"
+ deleteonexit="true" />
+ <get src="${eclipse.downloads}/${director.path}" dest="${director.zip}" />
<mkdir dir="${tools}" />
- <unzip src="${director.zip}" dest="${toolsPath}" />
+ <unzip src="${director.zip}" dest="${tools}" />
<delete file="${director.zip}" />
</target>
@@ -171,11 +155,14 @@
<eclipse.launch app="director">
<args>
<jvmarg value="-Declipse.p2.mirrors=false" />
- <!--jvmarg value="-Dorg.eclipse.update.jarprocessor.pack200=${org.eclipse.update.jarprocessor.pack200}" /-->
+ <!--
+ Hudson Ant property: org.eclipse.update.jarprocessor.pack200=/shared/common/ibm-java2-ppc-50/jre/bin
+ <jvmarg value="-Dorg.eclipse.update.jarprocessor.pack200=${org.eclipse.update.jarprocessor.pack200}" />
+ -->
<arg value="-r" />
- <arg value="${buckminster.p2.site}" />
+ <arg value="${eclipse.downloads}/${bm.headless.path}" />
<arg value="-d" />
- <arg value="${toolsPath}/buckminster" />
+ <arg value="${tools}/buckminster" />
<arg value="-p" />
<arg value="Buckminster" />
<arg value="-i" />
@@ -192,10 +179,18 @@
</eclipse.launch>
</target>
+ <target name="init.workspace" unless="workspace.exists">
+ <mkdir dir="${workspace}" />
+ </target>
+
<target name="init.build.properties">
- <!-- Echo relevant properties to a temporary file so that Buckminster can read them
- -->
- <tempfile destdir="${java.io.tmpdir}" prefix="build-" suffix=".properties" deleteonexit="true" property="properties.tmp" />
+ <!-- Echo relevant properties to a temporary file so that Buckminster can read them -->
+ <tempfile destdir="${java.io.tmpdir}"
+ prefix="build-"
+ suffix=".properties"
+ deleteonexit="true"
+ property="properties.tmp" />
+ <echo message="Properties file is: ${properties.tmp}" />
<echoproperties destfile="${properties.tmp}">
<!-- We don't want these. basedir in particular will cause problems if passed explicitly -->
<propertyset negate="true">
@@ -212,4 +207,105 @@
</propertyset>
</echoproperties>
</target>
+
+ <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="setpref">
+ <cmdargs>
+ <arg value="targetPlatformPath=${targetPlatformPath}" />
+ </cmdargs>
+ </buckminster>
+
+ <buckminster command="import">
+ <cmdargs>
+ <arg value="-P" />
+ <arg value="${basedir}/${properties.file}" />
+ <arg value="${basedir}/${mspec.file}" />
+ </cmdargs>
+ </buckminster>
+ </target>
+
+ <target name="site.p2" depends="provision">
+ <echo message="Building all projects in workspace ${workspace}" />
+ <buckminster command="build">
+ <cmdargs>
+ <arg value="--thorough" />
+ </cmdargs>
+ </buckminster>
+
+ <echo message="Performing org.eclipse.graphiti.site#site.p2" />
+ <buckminster command="perform">
+ <cmdargs>
+ <arg value="org.eclipse.graphiti.site#site.p2" />
+ </cmdargs>
+ </buckminster>
+
+ <echo message="Creating human readable index.html" />
+ <unzip src="${site.p2.dir}/content.jar" dest="${site.p2.dir}" />
+ <xslt style="xsl/content2html.xsl" in="${site.p2.dir}/content.xml" out="${site.p2.dir}/index.html" />
+ <xslt style="xsl/content2xml.xsl" in="${site.p2.dir}/content.xml" out="${site.p2.dir}/index.xml" />
+ <delete file="${site.p2.dir}/content.xml" />
+ </target>
+
+ <target name="test" depends="site.p2">
+ <echo message="Running JUnit tests for Graphiti" />
+ <buckminster command="emma">
+ <cmdargs>
+ <arg value="-l" />
+ <arg value="org.eclipse.graphiti.tests/AllJunitTests.launch" />
+ <arg value="-o" />
+ <arg value="${result}/testReportJunitGraphiti.xml" />
+ <arg value="--terseXML" />
+ <arg value="--flatXML" />
+ <arg value="--xml" />
+ <arg value="${result}/coverageReportJunitGraphiti.xml" />
+ </cmdargs>
+ </buckminster>
+ <echo message="Running JUnit tests for GraphitiUI" />
+ <buckminster command="emma">
+ <cmdargs>
+ <arg value="-l" />
+ <arg value="org.eclipse.graphiti.ui.tests/AllJunitUiTests.launch" />
+ <arg value="-o" />
+ <arg value="${result}/testReportJunitGraphitiUi.xml" />
+ <arg value="--terseXML" />
+ <arg value="--flatXML" />
+ <arg value="--xml" />
+ <arg value="${result}/coverageReportJunitGraphitiUi.xml" />
+ </cmdargs>
+ </buckminster>
+ </target>
+
+ <target name="promote.sites" depends="provision">
+ <echo message="Building all projects in workspace ${workspace}" />
+ <buckminster command="build" />
+
+ <echo message="Performing org.eclipse.graphiti.releng#promote" />
+ <buckminster command="perform">
+ <cmdargs>
+ <arg value="org.eclipse.graphiti.releng#promote" />
+ </cmdargs>
+ </buckminster>
+ </target>
+
+ <target name="clean.tools">
+ <delete dir="${tools}/director" failonerror="true" quiet="true" />
+ <delete dir="${tools}/buckminster" failonerror="true" quiet="true" />
+ </target>
+
+ <target name="clean.tp">
+ <delete dir="${targetPlatformPath}" failonerror="true" quiet="true" />
+ </target>
+
+ <target name="clean.workspace">
+ <delete dir="${workspace}" failonerror="true" quiet="true" />
+ </target>
+
+ <target name="clean.output">
+ <delete dir="${buckminster.output.root}" failonerror="true" quiet="true" />
+ <delete dir="${buckminster.temp.root}" failonerror="true" quiet="true" />
+ </target>
+
+ <target name="clean.all" depends="clean.tools,clean.workspace,clean.tp,clean.output" />
+
</project>
diff --git a/releng/org.eclipse.graphiti.releng/build/graphiti.cquery b/releng/org.eclipse.graphiti.releng/build/graphiti.cquery
deleted file mode 100644
index 390c663..0000000
--- a/releng/org.eclipse.graphiti.releng/build/graphiti.cquery
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="graphiti.rmap" shortDesc="Component query for Graphiti framework and examples">
- <cq:documentation xmlns="http://www.w3.org/1999/xhtml">Collects the Graphiti framework and the examples together with all needed dependencies for the build or for usage
-in the IDE (e.g. for setting up a workspace with the source projects)</cq:documentation>
- <cq:rootRequest name="org.eclipse.graphiti.site-feature" componentType="eclipse.feature"/>
- <cq:advisorNode namePattern="^org\.eclipse\.graphiti(\..+)?\.source$" skipComponent="true"/>
-</cq:componentQuery>
diff --git a/releng/org.eclipse.graphiti.releng/build/graphiti.mspec b/releng/org.eclipse.graphiti.releng/build/graphiti.mspec
deleted file mode 100644
index d814277..0000000
--- a/releng/org.eclipse.graphiti.releng/build/graphiti.mspec
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mspec:mspec xmlns:mspec="http://www.eclipse.org/buckminster/MetaData-1.0" materializer="p2" name="graphiti.mspec" url="graphiti.cquery" conflictResolution="UPDATE">
- <mspec:property key="target.os" value="*"/>
- <mspec:property key="target.ws" value="*"/>
- <mspec:property key="target.arch" value="*"/>
- <mspec:mspecNode
- filter="(buckminster.source=true)"
- materializer="workspace"/>
-</mspec:mspec>
diff --git a/releng/org.eclipse.graphiti.releng/build/graphiti.rmap b/releng/org.eclipse.graphiti.releng/build/graphiti.rmap
deleted file mode 100644
index fd2e29f..0000000
--- a/releng/org.eclipse.graphiti.releng/build/graphiti.rmap
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rm:rmap xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
- <rm:property key="build.type" mutable="true" value="N"/>
- <rm:locator pattern="^org\.eclipse\.graphiti(\..+)?" searchPathRef="graphiti.plugins" failOnError="false"/>
- <rm:locator pattern="^org\.eclipse\.graphiti\.examples(\..+)?" searchPathRef="graphiti.example.plugins" failOnError="false"/>
- <rm:locator pattern="^org\.eclipse\.graphiti([\.\-].+)?" searchPathRef="graphiti.features" failOnError="false"/>
- <rm:locator pattern="^org\.eclipse\.graphiti(\..+)?" searchPathRef="graphiti.doc" failOnError="false"/>
- <rm:locator pattern="^org\.eclipse\.graphiti(\..+)?" searchPathRef="graphiti.releng" failOnError="false"/>
- <rm:locator searchPathRef="target.platform"/>
- <rm:searchPath name="graphiti.plugins">
- <rm:provider componentTypes="osgi.bundle" readerType="cvs">
- <rm:uri format=":pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,org.eclipse.gmp/org.eclipse.gmp.graphiti/plugins/{0}">
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
- <rm:searchPath name="graphiti.example.plugins">
- <rm:provider componentTypes="osgi.bundle" readerType="cvs">
- <rm:uri format=":pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,org.eclipse.gmp/org.eclipse.gmp.graphiti/examples/{0}">
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
- <rm:searchPath name="graphiti.features">
- <rm:provider componentTypes="eclipse.feature" readerType="cvs" mutable="false">
- <rm:uri format=":pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,org.eclipse.gmp/org.eclipse.gmp.graphiti/features/{0}">
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
- <rm:searchPath name="graphiti.doc">
- <rm:provider componentTypes="osgi.bundle" readerType="cvs">
- <rm:uri format=":pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,org.eclipse.gmp/org.eclipse.gmp.graphiti/examples/{0}">
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
- <rm:searchPath name="graphiti.releng">
- <rm:provider componentTypes="buckminster" readerType="cvs" mutable="false">
- <rm:uri format=":pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,org.eclipse.gmp/org.eclipse.gmp.graphiti/releng/{0}">
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
- <rm:searchPath name="target.platform">
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=N)">
- <rm:uri format="http://download.eclipse.org/releases/helios"/>
- </rm:provider>
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(|(build.type=N)(build.type=R))">
- <rm:uri format="http://download.eclipse.org/eclipse/updates/3.6"/>
- </rm:provider>
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=R)">
- <rm:uri format="http://download.eclipse.org/releases/galileo"/>
- </rm:provider>
- <rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
- <rm:uri format="http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository/"/>
- </rm:provider>
- </rm:searchPath>
-</rm:rmap>
diff --git a/releng/org.eclipse.graphiti.releng/build/graphiti_build.xml b/releng/org.eclipse.graphiti.releng/build/graphiti_build.xml
deleted file mode 100644
index a46e0e5..0000000
--- a/releng/org.eclipse.graphiti.releng/build/graphiti_build.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-Copyright (c) 2005, 2010 SAP AG.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Cloudsmith Inc - build.xml for Buckminster project
- Martin Taal - changes for Teneo
- Michael Wenz - changes Graphiti project
-
-The Teneo teneo_build.xml was used as a template for creating this file:
-http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf.teneo/releng/org.eclipse.emf.teneo.releng.buckminster/build/teneo_build.xml?root=Modeling_Project&view=log
-
-Some important parts have been copied from Buckminster's own build setup:
-http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/build.xml?root=Tools_BUCKMINSTER&view=markup
--->
-
-<project default="run" name="Graphiti Builds">
- <!-- load properties and set timestamp for the build -->
- <property environment="env"/>
-
- <!--
- Inherited properties:
- buildRoot: the root of this build
- toolsPath: path containing buckminster
- buildSitePath: the path to which the p2 site should be copied
- buildZipsPath: the path to the directory with zip files
-
- buckminster.output.root
- buckminster.temp.root
- -->
-
- <property name="targetPlatformPath" location="${buildRoot}/tp"/>
- <property name="workspacePath" location="${buildRoot}/workspace"/>
-
- <import file="../ant_common.xml" />
-
- <target name="run" depends="init,init.build.properties">
- <echo message="Using workspace ${workspacePath}" />
-
- <echo message="Setting jre to ${env.JAVA_HOME}"/>
- <buckminster command="installJRE" workspace="${workspacePath}">
- <cmdargs>
- <arg value="--location" />
- <arg value="${env.JAVA_HOME}" />
- </cmdargs>
- </buckminster>
-
- <echo message="Setting targetPlatformPath to ${targetPlatformPath}" />
- <buckminster command="setpref" workspace="${workspacePath}">
- <cmdargs>
- <arg value="targetPlatformPath=${targetPlatformPath}" />
- </cmdargs>
- </buckminster>
-
- <echo message="Importing projects into workspace ${workspacePath} and"/>
- <echo message="importing binaries into target platform ${targetPlatformPath}" />
- <buckminster command="import" workspace="${workspacePath}">
- <cmdargs>
- <arg value="${basedir}/graphiti.mspec" />
- </cmdargs>
- </buckminster>
-
- <echo message="Building" />
- <buckminster command="build" workspace="${workspacePath}">
- <cmdargs>
- <arg value="--thorough" />
- </cmdargs>
- </buckminster>
-
- <echo message="Creating p2 site" />
- <buckminster command="perform" workspace="${workspacePath}">
- <cmdargs>
- <arg value="org.eclipse.graphiti.site:eclipse.feature#site.p2" />
- </cmdargs>
- </buckminster>
-
- <echo message="Copying p2 site to result" />
- <antcall target="copy.p2.site" inheritRefs="true" inheritAll="true"/>
-
- </target>
-
- <!-- Copy site and create sdk zips -->
- <target name="copy.p2.site">
- <echo message="Copying p2.site to ${buildSitePath}"/>
- <copy todir="${buildSitePath}" flatten="true">
- <fileset dir="${buckminster.output.root}">
- <include name="*site*/site.p2/*"/>
- </fileset>
- </copy>
- <copy todir="${buildSitePath}/plugins" flatten="true">
- <fileset dir="${buckminster.output.root}">
- <include name="*site*/site.p2/plugins/*"/>
- </fileset>
- </copy>
- <copy todir="${buildSitePath}/features" flatten="true">
- <fileset dir="${buckminster.output.root}">
- <include name="*site*/site.p2/features/*"/>
- </fileset>
- </copy>
- </target>
-
- <target name="init">
- <mkdir dir="${targetPlatformPath}"/>
- <mkdir dir="${workspacePath}"/>
- </target>
-
- <target name="init.build.properties">
- <!-- Echo relevant properties to a temporary file so that Buckminster can read them
- -->
- <tempfile destdir="${java.io.tmpdir}" prefix="build-" suffix=".properties" deleteonexit="true" property="properties.tmp" />
- <echoproperties destfile="${properties.tmp}">
- <!-- We don't want these. basedir in particular will cause problems if passed explicitly -->
- <propertyset negate="true">
- <propertyref name="basedir" />
- <propertyref name="eclipse.home" />
- <propertyref name="properties.tmp" />
- <propertyref name="line.separator" />
- <propertyref name="path.separator" />
- <propertyref prefix="ant." />
- <propertyref prefix="file." />
- <propertyref prefix="java." />
- <propertyref prefix="sun." />
- <propertyref prefix="user." />
- </propertyset>
- </echoproperties>
- </target>
-</project>
diff --git a/releng/org.eclipse.graphiti.releng/local.mspec b/releng/org.eclipse.graphiti.releng/local.mspec
new file mode 100644
index 0000000..de9f84d
--- /dev/null
+++ b/releng/org.eclipse.graphiti.releng/local.mspec
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mspec:mspec xmlns:mspec="http://www.eclipse.org/buckminster/MetaData-1.0" installLocation="" materializer="p2" name="local.mspec" url="build.cquery">
+ <mspec:property key="target.os" value="*"/>
+ <mspec:property key="target.ws" value="*"/>
+ <mspec:property key="target.arch" value="*"/>
+ <mspec:property key="cvs.repository" value=":pserver:anonymous@dev.eclipse.org:/cvsroot/modeling"/>
+ <mspec:property key="eclipse.downloads" value="http://download.eclipse.org"/>
+ <mspec:mspecNode materializer="workspace" filter="(buckminster.source=true)"/>
+</mspec:mspec>
diff --git a/releng/org.eclipse.graphiti.releng/local.properties b/releng/org.eclipse.graphiti.releng/local.properties
new file mode 100644
index 0000000..938a3d3
--- /dev/null
+++ b/releng/org.eclipse.graphiti.releng/local.properties
@@ -0,0 +1,18 @@
+cvs.repository=:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling
+
+buckminster.output.root=${workspace.root}/_temp
+
+qualifier.replacement.*=generator:lastModified
+generator.lastModified.format='v'yyyyMMdd-HHmm
+
+target.os=*
+target.ws=*
+target.arch=*
+
+signing.type=eclipse.remote
+#cbi.include.source=false
+
+eclipse.downloads=http://download.eclipse.org
+bm.headless.path=tools/buckminster/headless-3.6
+director.path=tools/buckminster/products/director_latest.zip
+
diff --git a/releng/org.eclipse.graphiti.releng/promote/promote-N.properties b/releng/org.eclipse.graphiti.releng/promote/promote-N.properties
deleted file mode 100644
index 3922172..0000000
--- a/releng/org.eclipse.graphiti.releng/promote/promote-N.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# source dir
-sourceZipsDir=/opt/users/hudsonbuild/.hudson/jobs/emf-graphiti-nightly/lastSuccessfulBuild/artifact/build/result/
-
-# target dir
-targetZipsDir=/home/data/httpd/download.eclipse.org/modeling/gmp/graphiti/updates/nightly/
-
-# group owner of new files
-targetGroup=veadmin
-
-# type(s) to copy (N, I, M, S, R; default to all)
-buildTypes=N
-
-# synch method method (add or replace; add = keep adding new builds; replace = keep 1 build per branch)
-synchMethod=add
-
-# if set, update zip will be unpacked into destination dir and use synchMethod above to add or replace contents
-targetUpdateDir=/home/data/httpd/download.eclipse.org/modeling/gmp/graphiti/updates/nightly/
\ No newline at end of file
diff --git a/releng/org.eclipse.graphiti.releng/promote/promote.xml b/releng/org.eclipse.graphiti.releng/promote/promote.xml
deleted file mode 100644
index 029e77f..0000000
--- a/releng/org.eclipse.graphiti.releng/promote/promote.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<project default="run" name="org.eclipse.mwe.releng/promote.xml - Promote a build from build server to production server">
- <target name="run">
- <!--
- To use this script, you must have configured a promote.properties file.
-
- Then, run commandline:
-
- ant -f promote.xml
-
- If you need to reuse this script with multiple properties files (eg., from
- multiple Hudson builds across multiple branches), use the commandline
- flag -Dpromote.properties:
-
- ant -f promote.xml -Dpromote.properties=promote.properties.R2_0_branch
- -->
- <property name="promote.properties" value="promote.properties" />
- <property file="${promote.properties}"/>
-
- <!-- load build properties -->
- <property file="build.properties" />
-
- <!-- calculate workspaceDir as parent of this folder, the project's .releng folder (relengBuilderDir) -->
- <property name="relengBuilderDir" value="${basedir}" />
- <dirname file="${relengBuilderDir}" property="workspaceDir" />
-
- <!--
- can build in /tmp, eg., in /tmp/build, or in workspace, eg.,
- ${relengBuilderDir}/build
- -->
- <property name="writableBuildRoot" value="/tmp/build" />
-
- <!--
- can be simple path, eg.,
- ${writableBuildRoot}/${buildType}${buildTimestamp} or longer, eg.,
- ${writableBuildRoot}/${topprojectName}/${projectName}/downloads/drops/${version}/${buildType}${buildTimestamp} or
- ${writableBuildRoot}/${topprojectName}/${projectName}/${subprojectName}/downloads/drops/${version}/${buildType}${buildTimestamp}
- -->
- <property name="buildDir" value="${writableBuildRoot}/${buildType}${buildTimestamp}-emfindex" />
-
- <!-- invoke common promotion script -->
- <property name="relengCommonBuilderDir" value="${workspaceDir}/org.eclipse.dash.common.releng" />
- <ant antfile="${relengCommonBuilderDir}/promote.xml" dir="${relengCommonBuilderDir}" />
- </target>
-</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.graphiti.releng/test/graphiti.cquery b/releng/org.eclipse.graphiti.releng/test/graphiti.cquery
deleted file mode 100644
index 7a7f841..0000000
--- a/releng/org.eclipse.graphiti.releng/test/graphiti.cquery
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="graphiti.rmap" shortDesc="Component query for Graphiti tests">
- <cq:documentation xmlns="http://www.w3.org/1999/xhtml">Collects the Graphiti tests together with all needed dependencies for the build or for usage
-in the IDE (e.g. for setting up a workspace with the source projects)
-
-Important:
-If you want to execute and run the tests during a local build sequence, you have to set "../buckminster.properties"
-as the properties file for this cquery! Furthermore you have to uncomment the property "buildSitePath" at the end
-of the referenced properties file!</cq:documentation>
- <cq:rootRequest name="org.eclipse.graphiti.tests-feature" componentType="eclipse.feature"/>
- <cq:advisorNode namePattern="org\.eclipse\.graphiti\.bot\.tests" skipComponent="true"/>
-</cq:componentQuery>
diff --git a/releng/org.eclipse.graphiti.releng/test/graphiti.mspec b/releng/org.eclipse.graphiti.releng/test/graphiti.mspec
deleted file mode 100644
index d814277..0000000
--- a/releng/org.eclipse.graphiti.releng/test/graphiti.mspec
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mspec:mspec xmlns:mspec="http://www.eclipse.org/buckminster/MetaData-1.0" materializer="p2" name="graphiti.mspec" url="graphiti.cquery" conflictResolution="UPDATE">
- <mspec:property key="target.os" value="*"/>
- <mspec:property key="target.ws" value="*"/>
- <mspec:property key="target.arch" value="*"/>
- <mspec:mspecNode
- filter="(buckminster.source=true)"
- materializer="workspace"/>
-</mspec:mspec>
diff --git a/releng/org.eclipse.graphiti.releng/test/graphiti.rmap b/releng/org.eclipse.graphiti.releng/test/graphiti.rmap
deleted file mode 100644
index 33a99d4..0000000
--- a/releng/org.eclipse.graphiti.releng/test/graphiti.rmap
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rm:rmap xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
- <rm:property key="build.type" mutable="true" value="N"/>
- <rm:locator pattern="^org\.eclipse\.graphiti(\..+)?" searchPathRef="graphiti.test.plugins" failOnError="false"/>
- <rm:locator pattern="^org\.eclipse\.graphiti([\.\-].+)?" searchPathRef="graphiti.features" failOnError="false"/>
- <rm:locator pattern="^org\.eclipse\.graphiti(\..+)?" searchPathRef="graphiti.releng" failOnError="false"/>
- <rm:locator pattern="^org\.eclipse\.graphiti(\..+)?" searchPathRef="graphiti.platform" failOnError="false"/>
- <rm:locator searchPathRef="target.platform"/>
- <rm:searchPath name="graphiti.test.plugins">
- <rm:provider componentTypes="osgi.bundle" readerType="cvs">
- <rm:uri format=":pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,org.eclipse.gmp/org.eclipse.gmp.graphiti/tests/{0}">
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
- <rm:searchPath name="graphiti.features">
- <rm:provider componentTypes="eclipse.feature" readerType="cvs" mutable="false">
- <rm:uri format=":pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,org.eclipse.gmp/org.eclipse.gmp.graphiti/features/{0}">
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
- <rm:searchPath name="graphiti.releng">
- <rm:provider componentTypes="buckminster" readerType="cvs" mutable="false">
- <rm:uri format=":pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,org.eclipse.gmp/org.eclipse.gmp.graphiti/releng/{0}">
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
- <rm:searchPath name="graphiti.platform">
- <rm:provider componentTypes="osgi.bundle" readerType="cvs">
- <rm:uri format=":pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,org.eclipse.gmp/org.eclipse.gmp.graphiti/plugins/{0}">
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
- <rm:searchPath name="target.platform">
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=N)">
- <rm:uri format="http://download.eclipse.org/releases/helios"/>
- </rm:provider>
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(|(build.type=N)(build.type=R))">
- <rm:uri format="http://download.eclipse.org/eclipse/updates/3.6"/>
- </rm:provider>
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=R)">
- <rm:uri format="http://download.eclipse.org/releases/galileo"/>
- </rm:provider>
- <rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
- <rm:uri format="http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository/"/>
- </rm:provider>
- </rm:searchPath>
-</rm:rmap>
diff --git a/releng/org.eclipse.graphiti.releng/test/graphiti_test.xml b/releng/org.eclipse.graphiti.releng/test/graphiti_test.xml
deleted file mode 100644
index 38f8b97..0000000
--- a/releng/org.eclipse.graphiti.releng/test/graphiti_test.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-Copyright (c) 2005, 2010 SAP AG.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Cloudsmith Inc - build.xml for Buckminster project
- Martin Taal - changes for Teneo
- Michael Wenz - changes for Graphiti
-
-The Teneo teneo_build.xml was used as a template for creating this file:
-http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf.teneo/releng/org.eclipse.emf.teneo.releng.buckminster/test/teneo_build.xml?root=Modeling_Project&view=log
-
-Some important parts have been copied from Buckminster's own build setup:
-http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/build.xml?root=Tools_BUCKMINSTER&view=markup
--->
-
-<project default="run" name="Graphiti Tests">
- <!-- load properties and set timestamp for the build -->
- <property environment="env"/>
-
- <!--
- Inherited properties:
- buildRoot: the root of this build
- toolsPath: path containing buckminster
- buildSitePath: the path to which the p2 site should be copied
- buildZipsPath: the path to the directory with zip files
-
- buckminster.output.root
- buckminster.temp.root
- -->
-
- <property name="targetPlatformPath" location="${testRoot}/tp"/>
- <property name="workspacePath" location="${testRoot}/workspace"/>
-
- <import file="../ant_common.xml" />
-
- <target name="run" depends="init,init.build.properties">
- <echo message="Using workspace ${workspacePath}" />
-
- <echo message="Setting jre to ${env.JAVA_HOME}"/>
- <buckminster command="installJRE" workspace="${workspacePath}">
- <cmdargs>
- <arg value="--location" />
- <arg value="${env.JAVA_HOME}" />
- </cmdargs>
- </buckminster>
-
- <echo message="Setting targetPlatformPath to ${targetPlatformPath}" />
- <buckminster command="setpref" workspace="${workspacePath}">
- <cmdargs>
- <arg value="targetPlatformPath=${targetPlatformPath}" />
- </cmdargs>
- </buckminster>
-
- <echo message="Importing projects into workspace ${workspacePath} and"/>
- <echo message="importing binaries into target platform ${targetPlatformPath}" />
- <buckminster command="import" workspace="${workspacePath}">
- <cmdargs>
- <arg value="${basedir}/graphiti.mspec" />
- </cmdargs>
- </buckminster>
-
- <echo message="Building tests" />
- <buckminster command="build" workspace="${workspacePath}">
- <cmdargs>
- <arg value="--thorough" />
- </cmdargs>
- </buckminster>
-
- <echo message="Running JUnit tests for Graphiti" />
- <buckminster command="emma" workspace="${workspacePath}">
- <cmdargs>
- <arg value="-l" />
- <arg value="org.eclipse.graphiti.tests/AllJunitTests.launch" />
- <arg value="-o" />
- <arg value="${testResultsPath}/output/JUnit-graphiti-results.xml" />
- <arg value="--stdout" />
- <arg value="${testResultsPath}/output/JUnit-graphiti-stdout.txt" />
- <arg value="--stderr" />
- <arg value="${testResultsPath}/output/JUnit-graphiti-stderr.txt" />
- <arg value="--xml" />
- <arg value="${testResultsPath}/output/JUnit-graphiti-coverageReport.xml" />
- <arg value="--flatXML"/>
- </cmdargs>
- </buckminster>
-
- <echo message="Running JUnit tests for Graphiti UI" />
- <buckminster command="emma" workspace="${workspacePath}">
- <cmdargs>
- <arg value="-l" />
- <arg value="org.eclipse.graphiti.ui.tests/AllJunitUiTests.launch" />
- <arg value="-o" />
- <arg value="${testResultsPath}/output/JUnit-graphitiUI-results.xml" />
- <arg value="--stdout" />
- <arg value="${testResultsPath}/output/JUnit-graphitiUI-stdout.txt" />
- <arg value="--stderr" />
- <arg value="${testResultsPath}/output/JUnit-graphitiUI-stderr.txt" />
- <arg value="--xml" />
- <arg value="${testResultsPath}/output/JUnit-graphitiUI-coverageReport.xml" />
- <arg value="--flatXML"/>
- </cmdargs>
- </buckminster>
-
- <!-- convert the xml to a format which can be read by junit report>
- NOTE: not used anymore, the flatXML argument now takes care of this
- <xslt in="${testResultsPath}/output/test-results-graphiti.xml" out="${testResultsPath}/xml/TESTS-graphiti.xml" style="convert-test-results.xsl">
- <param name="timeStamp" expression="${buildTimeStamp}" />
- <param name="testName" expression="Graphiti Tests" />
- <param name="testPackage" expression="org.eclipse.graphiti.tests" />
- </xslt-->
- </target>
-
- <target name="init">
- <mkdir dir="${targetPlatformPath}"/>
- <mkdir dir="${workspacePath}"/>
- </target>
-
- <target name="init.build.properties">
- <!-- Echo relevant properties to a temporary file so that Buckminster can read them
- -->
- <tempfile destdir="${java.io.tmpdir}" prefix="build-" suffix=".properties" deleteonexit="true" property="properties.tmp" />
- <echoproperties destfile="${properties.tmp}">
- <!-- We don't want these. basedir in particular will cause problems if passed explicitly -->
- <propertyset negate="true">
- <propertyref name="basedir" />
- <propertyref name="eclipse.home" />
- <propertyref name="properties.tmp" />
- <propertyref name="line.separator" />
- <propertyref name="path.separator" />
- <propertyref prefix="ant." />
- <propertyref prefix="file." />
- <propertyref prefix="java." />
- <propertyref prefix="sun." />
- <propertyref prefix="user." />
- </propertyset>
- </echoproperties>
- </target>
-</project>
diff --git a/releng/org.eclipse.graphiti.releng/xsl/content2html.xsl b/releng/org.eclipse.graphiti.releng/xsl/content2html.xsl
new file mode 100644
index 0000000..44fa318
--- /dev/null
+++ b/releng/org.eclipse.graphiti.releng/xsl/content2html.xsl
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output method="html" omit-xml-declaration="yes" indent="yes"/>
+ <xsl:strip-space elements="*"/>
+
+ <xsl:template match="/">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <xsl:apply-templates select="repository"/>
+ </html>
+ </xsl:template>
+
+ <xsl:template match="repository">
+ <head>
+ <title>
+ <xsl:value-of select="@name"/>
+ </title>
+ </head>
+ <body>
+ <h1>
+ <xsl:value-of select="@name"/>
+ </h1>
+ <p>
+ <em>For information about installing or updating software, see the
+ <a href="http://help.eclipse.org/galileo/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-124.htm">
+ Eclipse Platform Help</a>.</em>
+
+ </p>
+ <table border="0">
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h2>Features</h2>
+ </td>
+ </tr>
+ <xsl:apply-templates select="//provided[@namespace='org.eclipse.update.feature']">
+ <xsl:sort select="@name"/>
+ </xsl:apply-templates>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h2>Plugins</h2>
+ </td>
+ </tr>
+ <xsl:apply-templates select="//provided[@namespace='osgi.bundle']">
+ <xsl:sort select="@name"/>
+ </xsl:apply-templates>
+ </table>
+ </body>
+ </xsl:template>
+
+ <xsl:template match="provided">
+ <tr>
+ <td>
+ <xsl:value-of select="@name"/>
+ </td>
+ <td>
+ <xsl:value-of select="@version"/>
+ </td>
+ </tr>
+ </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng/org.eclipse.graphiti.releng/xsl/content2xml.xsl b/releng/org.eclipse.graphiti.releng/xsl/content2xml.xsl
new file mode 100644
index 0000000..40ba607
--- /dev/null
+++ b/releng/org.eclipse.graphiti.releng/xsl/content2xml.xsl
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output method="xml" indent="yes"/>
+
+ <xsl:template match="/">
+ <xsl:apply-templates select="repository"/>
+ </xsl:template>
+
+ <xsl:template match="repository">
+ <release tag="" integration="true">
+ <xsl:attribute name="repository">
+ <xsl:value-of select="@name"/>
+ </xsl:attribute>
+ <xsl:apply-templates select="//provided[@namespace='org.eclipse.update.feature']">
+ <xsl:sort select="@name"/>
+ </xsl:apply-templates>
+ <xsl:apply-templates select="//provided[@namespace='osgi.bundle']">
+ <xsl:sort select="@name"/>
+ </xsl:apply-templates>
+ </release>
+ </xsl:template>
+
+ <xsl:template match="provided">
+ <element>
+ <xsl:attribute name="name">
+ <xsl:value-of select="@name"/>
+ </xsl:attribute>
+ <xsl:attribute name="version">
+ <xsl:value-of select="@version"/>
+ </xsl:attribute>
+ <xsl:attribute name="type">
+ <xsl:value-of select="@namespace"/>
+ </xsl:attribute>
+ </element>
+ </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file