ruby-changes:9780
From: yugui <ko1@a...>
Date: Sun, 4 Jan 2009 23:05:50 +0900 (JST)
Subject: [ruby-changes:9780] Ruby:r21321 (ruby_1_9_1): merges r21297 from trunk into ruby_1_9_1.
yugui 2009-01-04 23:05:28 +0900 (Sun, 04 Jan 2009) New Revision: 21321 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21321 Log: merges r21297 from trunk into ruby_1_9_1. * ext/extmk.rb (extmake): does not use both of makefile.rb and extconf.rb at the same time. * lib/mkmf.rb (DLLIB): depends on Makefile. [ruby-core:21096] Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/ext/extmk.rb branches/ruby_1_9_1/lib/mkmf.rb Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 21320) +++ ruby_1_9_1/ChangeLog (revision 21321) @@ -1,3 +1,10 @@ +Sun Jan 4 11:11:31 2009 Nobuyoshi Nakada <nobu@r...> + + * ext/extmk.rb (extmake): does not use both of makefile.rb and + extconf.rb at the same time. + + * lib/mkmf.rb (DLLIB): depends on Makefile. [ruby-core:21096] + Sun Jan 4 03:30:18 2009 Tanaka Akira <akr@f...> * io.c (maygvl_copy_stream_wait_read): renamed to add prefix to Index: ruby_1_9_1/lib/mkmf.rb =================================================================== --- ruby_1_9_1/lib/mkmf.rb (revision 21320) +++ ruby_1_9_1/lib/mkmf.rb (revision 21321) @@ -1721,7 +1721,9 @@ sep = config_string('BUILD_FILE_SEPARATOR') {|s| ":/=#{s}" if s != "/"} || "" mfile.print "$(RUBYARCHDIR)/" if $extout - mfile.print "$(DLLIB): ", (makedef ? "$(DEFFILE) " : ""), "$(OBJS)\n" + mfile.print "$(DLLIB): " + mfile.print "$(DEFFILE) " if makedef + mfile.print "$(OBJS) Makefile\n" mfile.print "\t@-$(RM) $(@#{sep})\n" mfile.print "\t@-$(MAKEDIRS) $(@D)\n" if $extout link_so = LINK_SO.gsub(/^/, "\t") Index: ruby_1_9_1/ext/extmk.rb =================================================================== --- ruby_1_9_1/ext/extmk.rb (revision 21320) +++ ruby_1_9_1/ext/extmk.rb (revision 21321) @@ -137,18 +137,17 @@ begin $extconf_h = nil ok &&= extract_makefile(makefile) + conf = ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb"].find {|f| File.exist?(f)} if (($extconf_h && !File.exist?($extconf_h)) || !(t = modified?(makefile, MTIMES)) || - ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb", "#{$srcdir}/depend"].any? {|f| modified?(f, [t])}) + [conf, "#{$srcdir}/depend"].any? {|f| modified?(f, [t])}) then ok = false init_mkmf Logging::logfile 'mkmf.log' rm_f makefile - if File.exist?($0 = "#{$srcdir}/makefile.rb") - load $0 - elsif File.exist?($0 = "#{$srcdir}/extconf.rb") - load $0 + if conf + load $0 = conf else create_makefile(target) end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/