summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2008-02-19 10:26:48 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2008-02-19 10:26:48 +0000
commit0eb7d42b3a00df70785bce9dca6740f9a1a5632f (patch)
treea2385dcc0e0dfb5fe8bbff750948336aae0b2cbb /build.xml
parent9c79f8e32df1822670ded677ebdfd1cc8a980d15 (diff)
downloadscala-0eb7d42b3a00df70785bce9dca6740f9a1a5632f.tar.gz
scala-0eb7d42b3a00df70785bce9dca6740f9a1a5632f.tar.bz2
scala-0eb7d42b3a00df70785bce9dca6740f9a1a5632f.zip
Changed version naming scheme to be Eclipse com...
Changed version naming scheme to be Eclipse compatible.
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml17
1 files changed, 5 insertions, 12 deletions
diff --git a/build.xml b/build.xml
index 2399a3d544..098f4d1da4 100644
--- a/build.xml
+++ b/build.xml
@@ -143,7 +143,7 @@ INITIALISATION
<stopwatch name="timer.dist"/>
<tstamp prefix="time">
<format property="human" pattern="EEEE, d MMMM yyyy, HH:mm:ss (zz)"/>
- <format property="short" pattern="yyyyMMdd-HHmmss"/>
+ <format property="short" pattern="yyyyMMddHHmmss"/>
</tstamp>
<!-- Finding out what system architecture is being used -->
<condition property="os.win"><os family="windows"/></condition>
@@ -244,7 +244,7 @@ SETUP
<property file="${number.file}"/>
<property
name="version.number"
- value="${version.major}.${version.minor}.${version.patch}.${svn.number}.${time.short}"/>
+ value="${version.major}.${version.minor}.${version.patch}.r${svn.number}-b${time.short}"/>
<!-- And print-out what we are building -->
<echo level="info" message="Build number is '${version.number}'"/>
<echo level="info" message="Built ${time.human} from SVN revision ${svn.number}"/>
@@ -1536,28 +1536,21 @@ GENERATES A DISTRIBUTION
<target name="dist.devel" depends="init">
<property file="${number.file}"/>
<property name="version.number"
- value="${version.major}.${version.minor}.${version.patch}.${svn.number}"/>
+ value="${version.major}.${version.minor}.${version.patch}.r${svn.number}"/>
<runtarget target="pack"/>
</target>
<target name="dist.patch" depends="init">
- <propertyfile file="${number.file}">
- <entry key="version.patch" type="int" default="0" operation="+"/>
- </propertyfile>
<property file="${number.file}"/>
<property name="version.number"
- value="${version.major}.${version.minor}.${version.patch}${version.suffix}"/>
+ value="${version.major}.${version.minor}.${version.patch}.${version.suffix}"/>
<runtarget target="pack"/>
</target>
<target name="dist.minor" depends="init">
- <propertyfile file="${number.file}">
- <entry key="version.minor" type="int" default="0" operation="+"/>
- <entry key="version.patch" type="int" value="0"/>
- </propertyfile>
<property file="${number.file}"/>
<property name="version.number"
- value="${version.major}.${version.minor}.${version.patch}${version.suffix}"/>
+ value="${version.major}.${version.minor}.${version.patch}.${version.suffix}"/>
<runtarget target="pack"/>
</target>