From 22dc58bf973a78675b1f98eafe052fe614471d72 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 1 Mar 2008 05:13:28 +0000
Subject: [PATCH] * tool/make-snapshot: make prereq uses MINIRUBY.

* tool/make-snapshot: allow packaging like 1.9.0-1 by second
  command-line argument.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 7 +++++++
 tool/make-snapshot | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ad04fc6385..34d00388bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Mar  1 13:46:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* tool/make-snapshot: make prereq uses MINIRUBY.
+
+	* tool/make-snapshot: allow packaging like 1.9.0-1 by second
+	  command-line argument.
+
 Sat Mar  1 13:11:03 2008  Tanaka Akira  <akr@fsij.org>
 
 	* test/ruby/allpairs.rb: new file for all pairs method.
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 3d3b43a546..c3dbf54bd2 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -3,8 +3,8 @@
 LC_ALL=C LANG=C
 SVNURL=http://svn.ruby-lang.org/repos/ruby/trunk
 export LC_ALL LANG
-: ${VPATH=include/ruby} ${YACC=bison} ${BASERUBY=ruby} ${RUBY=ruby} ${MV=mv}
-export VPATH YACC BASERUBY RUBY MV
+: ${VPATH=include/ruby} ${YACC=bison} ${BASERUBY=ruby} ${RUBY=ruby} ${MV=mv} ${MINIRUBY=ruby}
+export VPATH YACC BASERUBY RUBY MV MINIRUBY
 
 if [ ! "$1" ]; then
     echo usage: `basename $0` new-directory-to-save 1>&2
@@ -16,11 +16,11 @@ dest=`cd "$1"; pwd`
 tmp="${TMP_DIR-/tmp}/ruby-snapshot-$$"
 mkdir -p "$tmp"
 (cd "$tmp"
-revision=`svn export $SVNURL ruby | sed -n '$s/[^0-9]//gp'`
+revision=r`svn export $SVNURL ruby | sed -n '$s/[^0-9]//gp'`
 [ $revision ] || revision=`svn info $SVNURL | sed -n 's/Revision: //p'`
 echo "#define RUBY_REVISION $revision" > ruby/revision.h
 version=`sed -n -e '/^#define RUBY_VERSION /s/[^0-9.]//gp' ruby/version.h`
-v=ruby-$version-r$revision
+v=ruby-$version-${2-$revision}
 mv ruby $v
 (cd $v; autoconf; (sed '/lex\.c/,/^$/!d' Makefile.in; sed 's/{[^{}]*}//g' common.mk) | make -f - prereq srcdir=.)