Skip to content

Commit fbd5efe

Browse files
committedFeb 1, 2012
Fixing build string.
Version number turning up more than once. Looking at the situation I could only see the former mechanism as trouble. I deleted build.number and in ant am generating the build string only from tools/get-scala-revision. We may need to revisit when the time comes to build a release.
1 parent 1eebc52 commit fbd5efe

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed
 

‎README.rst

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ part of the repository but are either automatically generated by the
1414
build script or user-created if needed. This is not a complete listing. ::
1515
scala/
1616
+--build/ Build products output directory for ant.
17-
+--build.number The version number of the current distribution.
1817
+--build.xml The main Ant build script.
1918
+--dist/ The destination folder for Scala distributions.
2019
+--docs/ Documentation and sample code.

‎build.number

-5
This file was deleted.

‎build.xml

+4-9
Original file line numberDiff line numberDiff line change
@@ -251,18 +251,13 @@ INITIALISATION
251251
<os family="windows"/>
252252
</condition>
253253

254-
<exec osfamily="unix" executable="tools/get-scala-revision" outputproperty="git.describe" failifexecutionfails="false" />
255-
<exec osfamily="windows" executable="tools/get-scala-revision.bat" outputproperty="git.describe" failifexecutionfails="false" />
254+
<!-- Generating version string -->
255+
<exec osfamily="unix" executable="tools/get-scala-revision" outputproperty="version.number" failifexecutionfails="false" />
256+
<exec osfamily="windows" executable="tools/get-scala-revision.bat" outputproperty="version.number" failifexecutionfails="false" />
256257
<!-- some default in case something went wrong getting the revision -->
257-
<property name="git.describe" value="-unknown-"/>
258+
<property name="version.number" value="-unknown-"/>
258259
<property name="init.avail" value="yes"/>
259260

260-
<!-- Generating version number -->
261-
<property file="${basedir}/build.number"/>
262-
<property
263-
name="version.number"
264-
value="${version.major}.${version.minor}.${version.patch}.${git.describe}"/>
265-
266261
<!-- And print-out what we are building -->
267262
<echo message=" build time: ${time.human}" />
268263
<echo message=" java version: ${java.vm.name} ${java.version}" />

0 commit comments

Comments
 (0)
Please sign in to comment.