diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-21 15:50:27 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-21 15:50:27 +0000 |
commit | 6d55a704454c197b725fa91acb061841aa6805df (patch) | |
tree | 8956412603b7a6bf298087329b3db5d997fd907d | |
parent | d842d1bcc403b37f396e24fd06bdb03e73540c37 (diff) |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ext/extmk.rb | 9 | ||||
-rw-r--r-- | lib/mkmf.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 15 insertions, 7 deletions
@@ -1,3 +1,10 @@ +Sun Feb 22 00:49:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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:19:05 2009 Tanaka Akira <akr@fsij.org> * eval.c (rb_thread_schedule): Don't change status of threads which diff --git a/ext/extmk.rb b/ext/extmk.rb index 64746552c1..2527645ad8 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -154,18 +154,17 @@ def extmake(target) 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 diff --git a/lib/mkmf.rb b/lib/mkmf.rb index a532b5c0a8..380e660233 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1580,7 +1580,9 @@ site-install-rb: install-rb 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") @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-22" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20090222 -#define RUBY_PATCHLEVEL 135 +#define RUBY_PATCHLEVEL 136 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |