summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-08 06:09:23 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-08 06:09:23 +0000
commite581890816385d703dee109eecc79dbb5825878a (patch)
treee3609978270f67fe5a1c50bdd7d58f35a9fded2a
parent9f0fe90cd37196de476615a6e0b98a3f1fbcf7ed (diff)
* lib/mkmf.rb (xsystem): expand macros like as make.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/mkmf.rb6
-rw-r--r--version.h6
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ceb7badc1b..fc21f7e9b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Feb 8 15:09:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (xsystem): expand macros like as make.
+
Tue Feb 5 11:14:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (INSTALL_DIRS, install_dirs): added BINDIR.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 9e461b42ad..7422a11a50 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -228,6 +228,12 @@ module Logging
end
def xsystem command
+ varpat = /\$\((\w+)\)|\$\{(\w+)\}/
+ if varpat =~ command
+ vars = Hash.new {|h, k| h[k] = ''; ENV[k]}
+ command = command.dup
+ nil while command.gsub!(varpat) {vars[$1||$2]}
+ end
Logging::open do
puts command.quote
system(command)
diff --git a/version.h b/version.h
index 4c0fd32728..a87e735de0 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-02-05"
+#define RUBY_RELEASE_DATE "2008-02-08"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080205
+#define RUBY_RELEASE_CODE 20080208
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 8
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];