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

ruby-changes:19034

From: nobu <ko1@a...>
Date: Wed, 9 Mar 2011 20:47:00 +0900 (JST)
Subject: [ruby-changes:19034] Ruby:r31072 (trunk): * ext/extmk.rb: nmake substitutes all occurences in macro.

nobu	2011-03-09 00:45:33 +0900 (Wed, 09 Mar 2011)

  New Revision: 31072

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

  Log:
    * ext/extmk.rb: nmake substitutes all occurences in macro.

  Modified files:
    trunk/ChangeLog
    trunk/ext/extmk.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31071)
+++ ChangeLog	(revision 31072)
@@ -1,5 +1,7 @@
-Wed Mar  9 00:15:52 2011  Nobuyoshi Nakada  <nobu@r...>
+Wed Mar  9 00:45:29 2011  Nobuyoshi Nakada  <nobu@r...>
 
+	* ext/extmk.rb: nmake substitutes all occurences in macro.
+
 	* ext/extmk.rb: workaround for nmake.
 
 Tue Mar  8 23:49:45 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 31071)
+++ ext/extmk.rb	(revision 31072)
@@ -576,7 +576,7 @@
 $mflags.unshift("topdir=#$topdir")
 ENV.delete("RUBYOPT")
 if $configure_only and $command_output
-  exts.map! {|d| "ext/#{d}/"}
+  exts.map! {|d| "ext/#{d}/."}
   open($command_output, "wb") do |mf|
     mf.puts "V = 0"
     mf.puts "Q1 = $(V:1=)"
@@ -598,11 +598,11 @@
     mf.puts
     targets = %w[all install static install-so install-rb clean distclean realclean]
     targets.each do |target|
-      mf.puts "#{target}: $(extensions:/=/#{target})"
+      mf.puts "#{target}: $(extensions:/.=/#{target})"
     end
     mf.puts
     mf.puts "all: #{rubies.join(' ')}"
-    mf.puts "#{rubies.join(' ')}: $(extensions:/=/all)"
+    mf.puts "#{rubies.join(' ')}: $(extensions:/.=/all)"
     rubies.each do |target|
       mf.puts "#{target}:\n\t$(Q)$(MAKE) $(MFLAGS) $@"
     end
@@ -610,7 +610,7 @@
     exec = config_string("exec") {|s| s + " "}
     targets.each do |target|
       exts.each do |d|
-        mf.puts "#{d}#{target}:\n\t$(Q)cd $(@D) && #{exec}$(MAKE) $(MFLAGS) $(@F)"
+        mf.puts "#{d[0..-2]}#{target}:\n\t$(Q)cd $(@D) && #{exec}$(MAKE) $(MFLAGS) $(@F)"
       end
     end
   end

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

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