kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31072 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-03-08 15:45:33 +00:00
parent c74a962aab
commit d9e5dd3b0f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,4 +1,6 @@
Wed Mar 9 00:15:52 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Mar 9 00:45:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb: nmake substitutes all occurences in macro.
* ext/extmk.rb: workaround for nmake. * ext/extmk.rb: workaround for nmake.

8
ext/extmk.rb
View File

@ -576,7 +576,7 @@ end
$mflags.unshift("topdir=#$topdir") $mflags.unshift("topdir=#$topdir")
ENV.delete("RUBYOPT") ENV.delete("RUBYOPT")
if $configure_only and $command_output if $configure_only and $command_output
exts.map! {|d| "ext/#{d}/"} exts.map! {|d| "ext/#{d}/."}
open($command_output, "wb") do |mf| open($command_output, "wb") do |mf|
mf.puts "V = 0" mf.puts "V = 0"
mf.puts "Q1 = $(V:1=)" mf.puts "Q1 = $(V:1=)"
@ -598,11 +598,11 @@ if $configure_only and $command_output
mf.puts mf.puts
targets = %w[all install static install-so install-rb clean distclean realclean] targets = %w[all install static install-so install-rb clean distclean realclean]
targets.each do |target| targets.each do |target|
mf.puts "#{target}: $(extensions:/=/#{target})" mf.puts "#{target}: $(extensions:/.=/#{target})"
end end
mf.puts mf.puts
mf.puts "all: #{rubies.join(' ')}" mf.puts "all: #{rubies.join(' ')}"
mf.puts "#{rubies.join(' ')}: $(extensions:/=/all)" mf.puts "#{rubies.join(' ')}: $(extensions:/.=/all)"
rubies.each do |target| rubies.each do |target|
mf.puts "#{target}:\n\t$(Q)$(MAKE) $(MFLAGS) $@" mf.puts "#{target}:\n\t$(Q)$(MAKE) $(MFLAGS) $@"
end end
@ -610,7 +610,7 @@ if $configure_only and $command_output
exec = config_string("exec") {|s| s + " "} exec = config_string("exec") {|s| s + " "}
targets.each do |target| targets.each do |target|
exts.each do |d| 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 end
end end