nobu	2008-10-28 16:13:39 +0900 (Tue, 28 Oct 2008)

  New Revision: 19986

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

  Log:
    * tool/make-snapshot: use String#bytesize.

  Modified files:
    trunk/ChangeLog
    trunk/tool/make-snapshot

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19985)
+++ ChangeLog	(revision 19986)
@@ -1,3 +1,7 @@
+Tue Oct 28 16:13:36 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* tool/make-snapshot: use String#bytesize.
+
 Tue Oct 28 09:51:48 2008  NAKAMURA Usaku  <usa@r...>
 
 	* bootstraptest/test_thread.rb: ignore some exceptions.
Index: tool/make-snapshot
===================================================================
--- tool/make-snapshot	(revision 19985)
+++ tool/make-snapshot	(revision 19986)
@@ -1,4 +1,5 @@
 #!/usr/bin/ruby -s
+# -*- encoding: us-ascii -*-
 require 'uri'
 require 'digest/md5'
 require 'digest/sha2'
@@ -20,6 +21,11 @@
 ENV["MV"] ||= "mv"
 ENV["MINIRUBY"] ||= "ruby"
 
+class String
+  # for older ruby
+  alias bytesize size unless method_defined?(:bytesize)
+end
+
 $patch_file &&= File.expand_path($patch_file)
 path = ENV["PATH"].split(File::PATH_SEPARATOR)
 %w[YACC BASERUBY RUBY MV MINIRUBY].each do |var|
@@ -56,7 +62,7 @@
   when /\Astable\z/
     url = SVNURL + "branches/"
     url = url + `svn ls #{url}`[/.*^(ruby_\d+_\d+)\//m, 1]
-  when /\A(.*)\.(.*)\.(.*)-(p)?(.*)/
+  when /\A(.*)\.(.*)\.(.*)-((?!preview)p)?(.*)/
     patchlevel = !!$4
     tag = "#{$4}#{$5}"
     url = SVNURL + "tags/v#{$1}_#{$2}_#{$3}_#{$5}"
@@ -196,6 +202,6 @@
   sha = Digest::SHA256.hexdigest str
   puts "MD5(#{name})= #{md5}"
   puts "SHA256(#{name})= #{sha}"
-  puts "SIZE(name)= #{str.size}"
+  puts "SIZE(name)= #{str.bytesize}"
   puts
 end

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