ruby-changes:15345
From: nobu <ko1@a...>
Date: Tue, 6 Apr 2010 11:22:07 +0900 (JST)
Subject: [ruby-changes:15345] Ruby:r27234 (trunk): * template/fake.rb.in: hooks for extconf.rb.
nobu 2010-04-06 11:21:40 +0900 (Tue, 06 Apr 2010) New Revision: 27234 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27234 Log: * template/fake.rb.in: hooks for extconf.rb. Modified files: trunk/ChangeLog trunk/Makefile.in trunk/template/fake.rb.in Index: ChangeLog =================================================================== --- ChangeLog (revision 27233) +++ ChangeLog (revision 27234) @@ -1,3 +1,7 @@ +Tue Apr 6 11:21:23 2010 Nobuyoshi Nakada <nobu@r...> + + * template/fake.rb.in: hooks for extconf.rb. + Tue Apr 6 06:19:36 2010 NARUSE, Yui <naruse@r...> * lib/rexml/text.rb (REXML::Text.check): comment out Index: Makefile.in =================================================================== --- Makefile.in (revision 27233) +++ Makefile.in (revision 27234) @@ -163,8 +163,9 @@ $(LIBRUBY_ALIASES) || true fake: $(arch)-fake.rb -$(arch)-fake.rb: config.status +$(arch)-fake.rb: config.status $(srcdir)/template/fake.rb.in @./config.status --file=$@:$(srcdir)/template/fake.rb.in + @chmod +x $@ Makefile: $(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in Index: template/fake.rb.in =================================================================== --- template/fake.rb.in (revision 27233) +++ template/fake.rb.in (revision 27234) @@ -1,3 +1,6 @@ +baseruby="@BASERUBY@" +ruby="${RUBY-$baseruby}" +"eval" "{ `expr \"$ruby\" : echo > /dev/null || echo exec` $ruby "'-r"`expr \"$0\" : / > /dev/null || pwd`/${0#/}" "$@";' "}" || "exit" "$?" class Object CROSS_COMPILING = RUBY_PLATFORM remove_const :RUBY_PLATFORM @@ -13,3 +16,24 @@ ALT_SEPARATOR = "\\" end end + +$:.unshift(File.expand_path("..", __FILE__)) +prehook = proc do + config = RbConfig::CONFIG + mkconfig = RbConfig::MAKEFILE_CONFIG + mkconfig["top_srcdir"] = $top_srcdir = File.expand_path("@abs_top_srcdir@") + $extout = File.expand_path(mkconfig["EXTOUT"], mkconfig["topdir"]) + mkconfig["extout"] = config["extout"] = $extout + mkconfig["rubyhdrdir"] = "$(top_srcdir)/include" + config["rubyhdrdir"] = File.join(mkconfig["top_srcdir"], "include") + mkconfig["libdir"] = config["libdir"] = mkconfig["topdir"] + mkconfig["archdir"] = config["archdir"] = File.expand_path(File.dirname(__FILE__)) + untrace_var(:$extmk, prehook) +end +trace_var(:$extmk, prehook) +posthook = proc do + $ruby = baseruby + $arch_hdrdir = "$(extout)/include/$(arch)" + untrace_var(:$ruby, posthook) +end +trace_var(:$ruby, posthook) Property changes on: template/fake.rb.in ___________________________________________________________________ Name: svn:executable + * -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/