summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xtool/make-snapshot7
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c7d91faef..93f90ddca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 28 17:22:35 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * tool/make-snapshot.rb: merged back from trunk.
+
Tue Oct 28 16:43:05 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* tool/make-snapshot.rb: had returned wrong sizes for generated
diff --git a/tool/make-snapshot b/tool/make-snapshot
index b2081f615..0f0a31fb3 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -1,5 +1,5 @@
#!/usr/bin/ruby -s
-# -*- coding: US-ASCII -*-
+# -*- encoding: us-ascii -*-
require 'uri'
require 'digest/md5'
require 'digest/sha2'
@@ -21,6 +21,11 @@ ENV["RUBY"] ||= "ruby"
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|