From a889f3405f15bc2996dc307c5593a538986816ff Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 20 Jun 2008 16:02:21 +0000
Subject: [PATCH] * tool/make-snapshot: do not use sha256sum; use BASERUBY
 instead

* common.mk (dist): use tool/make-snapshot instead


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17491 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          |  6 ++++++
 common.mk          |  4 ++--
 tool/make-snapshot | 15 ++++++++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5ab2d36e3e..f628f8a7d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jun 21 00:45:34 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* tool/make-snapshot: do not use sha256sum; use BASERUBY instead
+
+	* common.mk (dist): use tool/make-snapshot instead
+
 Fri Jun 20 16:34:14 2008  Tanaka Akira  <akr@fsij.org>
 
 	* process.c (Init_process): Process::Status#to_int removed.
diff --git a/common.mk b/common.mk
index 61a74e23f8..2ad5a44af7 100644
--- a/common.mk
+++ b/common.mk
@@ -826,8 +826,8 @@ vtune: miniruby$(EXEEXT)
 	vtl view -hf -mn miniruby$(EXEEXT) -sum -sort -cd
 	vtl view -ha -mn miniruby$(EXEEXT) -sum -sort -cd | $(RUNRUBY) $(srcdir)/tool/vtlh.rb > ha.lines
 
-dist: $(PROGRAM)
-	$(RUNRUBY) $(srcdir)/distruby.rb
+dist: $(PREP) $(PROGRAM)
+	$(SHELL) $(srcdir)/tool/make-snapshot . $(TARNAME)
 
 up:
 	@$(VCS) up "$(srcdir)"
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 92a30323fe..81b3b03b70 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -93,9 +93,14 @@ for rev; do
     rm -fr $v
 done
 for file in $files; do
-    md5=$(md5sum $file)
-    sha256=$(sha256sum $file)
-    echo "MD5(${file##*/})= ${md5%% *}"
-    echo "SHA256(${file##*/})= ${sha256%% *}"
-    echo "SIZE(${file##*/})= `find $file -printf %s`"
+    ${BASERUBY} -r digest/md5 -r digest/sha2 <<EOF     
+	name = "$file"
+	str = ARGF.read
+	md5 = Digest::MD5.hexdigest str
+	sha = Digest::SHA256.hexdigest str
+	printf "MD5(%s)= %s\nSHA256(%s)= %s\nSIZE(%s)= %s\n\n",
+		name, md5,
+		name, sha,
+		name, str.size
+EOF
 done