diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-05-31 02:28:38 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-05-31 10:55:37 +0900 |
commit | fd658ec821f07e0a2254fcd62ce29cc644d61302 (patch) | |
tree | 4cb533bb8563fed8c311a43361fab4a7d0fa8b18 | |
parent | e8c710b11a02c6ab82b358fc671a14f378cb1974 (diff) | |
download | ruby-fd658ec821f07e0a2254fcd62ce29cc644d61302.tar.gz |
Define RUBY_FULL_REVISION
Only if the short revision differs from the full revision.
-rwxr-xr-x | tool/file2lastrev.rb | 5 | ||||
-rwxr-xr-x | tool/make-snapshot | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/tool/file2lastrev.rb b/tool/file2lastrev.rb index 24fbaeb0d7..1e2a6fc440 100755 --- a/tool/file2lastrev.rb +++ b/tool/file2lastrev.rb @@ -54,9 +54,10 @@ vcs = nil } when :revision_h Proc.new {|last, changed, modified, branch, title| + short = vcs.short_revision(last) [ - "#define RUBY_REVISION #{vcs.short_revision(last).dump}", - "#define RUBY_FULL_REVISION #{last.dump}", + "#define RUBY_REVISION #{short.inspect}", + ("#define RUBY_FULL_REVISION #{last.inspect}" unless short == last), if branch e = '..' limit = 16 diff --git a/tool/make-snapshot b/tool/make-snapshot index 57eb195d1c..3e90adba48 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -291,7 +291,13 @@ def package(vcs, rev, destdir, tmp = nil) v = v[0] end - open("#{v}/revision.h", "wb") {|f| f.puts "#define RUBY_REVISION #{revision.dump}"} + open("#{v}/revision.h", "wb") {|f| + short = vcs.short_revision(revision) + f.puts "#define RUBY_REVISION #{short.inspect}" + unless short == revision + f.puts "#define RUBY_FULL_REVISION #{revision.inspect}" + end + } version ||= (versionhdr = IO.read("#{v}/version.h"))[RUBY_VERSION_PATTERN, 1] version ||= begin |