summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-01 05:13:28 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-01 05:13:28 +0000
commit91bbede0845eb886a74b35ab231d3ae8770e8a94 (patch)
tree701e027bfdde5786c4e7d58c80fd95d9660c4fa1
parent4c8148385c7fd5638c25b9394ac350bd8389c130 (diff)
downloadruby-91bbede0845eb886a74b35ab231d3ae8770e8a94.tar.gz
ruby-91bbede0845eb886a74b35ab231d3ae8770e8a94.tar.xz
ruby-91bbede0845eb886a74b35ab231d3ae8770e8a94.zip
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@15659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rwxr-xr-xtool/make-snapshot8
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ad04fc638..34d00388b 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 3d3b43a54..c3dbf54bd 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=.)