Merge pull request JuliaLang#4743 from JuliaLang/sf/versiontweaks

Tweak base/version.jl printing a bit
halleysfifthinc · Nov 9, 2013 · 3fdec84 · 3fdec84
2 parents ab73026 + beb7061
commit 3fdec84
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/base/util.jl b/base/util.jl
@@ -320,7 +320,9 @@ end
 
 function versioninfo(io::IO=STDOUT, verbose::Bool=false)
  println(io, "Julia Version $VERSION")
- println(io, commit_string)
+ if !isempty(BUILD_INFO.commit_short)
+ println(io, "Commit $(BUILD_INFO.commit_short) ($(BUILD_INFO.date_string))")
+ end
  println(io, "Platform Info:")
  println(io, " System: ", Sys.OS_NAME, " (", Sys.MACHINE, ")")
  println(io, " WORD_SIZE: ", Sys.WORD_SIZE)

diff --git a/base/version.jl b/base/version.jl
@@ -192,15 +192,15 @@ catch e
 end
 
 if BUILD_INFO.tagged_commit
- global const commit_string = BUILD_INFO.TAGGED_RELEASE_BANNER
+ const commit_string = BUILD_INFO.TAGGED_RELEASE_BANNER
 elseif BUILD_INFO.commit == ""
- global const commit_string = "Unknown commit"
+ const commit_string = ""
 else
  local days = int(floor((ccall(:clock_now, Float64, ()) - BUILD_INFO.fork_master_timestamp) / (60 * 60 * 24)))
  if BUILD_INFO.fork_master_distance == 0
- global const commit_string = "Commit $(BUILD_INFO.commit_short) ($(days) days old master)"
+ const commit_string = "Commit $(BUILD_INFO.commit_short) ($(days) days old master)"
  else
- global const commit_string = "$(BUILD_INFO.branch)/$(BUILD_INFO.commit_short) (fork: $(BUILD_INFO.fork_master_distance) commits, $(days) days)"
+ const commit_string = "$(BUILD_INFO.branch)/$(BUILD_INFO.commit_short) (fork: $(BUILD_INFO.fork_master_distance) commits, $(days) days)"
  end
 end
 commit_date = BUILD_INFO.date_string != "" ? " ($(BUILD_INFO.date_string))": ""