1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* template/fake.rb.in: extracted from Makefile.in.

Browse Source 
* configure.in (fake.rb): prefixed with $(arch)-.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-02-19 06:47:13 +00:00
parent 3e1394f36f
commit 7c76900458
4 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Feb 19 15:47:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* template/fake.rb.in: extracted from Makefile.in.
* configure.in (fake.rb): prefixed with $(arch)-.
Thu Feb 19 15:39:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Feb 19 15:39:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): OCSP_basic_verify * ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): OCSP_basic_verify

20
Makefile.in
View File

@ -26,6 +26,7 @@ datadir = @datadir@
arch = @arch@ arch = @arch@
sitearch = @sitearch@ sitearch = @sitearch@
sitedir = @sitedir@ sitedir = @sitedir@
ruby_version = @ruby_version@
TESTUI = console TESTUI = console
TESTS = TESTS =
@ -149,22 +150,9 @@ $(LIBRUBY_SO):
File.symlink "$(LIBRUBY_SO)", link}' \ File.symlink "$(LIBRUBY_SO)", link}' \
$(LIBRUBY_ALIASES) || true $(LIBRUBY_ALIASES) || true
fake.rb: Makefile fake: $(arch)-fake.rb
@echo ' \ $(arch)-fake.rb: config.status
class Object; \ @./config.status --file=$@:$(srcdir)/template/fake.rb.in
CROSS_COMPILING = RUBY_PLATFORM; \
remove_const :RUBY_PLATFORM; \
remove_const :RUBY_VERSION; \
RUBY_PLATFORM = "@arch@"; \
RUBY_VERSION = "@MAJOR@.@MINOR@.@TEENY@"; \
end; \
if RUBY_PLATFORM =~ /mswin|bccwin|mingw/; \
class File; \
remove_const :ALT_SEPARATOR; \
ALT_SEPARATOR = "\\"; \
end; \
end; \
' > $@
Makefile: $(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in Makefile: $(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in

2
configure.in
View File

@ -1730,7 +1730,7 @@ fi
if test x"$cross_compiling" = xyes; then if test x"$cross_compiling" = xyes; then
test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` -rfake" test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` -rfake"
PREP=fake.rb PREP='$(arch)-fake.rb'
RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`' RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
else else
MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib' MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'

15
template/fake.rb.in Normal file
View File

@ -0,0 +1,15 @@
class Object
CROSS_COMPILING = RUBY_PLATFORM
remove_const :RUBY_PLATFORM
remove_const :RUBY_VERSION
remove_const :RUBY_DESCRIPTION if defined?(RUBY_DESCRIPTION)
RUBY_PLATFORM = "@arch@"
RUBY_VERSION = "@MAJOR@.@MINOR@.@TEENY@"
RUBY_DESCRIPTION = "ruby #{RUBY_VERSION} (#{Time.now.strftime("%Y-%m-%d")}) [#{RUBY_PLATFORM}]"
end
if RUBY_PLATFORM =~ /mswin|bccwin|mingw/
class File
remove_const :ALT_SEPARATOR
ALT_SEPARATOR = "\\"
end
end