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

* Makefile.in, common.mk (fake, yes-fake, no-make): these dependecies

Browse Source 
are not platform dependent.

* win32/Makefile.sub ($(arch)-fake.rb): workaround.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2013-01-07 06:23:15 +00:00
parent 8f1be27017
commit 6e4b187bfe
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Mon Jan 7 15:21:48 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* Makefile.in, common.mk (fake, yes-fake, no-make): these dependecies
are not platform dependent.
* win32/Makefile.sub ($(arch)-fake.rb): workaround.
Mon Jan 7 12:09:24 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Jan 7 12:09:24 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_insnhelper.c (vm_callee_setup_arg_complex, vm_yield_setup_block_args): * vm_insnhelper.c (vm_callee_setup_arg_complex, vm_yield_setup_block_args):

3
Makefile.in
View File

@ -223,9 +223,6 @@ $(LIBRUBY_SO):
@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \ @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
File.symlink "$(LIBRUBY_SO)", link}' \ File.symlink "$(LIBRUBY_SO)", link}' \
$(LIBRUBY_ALIASES) || true $(LIBRUBY_ALIASES) || true
fake: $(CROSS_COMPILING)-fake
yes-fake: $(arch)-fake.rb $(RBCONFIG) PHONY
no-fake: PHONY
$(arch)-fake.rb: config.status $(srcdir)/template/fake.rb.in $(arch)-fake.rb: config.status $(srcdir)/template/fake.rb.in
@./config.status --file=$@:$(srcdir)/template/fake.rb.in @./config.status --file=$@:$(srcdir)/template/fake.rb.in
@chmod +x $@ @chmod +x $@

4
common.mk
View File

@ -474,6 +474,10 @@ check: main test test-all
$(ECHO) check succeeded $(ECHO) check succeeded
check-ruby: test test-ruby check-ruby: test test-ruby
fake: $(CROSS_COMPILING)-fake
yes-fake: $(arch)-fake.rb $(RBCONFIG) PHONY
no-fake: PHONY
btest: $(TEST_RUNNABLE)-btest btest: $(TEST_RUNNABLE)-btest
no-btest: PHONY no-btest: PHONY
yes-btest: fake miniruby$(EXEEXT) PHONY yes-btest: fake miniruby$(EXEEXT) PHONY

14
win32/Makefile.sub
View File

@ -13,7 +13,7 @@ MFLAGS=-l
!endif !endif
!ifndef CROSS_COMPILING !ifndef CROSS_COMPILING
CROSS_COMPILING = 0 CROSS_COMPILING = no
!endif !endif
!ifndef LARGEFILE_SUPPORT !ifndef LARGEFILE_SUPPORT
LARGEFILE_SUPPORT = 1 LARGEFILE_SUPPORT = 1
@ -269,8 +269,8 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT) WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
!endif !endif
RUBYDEF = $(RUBY_SO_NAME).def RUBYDEF = $(RUBY_SO_NAME).def
!if $(CROSS_COMPILING) !if "$(CROSS_COMPILING)" == "yes"
MINIRUBY = $(RUBY) -I$(MAKEDIR) -rfake MINIRUBY = $(RUBY) -I$(MAKEDIR) -r$(arch)-fake
RUNRUBY = $(MINIRUBY) RUNRUBY = $(MINIRUBY)
!else !else
MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib -I. MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib -I.
@ -278,7 +278,7 @@ RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)" -I.
!endif !endif
MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT) MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT)
RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) -- $(RUN_OPTS) RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) -- $(RUN_OPTS)
!if $(CROSS_COMPILING) !if "$(CROSS_COMPILING)" == "yes"
XRUBY = $(MINIRUBY) XRUBY = $(MINIRUBY)
!else !else
XRUBY = $(RUNRUBY) XRUBY = $(RUNRUBY)
@ -317,8 +317,8 @@ LIBRUBY_RELATIVE = yes
THREAD_MODEL = win32 THREAD_MODEL = win32
!if $(CROSS_COMPILING) !if "$(CROSS_COMPILING)" == "yes"
PREP = fake.rb PREP = $(arch)-fake.rb
!else !else
PREP = miniruby$(EXEEXT) PREP = miniruby$(EXEEXT)
!endif !endif
@ -984,7 +984,7 @@ $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
-so_name=$(RUBY_SO_NAME) \ -so_name=$(RUBY_SO_NAME) \
. $(icondirs) $(win_srcdir) . $(icondirs) $(win_srcdir)
fake.rb: $(MKFILES) $(arch)-fake.rb: $(MKFILES)
@echo Creating <<$@ @echo Creating <<$@
class Object class Object
CROSS_COMPILING = RUBY_PLATFORM CROSS_COMPILING = RUBY_PLATFORM