nobu	2008-02-08 15:09:23 +0900 (Fri, 08 Feb 2008)

  New Revision: 15402

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/mkmf.rb
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/lib/mkmf.rb

  Log:
    * lib/mkmf.rb (xsystem): expand macros like as make.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/mkmf.rb?r1=15402&r2=15401&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15402&r2=15401&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15402&r2=15401&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/mkmf.rb?r1=15402&r2=15401&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=15402&r2=15401&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15401)
+++ ChangeLog	(revision 15402)
@@ -1,3 +1,7 @@
+Fri Feb  8 15:09:21 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (xsystem): expand macros like as make.
+
 Fri Feb  8 09:27:57 2008  NARUSE, Yui  <naruse@r...>
 
 	* lib/rdoc/ri/driver.rb (read_yaml): remove SM* for compatibility.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 15401)
+++ lib/mkmf.rb	(revision 15402)
@@ -267,6 +267,12 @@
 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)
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 15401)
+++ ruby_1_8/ChangeLog	(revision 15402)
@@ -1,3 +1,7 @@
+Fri Feb  8 15:09:21 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (xsystem): expand macros like as make.
+
 Tue Feb  5 11:14:11 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (INSTALL_DIRS, install_dirs): added BINDIR.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 15401)
+++ ruby_1_8/version.h	(revision 15402)
@@ -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[];
Index: ruby_1_8/lib/mkmf.rb
===================================================================
--- ruby_1_8/lib/mkmf.rb	(revision 15401)
+++ ruby_1_8/lib/mkmf.rb	(revision 15402)
@@ -228,6 +228,12 @@
 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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/