ruby-changes:10907
From: shyouhei <ko1@a...>
Date: Sun, 22 Feb 2009 00:49:19 +0900 (JST)
Subject: [ruby-changes:10907] Ruby:r22482 (ruby_1_8_6): merge revision(s) 21297:
shyouhei 2009-02-22 00:49:10 +0900 (Sun, 22 Feb 2009) New Revision: 22482 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22482 Log: merge revision(s) 21297: * 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_8_6/ChangeLog branches/ruby_1_8_6/ext/extmk.rb branches/ruby_1_8_6/lib/mkmf.rb branches/ruby_1_8_6/version.h Index: ruby_1_8_6/ext/extmk.rb =================================================================== --- ruby_1_8_6/ext/extmk.rb (revision 22481) +++ ruby_1_8_6/ext/extmk.rb (revision 22482) @@ -155,18 +155,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 Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 22481) +++ ruby_1_8_6/ChangeLog (revision 22482) @@ -1,3 +1,10 @@ +Sun Feb 22 00:29:05 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 Feb 22 00:13:58 2009 Tanaka Akira <akr@f...> * eval.c (rb_thread_schedule): Don't change status of threads which Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 22481) +++ ruby_1_8_6/version.h (revision 22482) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-22" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20090222 -#define RUBY_PATCHLEVEL 348 +#define RUBY_PATCHLEVEL 349 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 Index: ruby_1_8_6/lib/mkmf.rb =================================================================== --- ruby_1_8_6/lib/mkmf.rb (revision 22481) +++ ruby_1_8_6/lib/mkmf.rb (revision 22482) @@ -1333,7 +1333,9 @@ end 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) $@\n" mfile.print "\t@-$(MAKEDIRS) $(@D)\n" if $extout link_so = LINK_SO.gsub(/^/, "\t") -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/