summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-21 09:24:26 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-21 09:24:26 (GMT)
commite877f7e217fd3fd4327c3c06a934c8bd145caebe (patch)
tree50a1632ffb8224ed0a8b63d4474f79a20083c89f
parent68201165edb493fd48426c039bd84a25c326fdca (diff)
merge revision(s) 23479:
* lib/mkmf.rb (SRC_EXT): should be flat. http://twitter.com/_tad_/status/1825862632 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@24221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb2
-rw-r--r--version.h8
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index a27c01a..2679295 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 21 18:21:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (SRC_EXT): should be flat.
+ http://twitter.com/_tad_/status/1825862632
+
Sat Jul 18 00:44:43 2009 URABE Shyouhei <shyouhei@ruby-lang.org>
* gc.c (rb_gc_call_finalizer_at_exit): finalizer_table can be NULL.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index c9a6295..416292d 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -12,7 +12,7 @@ CXX_EXT = %w[cc cxx cpp]
if /mswin|bccwin|mingw|msdosdjgpp|human|os2/ !~ CONFIG['build_os']
CXX_EXT.concat(%w[C])
end
-SRC_EXT = %w[c m] << CXX_EXT
+SRC_EXT = %w[c m].concat(CXX_EXT)
$static = $config_h = nil
$default_static = $static
diff --git a/version.h b/version.h
index 6933b83..fd747dd 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-07-18"
+#define RUBY_RELEASE_DATE "2009-07-21"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090718
-#define RUBY_PATCHLEVEL 186
+#define RUBY_RELEASE_CODE 20090721
+#define RUBY_PATCHLEVEL 187
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 21
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];