diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-01 13:19:46 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-01 13:28:08 -0800 |
| commit | fbd5efe49cf23b446762dfa5026e8bac82ab04fc (patch) | |
| tree | 5d70dd0e06194e376ec73b66ba0df149628bd504 | |
| parent | 1eebc520fc787297718d31c3e3a4fb6a244b1067 (diff) | |
| download | scala-fbd5efe49cf23b446762dfa5026e8bac82ab04fc.tar.gz scala-fbd5efe49cf23b446762dfa5026e8bac82ab04fc.tar.bz2 scala-fbd5efe49cf23b446762dfa5026e8bac82ab04fc.zip | |
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.
| -rw-r--r-- | README.rst | 1 | ||||
| -rw-r--r-- | build.number | 5 | ||||
| -rw-r--r-- | build.xml | 13 |
3 files changed, 4 insertions, 15 deletions
diff --git a/README.rst b/README.rst index 940d948dd5..383db1c175 100644 --- a/README.rst +++ b/README.rst @@ -14,7 +14,6 @@ part of the repository but are either automatically generated by the build script or user-created if needed. This is not a complete listing. :: scala/ +--build/ Build products output directory for ant. - +--build.number The version number of the current distribution. +--build.xml The main Ant build script. +--dist/ The destination folder for Scala distributions. +--docs/ Documentation and sample code. diff --git a/build.number b/build.number deleted file mode 100644 index 91c7e72c85..0000000000 --- a/build.number +++ /dev/null @@ -1,5 +0,0 @@ -#Tue Sep 11 19:21:09 CEST 2007 -version.minor=10 -version.patch=0 -version.suffix=alpha -version.major=2 @@ -251,18 +251,13 @@ INITIALISATION <os family="windows"/> </condition> - <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" /> + <!-- Generating version string --> + <exec osfamily="unix" executable="tools/get-scala-revision" outputproperty="version.number" failifexecutionfails="false" /> + <exec osfamily="windows" executable="tools/get-scala-revision.bat" outputproperty="version.number" failifexecutionfails="false" /> <!-- some default in case something went wrong getting the revision --> - <property name="git.describe" value="-unknown-"/> + <property name="version.number" value="-unknown-"/> <property name="init.avail" value="yes"/> - <!-- Generating version number --> - <property file="${basedir}/build.number"/> - <property - name="version.number" - value="${version.major}.${version.minor}.${version.patch}.${git.describe}"/> - <!-- And print-out what we are building --> <echo message=" build time: ${time.human}" /> <echo message=" java version: ${java.vm.name} ${java.version}" /> |