* common.mk (dist): tool/make-snapshot is executable.

* tool/make-snapshot (package): supported release numbers 1.9.0-x.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 4 deletions

diff --git a/tool/make-snapshot b/tool/make-snapshot
index 65f5bd024..f6529d9c2 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -53,9 +53,10 @@ def package(rev, destdir)
   when /\Astable\z/
     url = SVNURL + "branches/"
     url = url + `svn ls #{url}`[/.*^(ruby_\d+_\d+)\//m, 1]
-  when /\A\(.*\..*\..*\)-/
-    patchlevel = true
-    url = SVNURL + "tags/v#{rev.sub(/-p?/, '_').tr('.', '_')}"
+  when /\A(.*)\.(.*)\.(.*)-(p)?(.*)/
+    patchlevel = !!$4
+    tag = "#{$4}#{$5}"
+    url = SVNURL + "tags/v#{$1}_#{$2}_#{$3}_#{$5}"
   when /\./
     url = SVNURL + "branches/ruby_#{rev.tr('.', '_')}"
   else
@@ -97,7 +98,7 @@ def package(rev, destdir)
     patchlevel = versionhdr[/^\#define\s+RUBY_PATCHLEVEL\s+(\d+)/, 1]
     tag = (patchlevel ? "p#{patchlevel}" : "r#{revision}")
   else
-    tag = "r#{revision}"
+    tag ||= "r#{revision}"
   end
   v = "ruby-#{version}-#{tag}"
   File.directory?(v) or File.rename "ruby", v