kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/extmk.rb: workaround for nmake.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-03-08 15:15:55 +00:00
parent 776156243c
commit c74a962aab
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> Tue Mar 8 23:49:45 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* process.c (proc_setgroups): cleanup. * process.c (proc_setgroups): cleanup.

8
ext/extmk.rb
View file

@ -576,7 +576,7 @@ end
$mflags.unshift("topdir=#$topdir") $mflags.unshift("topdir=#$topdir")
ENV.delete("RUBYOPT") ENV.delete("RUBYOPT")
if $configure_only and $command_output if $configure_only and $command_output
exts.map! {|d| "ext/#{d}"} exts.map! {|d| "ext/#{d}/"}
open($command_output, "wb") do |mf| open($command_output, "wb") do |mf|
mf.puts "V = 0" mf.puts "V = 0"
mf.puts "Q1 = $(V:1=)" mf.puts "Q1 = $(V:1=)"
@ -598,11 +598,11 @@ if $configure_only and $command_output
mf.puts mf.puts
targets = %w[all install static install-so install-rb clean distclean realclean] targets = %w[all install static install-so install-rb clean distclean realclean]
targets.each do |target| targets.each do |target|
mf.puts "#{target}: $(extensions:=/#{target})" mf.puts "#{target}: $(extensions:/=/#{target})"
end end
mf.puts mf.puts
mf.puts "all: #{rubies.join(' ')}" mf.puts "all: #{rubies.join(' ')}"
mf.puts "#{rubies.join(' ')}: $(extensions:=/all)" mf.puts "#{rubies.join(' ')}: $(extensions:/=/all)"
rubies.each do |target| rubies.each do |target|
mf.puts "#{target}:\n\t$(Q)$(MAKE) $(MFLAGS) $@" mf.puts "#{target}:\n\t$(Q)$(MAKE) $(MFLAGS) $@"
end end
@ -610,7 +610,7 @@ if $configure_only and $command_output
exec = config_string("exec") {|s| s + " "} exec = config_string("exec") {|s| s + " "}
targets.each do |target| targets.each do |target|
exts.each do |d| 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 end
end end

4
version.h
View file

@ -1,11 +1,11 @@
#define RUBY_VERSION "1.9.3" #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_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk" #define RUBY_BRANCH_NAME "trunk"
#define RUBY_RELEASE_YEAR 2011 #define RUBY_RELEASE_YEAR 2011
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3
#define RUBY_RELEASE_DAY 8 #define RUBY_RELEASE_DAY 9
#include "ruby/version.h" #include "ruby/version.h"