summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-27 15:46:49 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-27 15:46:49 +0000
commitd4746b5deb8b675a6e0576a89a412f6e24a8c2bd (patch)
tree402dc26bb0b3f585ec059d3dbdba07c456d5405d
parent3374832f922c8a9624f9d3c4b0e7bfbec9cf6d1a (diff)
* merge -c 11918
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@11920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--common.mk5
-rw-r--r--distruby.rb49
-rw-r--r--mkconfig.rb1
-rw-r--r--version.h8
5 files changed, 66 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 59591f20cc3..b6121e38183 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Feb 28 00:08:11 2007 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
+
+ * mkconfig.rb (RbConfig): add CONFIG['PATCHLEVEL']
+
+ * common.mk: new target dist
+
+ * distruby.rb: new file
+
Tue Feb 27 21:19:35 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
diff --git a/common.mk b/common.mk
index cf3e959566a..3584b83e35e 100644
--- a/common.mk
+++ b/common.mk
@@ -158,7 +158,7 @@ $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
.PRECIOUS: $(MKFILES)
-.PHONY: test install install-nodoc install-doc
+.PHONY: test install install-nodoc install-doc dist
PHONY:
@@ -300,3 +300,6 @@ variable.$(OBJEXT): {$(VPATH)}variable.c {$(VPATH)}ruby.h config.h \
version.$(OBJEXT): {$(VPATH)}version.c {$(VPATH)}ruby.h config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}version.h
+
+dist: $(PROGRAM)
+ $(RUNRUBY) $(srcdir)/distruby.rb
diff --git a/distruby.rb b/distruby.rb
new file mode 100644
index 00000000000..dcc3e76ce8c
--- /dev/null
+++ b/distruby.rb
@@ -0,0 +1,49 @@
+#!./miniruby
+
+if RUBY_PATCHLEVEL.zero?
+ dirname = sprintf 'ruby-%s', RUBY_VERSION
+ tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)/, 'v\1_\2_\3'
+else
+ dirname = sprintf 'ruby-%s-p%u', RUBY_VERSION, RUBY_PATCHLEVEL
+ tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)-p/, 'v\1_\2_\3_'
+end
+tarname = dirname + '.tar.gz'
+repos = 'http://svn.ruby-lang.org/repos/ruby/tags/' + tagname
+
+STDERR.puts 'exporting sources...'
+system 'svn', 'export', '-q', repos, dirname
+Dir.chdir dirname do
+ STDERR.puts 'generating configure...'
+ system 'autoconf'
+ system 'rm', '-rf', 'autom4te.cache'
+
+ STDERR.puts 'generating parse.c...'
+ system 'bison', '-y', '-o', 'parse.c', 'parse.y'
+end
+
+STDERR.puts 'generating tarball...'
+system 'tar', 'chofzp', tarname, dirname
+
+open tarname, 'rb' do |fp|
+ require 'digest/md5'
+ require 'digest/sha1'
+ str = fp.read
+ md5 = Digest::MD5.hexdigest str
+ sha = Digest::SHA1.hexdigest str
+ printf "MD5(%s)= %s\nSHA1(%s)= %s\n", tarname, md5, tarname, sha
+end
+
+
+
+#
+# Local Variables:
+# mode: ruby
+# code: utf-8
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# fill-column: 79
+# default-justification: full
+# End:
+# vi: ts=3 sw=3
+
diff --git a/mkconfig.rb b/mkconfig.rb
index 58582877342..440399b1b8c 100644
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -86,6 +86,7 @@ unless has_version
print " CONFIG[\"MINOR\"] = \"" + $2 + "\"\n"
print " CONFIG[\"TEENY\"] = \"" + $3 + "\"\n"
}
+ print " CONFIG[\"PATCHLEVEL\"] = \"" + RUBY_PATCHLEVEL + "\"\n"
end
dest = drive ? /= \"(?!\$[\(\{])(?:[a-z]:)?/i : /= \"(?!\$[\(\{])/
diff --git a/version.h b/version.h
index 282fe4f6877..e67955b1169 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.5"
-#define RUBY_RELEASE_DATE "2007-02-27"
+#define RUBY_RELEASE_DATE "2007-02-28"
#define RUBY_VERSION_CODE 185
-#define RUBY_RELEASE_CODE 20070227
-#define RUBY_PATCHLEVEL 22
+#define RUBY_RELEASE_CODE 20070228
+#define RUBY_PATCHLEVEL 23
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 5
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DAY 28
RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[];