Merge pull request JuliaLang#17434 from martinholters/semver

Put build number in pre-release version instead of build metadata

base/version.jl

@@ -208,13 +208,13 @@ A `VersionNumber` object describing which version of Julia is in use. For detail
 const VERSION = try
  ver = convert(VersionNumber, VERSION_STRING)
  if !isempty(ver.prerelease)
- build_number = GIT_VERSION_INFO.build_number
- if ver == v"0.5.0-pre"
- # due to change of reference for counting commits from last tag to last change of VERSION file
- build_number += 5578
+ if GIT_VERSION_INFO.build_number >= 0
+ ver = VersionNumber(ver.major, ver.minor, ver.patch, (ver.prerelease..., GIT_VERSION_INFO.build_number), ver.build)
+ else
+ println("WARNING: no build number found for pre-release version")
+ ver = VersionNumber(ver.major, ver.minor, ver.patch, (ver.prerelease..., "unknown"), ver.build)
  end
- ver = VersionNumber(ver.major, ver.minor, ver.patch, ver.prerelease, (build_number,))
- elseif GIT_VERSION_INFO.build_number != 0
+ elseif GIT_VERSION_INFO.build_number > 0
  println("WARNING: ignoring non-zero build number for VERSION")
  end
  ver

base/version_git.sh

@@ -73,7 +73,7 @@ fork_master_timestamp=$(git show -s $(git merge-base HEAD $(echo $origin)master)
 
 # Check for errrors and emit default value for missing numbers.
 if [ -z "$build_number" ]; then
- build_number="0"
+ build_number="-1"
 fi
 if [ -z "$fork_master_distance" ]; then
  fork_master_distance="-1"

contrib/commit-name.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 # This file is a part of Julia. License is MIT: http:https://julialang.org/license
 
-# Need to be run from a julia repo clone
-# First argument (Optional) is a ref to the commit
+# Needs to be run from a julia repo clone
+# First argument (optional) is a ref to the commit
 
 gitref=${1:-HEAD}
 
@@ -32,7 +32,11 @@ else
  nb=$(expr $nb + 5578)
  fi
  if [ -n "$pre" ]; then
- echo "$ver+$nb"
+ if [ $major = 0 -a $minor -le 5 ]; then
+ echo "$ver+$nb"
+ else
+ echo "$ver.$nb"
+ fi
  else
  echo $ver
  fi