yugui	2008-08-26 02:47:57 +0900 (Tue, 26 Aug 2008)

  New Revision: 18857

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18857

  Log:
    * common.mk (dist): tool/make-snapshot is executable.
    
    * tool/make-snapshot (package): supported release numbers 1.9.0-x.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/tool/make-snapshot

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18856)
+++ ChangeLog	(revision 18857)
@@ -1,3 +1,9 @@
+Tue Aug 26 02:47:08 2008  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* common.mk (dist): tool/make-snapshot is executable.
+
+	* tool/make-snapshot (package): supported release numbers 1.9.0-x.
+
 Tue Aug 26 02:43:50 2008  Tanaka Akira  <akr@f...>
 
 	* include/ruby/io.h (rb_io_t): new field: writeconv_pre_opts.
Index: common.mk
===================================================================
--- common.mk	(revision 18856)
+++ common.mk	(revision 18857)
@@ -797,7 +797,7 @@
 	vtl view -ha -mn miniruby$(EXEEXT) -sum -sort -cd | $(RUNRUBY) $(srcdir)/tool/vtlh.rb > ha.lines
 
 dist: $(PREP) $(PROGRAM)
-	$(SHELL) $(srcdir)/tool/make-snapshot . $(TARNAME)
+	$(srcdir)/tool/make-snapshot . $(TARNAME)
 
 up:
 	@$(VCS) up "$(srcdir)"
Index: tool/make-snapshot
===================================================================
--- tool/make-snapshot	(revision 18856)
+++ tool/make-snapshot	(revision 18857)
@@ -53,9 +53,10 @@
   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 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/