diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | ext/extmk.rb | 8 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 10 insertions, 6 deletions
@@ -1,3 +1,7 @@ +Wed Mar 9 00:15:52 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb: workaround for nmake. + Tue Mar 8 23:49:45 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * process.c (proc_setgroups): cleanup. diff --git a/ext/extmk.rb b/ext/extmk.rb index 718fc8e3ae..41d379fb27 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -576,7 +576,7 @@ end $mflags.unshift("topdir=#$topdir") ENV.delete("RUBYOPT") if $configure_only and $command_output - exts.map! {|d| "ext/#{d}"} + exts.map! {|d| "ext/#{d}/"} open($command_output, "wb") do |mf| mf.puts "V = 0" mf.puts "Q1 = $(V:1=)" @@ -598,11 +598,11 @@ if $configure_only and $command_output mf.puts targets = %w[all install static install-so install-rb clean distclean realclean] targets.each do |target| - mf.puts "#{target}: $(extensions:=/#{target})" + mf.puts "#{target}: $(extensions:/=/#{target})" end mf.puts mf.puts "all: #{rubies.join(' ')}" - mf.puts "#{rubies.join(' ')}: $(extensions:=/all)" + mf.puts "#{rubies.join(' ')}: $(extensions:/=/all)" rubies.each do |target| mf.puts "#{target}:\n\t$(Q)$(MAKE) $(MFLAGS) $@" end @@ -610,7 +610,7 @@ if $configure_only and $command_output exec = config_string("exec") {|s| s + " "} targets.each do |target| exts.each do |d| - mf.puts "#{d}/#{target}:\n\t$(Q)cd $(@D) && #{exec}$(MAKE) $(MFLAGS) $(@F)" + mf.puts "#{d}#{target}:\n\t$(Q)cd $(@D) && #{exec}$(MAKE) $(MFLAGS) $(@F)" end end end @@ -1,11 +1,11 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_RELEASE_DATE "2011-03-08" +#define RUBY_RELEASE_DATE "2011-03-09" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" #define RUBY_RELEASE_YEAR 2011 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 8 +#define RUBY_RELEASE_DAY 9 #include "ruby/version.h" |