Skip to content

Commit

Permalink
dragonfly: support the 3 level build release process as used in SVN
Browse files Browse the repository at this point in the history
based SDK.  Replace svn urls with git tag/branch labels.  Script
commenting and cleanup.
  • Loading branch information
kgilmer committed Aug 5, 2011
1 parent 0bda69c commit 8aa5f81
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 18 deletions.
12 changes: 12 additions & 0 deletions com.buglabs.dragonfly.build/com.buglabs.dragonfly.xml
Expand Up @@ -2,6 +2,8 @@

<property name="build.level" value="integration" />
<import file="common.xml" />

<fail unless="bug-osgi.tag" message="'bug-osgi.tag' must be defined." />

<property name="git.bin" location="/usr/bin/git" />
<property name="project.feature" value="com.buglabs.dragonfly.feature" />
Expand Down Expand Up @@ -53,6 +55,12 @@
<arg value="clone" />
<arg value="git://github.com/buglabs/bug-osgi.git" />
</exec>

<echo message="Checking out version: ${bug-osgi.tag}" />
<exec executable="${git.bin}" dir="${checkout.dir}/bug-osgi">
<arg value="checkout" />
<arg value="${bug-osgi.tag}" />
</exec>

<copy todir="${base.build.dir}">
<fileset dir="${checkout.dir}/bug-osgi">
Expand All @@ -72,8 +80,10 @@
</manifest>

<!-- call device management target to checkout needed projects -->
<!--
<ant antfile="com.buglabs.dragonfly.dm.xml" target="fetch.dependencies" />
<ant antfile="com.buglabs.dragonfly.cdt.xml" target="fetch.dependencies" />
-->

<mkdir dir="${checkout.dir}/${project.feature}/build" />
<mkdir dir="${checkout.dir}/${project.feature}/build/plugins" />
Expand All @@ -89,6 +99,7 @@
<fileset dir="${checkout.dir}/${project.feature}" excludes="**/build/**" />
</copy>

<!--
<mkdir dir="${checkout.dir}/${project.feature}/build/features/com.buglabs.dragonfly.dm.feature" />
<copy todir="${checkout.dir}/${project.feature}/build/features/com.buglabs.dragonfly.dm.feature">
<fileset dir="${checkout.dir}/com.buglabs.dragonfly.dm.feature" />
Expand All @@ -98,6 +109,7 @@
<copy todir="${checkout.dir}/${project.feature}/build/features/com.buglabs.dragonfly.cdt.feature">
<fileset dir="${checkout.dir}/com.buglabs.dragonfly.cdt.feature" />
</copy>
-->
</target>

<target name="build" depends="clean,mkdirs,fetch.dependencies,build-bug-osgi">
Expand Down
7 changes: 2 additions & 5 deletions com.buglabs.dragonfly.build/default.properties
@@ -1,10 +1,7 @@
env.COMPUTERNAME=darner.buglabs.net

#version of the build for each component
sdk.version=2.5.0.qualifier
bug.version=2.5.0
cte.version=1.1.0
ote.version=1.0.0
sdk.version=3.0.0.qualifier
bug.version=3.0.0

# Set this to override eclipse.file.default, which usually
# looks for eclipse at ${user.home}/com.eclipse.sdk/eclipse-lin.tar.gz
Expand Down
6 changes: 6 additions & 0 deletions com.buglabs.dragonfly.build/system.integration.properties
@@ -1,2 +1,8 @@
# Build properties for building Dragonfly SDK as a integration release.

# This letter will be prepended to the qualifier component of the version strings generated for all plugins.
build.letter=I

# These tags will be used when cloning from dependent projects.
bug-osgi.tag=master
dragonfly.tag=master
13 changes: 6 additions & 7 deletions com.buglabs.dragonfly.build/system.production.properties
@@ -1,9 +1,8 @@
build.letter=P
# Build properties for building Dragonfly SDK as a production release.

emulator.bundle.version=2.2
# This letter will be prepended to the qualifier component of the version strings generated for all plugins.
build.letter=P

svn.url.bug=svn://bugcamp.net/bug/tags/releases/R2.1.0
svn.url.ote=svn://bugcamp.net/ote/trunk
svn.url.cte=svn://bugcamp.net/cte/trunk
svn.url.dm=svn://bugcamp.net/dragonfly/trunk
svn.url.dragonfly=svn://bugcamp.net/dragonfly/tags/releases/2.2.1
# These tags will be used when cloning from dependent projects.
bug-osgi.tag=R3.0.0
dragonfly.tag=R3.0.0
12 changes: 6 additions & 6 deletions com.buglabs.dragonfly.build/system.testing.properties
@@ -1,8 +1,8 @@
# Build properties for building Dragonfly SDK as a testing release.

# This letter will be prepended to the qualifier component of the version strings generated for all plugins.
build.letter=T
emulator.bundle.version=2.2

svn.url.bug=svn://bugcamp.net/bug/trunk
svn.url.ote=svn://bugcamp.net/ote/trunk
svn.url.cte=svn://bugcamp.net/cte/trunk
svn.url.dm=svn://bugcamp.net/dragonfly/trunk
svn.url.dragonfly=svn://bugcamp.net/dragonfly/tags/RCs/RC2.2.1
# These tags will be used when cloning from dependent projects.
bug-osgi.tag=RC3.0.0
dragonfly.tag=RC3.0.0

0 comments on commit 8aa5f81

Please sign in to comment.