diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | tool/make-snapshot | 7 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Thu Aug 19 22:34:32 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * tool/make-snapshot (package): accept revision as BRANCH@REV. + Thu Aug 19 19:53:26 2010 Tanaka Akira <akr@fsij.org> * ext/socket/ancdata.c (ancillary_timestamp): fix a constant type. diff --git a/tool/make-snapshot b/tool/make-snapshot index 34a37a92f3..06b24ce4f9 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -71,6 +71,9 @@ Dir.chdir tmp def package(rev, destdir) patchlevel = false + if revision = rev[/@(\d+)\z/, 1] + rev = $` + end case rev when /\Atrunk\z/, /\Abranches\//, /\Atags\// url = SVNURL + rev @@ -87,7 +90,7 @@ def package(rev, destdir) warn "#{$0}: unknown version - #{rev}" return end - revision = `svn info #{url} 2>&1`[/Last Changed Rev: (\d+)/, 1] + revision ||= `svn info #{url} 2>&1`[/Last Changed Rev: (\d+)/, 1] version = nil unless revision url = SVNURL + "trunk" @@ -106,7 +109,7 @@ def package(rev, destdir) else v = "ruby" puts "Exporting #{rev}@#{revision}" - IO.popen("svn export #{url} #{v}") do |pipe| + IO.popen("svn export -r #{revision} #{url} #{v}") do |pipe| pipe.each {|line| /^A/ =~ line or print line} end unless $?.success? |