ruby-changes:9756
From: nobu <ko1@a...>
Date: Sun, 4 Jan 2009 11:12:38 +0900 (JST)
Subject: [ruby-changes:9756] Ruby:r21297 (ruby_1_8, trunk): * ext/extmk.rb (extmake): does not use both of makefile.rb and
nobu 2009-01-04 11:11:33 +0900 (Sun, 04 Jan 2009) New Revision: 21297 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21297 Log: * 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/ChangeLog branches/ruby_1_8/ext/extmk.rb branches/ruby_1_8/lib/mkmf.rb branches/ruby_1_8/version.h trunk/ChangeLog trunk/ext/extmk.rb trunk/lib/mkmf.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 21296) +++ ChangeLog (revision 21297) @@ -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 09:27:41 2009 Nobuyoshi Nakada <nobu@r...> * ext/socket/socket.c (constant_arg): constified. Index: lib/mkmf.rb =================================================================== --- lib/mkmf.rb (revision 21296) +++ lib/mkmf.rb (revision 21297) @@ -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: ext/extmk.rb =================================================================== --- ext/extmk.rb (revision 21296) +++ ext/extmk.rb (revision 21297) @@ -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 Index: ruby_1_8/ext/extmk.rb =================================================================== --- ruby_1_8/ext/extmk.rb (revision 21296) +++ ruby_1_8/ext/extmk.rb (revision 21297) @@ -145,18 +145,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/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 21296) +++ ruby_1_8/ChangeLog (revision 21297) @@ -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] + Mon Dec 29 17:02:50 2008 Tanaka Akira <akr@f...> * eval.c (rb_thread_schedule): Don't change status of threads which Index: ruby_1_8/version.h =================================================================== --- ruby_1_8/version.h (revision 21296) +++ ruby_1_8/version.h (revision 21297) @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2008-12-29" +#define RUBY_RELEASE_DATE "2009-01-04" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20081229 +#define RUBY_RELEASE_CODE 20090104 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 -#define RUBY_RELEASE_YEAR 2008 -#define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 29 +#define RUBY_RELEASE_YEAR 2009 +#define RUBY_RELEASE_MONTH 1 +#define RUBY_RELEASE_DAY 4 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; Index: ruby_1_8/lib/mkmf.rb =================================================================== --- ruby_1_8/lib/mkmf.rb (revision 21296) +++ ruby_1_8/lib/mkmf.rb (revision 21297) @@ -1592,7 +1592,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/