diff options
| author | Paul Phillips <paulp@improving.org> | 2011-12-02 05:36:03 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-12-04 17:20:50 -0800 |
| commit | a289465c70630719cbd3a74edf5502a156ef83c4 (patch) | |
| tree | c1c5d6add5b0c9d4e8d94b6b8f3456245ae4576b /build.xml | |
| parent | a17908694b89115026f587bcb8a8ed6d16768cad (diff) | |
| download | scala-a289465c70630719cbd3a74edf5502a156ef83c4.tar.gz scala-a289465c70630719cbd3a74edf5502a156ef83c4.tar.bz2 scala-a289465c70630719cbd3a74edf5502a156ef83c4.zip | |
Use git-describe to create build string.
Created dev tag which is the merge-base of master and 2.9.1 (merge-base
is the last common commit), and told ant to generate build strings based
on that. So distributions look like
scala-2.10.0.dev-1289-gbba3918
Where the 1289 means you are 1289 commits ahead of "dev" and
the last segment (minus the g) is the sha-1 hash.
This no doubt breaks windows even further. Help getting it
back on its feet greatly appreciated.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -232,10 +232,10 @@ INITIALISATION <os family="windows"/> </condition> - <exec osfamily="unix" executable="tools/get-scala-revision" outputproperty="svn.number" failifexecutionfails="false" /> - <exec osfamily="windows" executable="tools/get-scala-revision.bat" outputproperty="svn.number" failifexecutionfails="false" /> + <exec osfamily="unix" executable="tools/get-scala-revision" outputproperty="git.describe" failifexecutionfails="false" /> + <exec osfamily="windows" executable="tools/get-scala-revision.bat" outputproperty="git.describe" failifexecutionfails="false" /> <!-- some default in case something went wrong getting the revision --> - <property name="svn.number" value="0"/> + <property name="git.describe" value="-unknown-"/> <property name="init.avail" value="yes"/> @@ -243,10 +243,11 @@ INITIALISATION <property file="${basedir}/build.number"/> <property name="version.number" - value="${version.major}.${version.minor}.${version.patch}.r${svn.number}-b${time.short}"/> + value="${version.major}.${version.minor}.${version.patch}.${git.describe}"/> + <!-- And print-out what we are building --> <echo level="info" message="Build number is '${version.number}'"/> - <echo level="info" message="Built ${time.human} from revision ${svn.number} with ${java.vm.name} ${java.version}"/> + <echo level="info" message="Built ${time.human} from revision ${git.describe} with ${java.vm.name} ${java.version}"/> <!-- Local libs (developer use.) --> <mkdir dir="${lib-extra.dir}"/> |