summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2006-03-13 10:36:32 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2006-03-13 10:36:32 +0000
commit9e745473dca51f78ed4c10565b34213159fcf3b8 (patch)
tree18410efa31fb4dc57479c59550ba244a7925ae1c
parent71fa8605447628b44c613b4f6a90416bbee747bc (diff)
downloadscala-9e745473dca51f78ed4c10565b34213159fcf3b8.tar.gz
scala-9e745473dca51f78ed4c10565b34213159fcf3b8.tar.bz2
scala-9e745473dca51f78ed4c10565b34213159fcf3b8.zip
Reverted back Stephane's incorrect changes to t...
Reverted back Stephane's incorrect changes to the versioning scheme. It needs to REMAIN THAT WAY to be compatible with SBaz.
-rw-r--r--build.xml18
1 files changed, 9 insertions, 9 deletions
diff --git a/build.xml b/build.xml
index bac5a02136..e714da7345 100644
--- a/build.xml
+++ b/build.xml
@@ -875,26 +875,21 @@ GENERATES A DISTRIBUTION
</target>
<target name="dist.patch" depends="init">
- <property file="${number.file}"/>
- <property
- name="version.number"
- value="${version.major}.${version.minor}.${version.patch}"
- />
<propertyfile
file="${number.file}"
comment="Version last updated on ${time.human}"
>
<entry key="version.patch" type="int" default="0" operation="+"/>
</propertyfile>
- <runtarget target="dist"/>
- </target>
-
- <target name="dist.minor" depends="init">
<property file="${number.file}"/>
<property
name="version.number"
value="${version.major}.${version.minor}.${version.patch}"
/>
+ <runtarget target="dist"/>
+ </target>
+
+ <target name="dist.minor" depends="init">
<propertyfile
file="${number.file}"
comment="Version last updated on ${time.human}"
@@ -902,6 +897,11 @@ GENERATES A DISTRIBUTION
<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}"
+ />
<runtarget target="dist"/>
</target>