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

merge revision(s) 49758,50356,50359: [Backport #12563]

Browse source 
fake.rb: rubyarchhdrdir for rubyspec

	* common.mk (test-rubyspec): use fake script to set header
  directories.

	* template/fake.rb.in (RUBYOPT): set -r option to propagate to
  forked processes.

	* tool/fake.rb (prehook): set rubyarchhdrdir too.
	* too/fake.rb: don't fake libdir.  use libdirname instead.

	* tool/fake.rb: don't fake libdir.  use libdirname instead.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-07-11 15:17:58 +00:00
parent 3d36516d3a
commit f54265a8eb
5 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Jul 12 00:17:36 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* tool/fake.rb: don't fake libdir. use libdirname instead.
Thu Jul 7 00:05:00 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* bignum.c (Init_Bignum): revert a part of previous commit (r55598),

4
common.mk
View file

@ -584,8 +584,8 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP
test-rubyspec-precheck:
test-rubyspec: test-rubyspec-precheck
$(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
test-rubyspec: test-rubyspec-precheck $(arch)-fake.rb
$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY

2
template/fake.rb.in
View file

@ -1,5 +1,6 @@
baseruby="@BASERUBY@"
ruby="${RUBY-$baseruby}"
baseruby=
"eval" "{" \
"`expr \"$ruby\" : echo > /dev/null || echo exec`" \
"$ruby" '-r"`expr \"$0\" : / > /dev/null || pwd`/${0#/}" "$@";' \
@ -26,3 +27,4 @@ end
$:.unshift(File.expand_path(builddir))
fake = File.join(top_srcdir, "tool/fake.rb")
eval(File.read(fake), nil, fake)
ENV["RUBYOPT"] = ["-r#{__FILE__}", ENV["RUBYOPT"]].compact.join(" ")

4
tool/fake.rb
View file

@ -20,9 +20,11 @@ prehook = proc do |extmk|
mkconfig = RbConfig::MAKEFILE_CONFIG
mkconfig["top_srcdir"] = $top_srcdir = top_srcdir
mkconfig["rubyhdrdir"] = "$(top_srcdir)/include"
mkconfig["rubyarchhdrdir"] = "$(builddir)/$(EXTOUT)/include/$(arch)"
mkconfig["builddir"] = config["builddir"] = builddir
config["rubyhdrdir"] = File.join(mkconfig["top_srcdir"], "include")
mkconfig["libdir"] = config["libdir"] = mkconfig["topdir"]
config["rubyarchhdrdir"] = File.join(builddir, config["EXTOUT"], "include", config["arch"])
mkconfig["libdirname"] = "builddir"
trace_var(:$ruby, posthook)
end
untrace_var(:$extmk, prehook)

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.2.6"
#define RUBY_RELEASE_DATE "2016-07-11"
#define RUBY_PATCHLEVEL 343
#define RUBY_RELEASE_DATE "2016-07-12"
#define RUBY_PATCHLEVEL 344
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 11
#define RUBY_RELEASE_DAY 12
#include "ruby/version.h"