summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-05-22 22:15:55 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-05-22 22:28:07 +0900
commit24684a81d2ed3ae32ad67659a8b18acd052727b5 (patch)
tree649cfa153638d6e88c358a900d7bc6edc20bff43
parent658f17b8ec56e3f8bbd70afdb92c6e7aa156e5be (diff)
Fix revision name
* tool/make-snapshot (package): use the last revision of the whole tree as the revision name, not a single file. * tool/file2lastrev.rb: ditto. dump without unnecessary subrange and literal quotes, to stringize SVN revisions properly.
-rwxr-xr-xtool/file2lastrev.rb2
-rwxr-xr-xtool/make-snapshot4
2 files changed, 3 insertions, 3 deletions
diff --git a/tool/file2lastrev.rb b/tool/file2lastrev.rb
index 0ee22da712..58ff354d3d 100755
--- a/tool/file2lastrev.rb
+++ b/tool/file2lastrev.rb
@@ -54,7 +54,7 @@ parser.parse! rescue abort "#{File.basename(Program)}: #{$!}\n#{parser}"
when :revision_h
Proc.new {|last, changed, modified, branch, title|
[
- "#define RUBY_REVISION \"#{changed[0...10]}\"",
+ "#define RUBY_REVISION #{last.dump}",
if branch
e = '..'
limit = 16
diff --git a/tool/make-snapshot b/tool/make-snapshot
index d81a28c091..0b3d284a90 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -234,7 +234,7 @@ def package(vcs, rev, destdir, tmp = nil)
warn "#{$0}: unknown version - #{rev}"
return
end
- revision ||= vcs.get_revisions(url)[1]
+ revision ||= vcs.get_revisions(url)[0]
version = nil
unless revision
url = vcs.trunk
@@ -243,7 +243,7 @@ def package(vcs, rev, destdir, tmp = nil)
warn "#{$0}: #{rev} not found"
return
end
- revision = vcs.get_revisions(url)[1]
+ revision = vcs.get_revisions(url)[0]
end
v = nil
if $exported