ruby-changes:43979
From: nobu <ko1@a...>
Date: Thu, 1 Sep 2016 12:58:14 +0900 (JST)
Subject: [ruby-changes:43979] nobu:r56051 (trunk): no Borland make [ci skip]
nobu 2016-09-01 12:58:01 +0900 (Thu, 01 Sep 2016) New Revision: 56051 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56051 Log: no Borland make [ci skip] * ext/extmk.rb: remove Borland make support. Borland C++ has not been supported since years ago. * lib/mkmf.rb: ditto. Modified files: trunk/ext/extmk.rb trunk/lib/mkmf.rb Index: lib/mkmf.rb =================================================================== --- lib/mkmf.rb (revision 56050) +++ lib/mkmf.rb (revision 56051) @@ -2015,15 +2015,6 @@ TOUCH = exit > https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2015 preload = #{defined?($preload) && $preload ? $preload.join(' ') : ''} } - if $nmake == ?b - mk.each do |x| - x.gsub!(/^(MAKEDIRS|INSTALL_(?:PROG|DATA))+\s*=.*\n/) do - "!ifndef " + $1 + "\n" + - $& + - "!endif\n" - end - end - end mk end @@ -2425,7 +2416,6 @@ site-install-rb: install-rb https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2416 return unless target - mfile.puts SRC_EXT.collect {|e| ".path.#{e} = $(VPATH)"} if $nmake == ?b mfile.print ".SUFFIXES: .#{(SRC_EXT + [$OBJEXT, $ASMEXT]).compact.join(' .')}\n" mfile.print "\n" Index: ext/extmk.rb =================================================================== --- ext/extmk.rb (revision 56050) +++ ext/extmk.rb (revision 56051) @@ -694,18 +694,6 @@ unless $destdir.to_s.empty? https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L694 end $makeflags.uniq! -if $nmake == ?b - unless (vars = $mflags.grep(/\A\w+=/n)).empty? - open(mkf = "libruby.mk", "wb") do |tmf| - tmf.puts("!include Makefile") - tmf.puts - tmf.puts(*vars.map {|v| v.sub(/\=/, " = ")}) - tmf.puts("PRE_LIBRUBY_UPDATE = del #{mkf}") - end - $mflags.unshift("-f#{mkf}") - vars.each {|flag| flag.sub!(/\A/, "-D")} - end -end $mflags.unshift("topdir=#$topdir") ENV.delete("RUBYOPT") if $configure_only and $command_output -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/