[前][次][番号順一覧][スレッド一覧]

ruby-changes:11498

From: nobu <ko1@a...>
Date: Fri, 3 Apr 2009 12:43:27 +0900 (JST)
Subject: [ruby-changes:11498] Ruby:r23124 (ruby_1_8): * common.mk (main): passes $(MAKE) to mkmain_cmd

nobu	2009-04-03 12:43:17 +0900 (Fri, 03 Apr 2009)

  New Revision: 23124

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23124

  Log:
    * common.mk (main): passes $(MAKE) to mkmain_cmd
    * ext/extmk.rb (command_output): uses arguments to invoke make.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/common.mk
    branches/ruby_1_8/ext/extmk.rb
    branches/ruby_1_8/version.h

Index: ruby_1_8/ext/extmk.rb
===================================================================
--- ruby_1_8/ext/extmk.rb	(revision 23123)
+++ ruby_1_8/ext/extmk.rb	(revision 23124)
@@ -579,9 +579,9 @@
   open($command_output, 'wb') do |f|
     case $command_output
     when /\.sh\z/
-      f.puts message, "rm -f $0; exec #{cmd}"
+      f.puts message, "rm -f $0; exec \"$@\" #{cmd}"
     when /\.bat\z/
-      ["@echo off", message, cmd, "del %0 & exit %ERRORLEVEL%"].each do |s|
+      ["@echo off", message, "%* #{cmd}", "del %0 & exit %ERRORLEVEL%"].each do |s|
         f.print s, "\r\n"
       end
     else
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 23123)
+++ ruby_1_8/ChangeLog	(revision 23124)
@@ -1,3 +1,9 @@
+Fri Apr  3 12:43:14 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (main): passes $(MAKE) to mkmain_cmd
+
+	* ext/extmk.rb (command_output): uses arguments to invoke make.
+
 Mon Mar 30 12:12:07 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (rb_eval): checks for interrupt, stack and finalizers too.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 23123)
+++ ruby_1_8/version.h	(revision 23124)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2009-03-30"
+#define RUBY_RELEASE_DATE "2009-04-03"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20090330
+#define RUBY_RELEASE_CODE 20090403
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2009
-#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_MONTH 4
+#define RUBY_RELEASE_DAY 3
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/common.mk
===================================================================
--- ruby_1_8/common.mk	(revision 23123)
+++ ruby_1_8/common.mk	(revision 23124)
@@ -84,7 +84,7 @@
 all: main
 
 main: exts
-	@$(RUNCMD) $(MKMAIN_CMD) MAKE=$(MAKE)
+	@$(RUNCMD) $(MKMAIN_CMD) $(MAKE)
 
 exts: $(MKMAIN_CMD)
 

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

[前][次][番号順一覧][スレッド一覧]