diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | common.mk | 8 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rwxr-xr-x | tool/instruby.rb (renamed from instruby.rb) | 2 | ||||
| -rwxr-xr-x | tool/mkconfig.rb (renamed from mkconfig.rb) | 2 | ||||
| -rwxr-xr-x | tool/rubytest.rb (renamed from rubytest.rb) | 2 | ||||
| -rwxr-xr-x | tool/runruby.rb (renamed from runruby.rb) | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
8 files changed, 26 insertions, 10 deletions
@@ -1,3 +1,19 @@ +Fri May 22 20:10:18 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * instruby.rb: moved into tool/. + + * mkconfig.rb: ditto. + + * rubytest.rb: ditto. + + * runruby.rb: ditto. + + * common.mk: follows the moves. + + * configure.in: ditto. + + * win32/Makefile.sub: ditto. + Fri May 22 05:09:43 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * array.c (rb_ary_slice_bang): avoid call of rb_scan_args() unless @@ -103,7 +103,7 @@ SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \ --make-flags="$(MAKEFLAGS)" EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \ --make-flags="MINIRUBY='$(MINIRUBY)'" -- -INSTRUBY = $(MINIRUBY) $(srcdir)/instruby.rb +INSTRUBY = $(MINIRUBY) $(srcdir)/tool/instruby.rb INSTRUBY_ARGS = $(SCRIPT_ARGS) \ --data-mode=$(INSTALL_DATA_MODE) \ --prog-mode=$(INSTALL_PROG_MODE) \ @@ -396,7 +396,7 @@ btest-ruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY @$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q $(OPTS) test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY - @$(RUNRUBY) $(srcdir)/rubytest.rb + @$(RUNRUBY) $(srcdir)/tool/rubytest.rb test-knownbug: miniruby$(EXEEXT) $(PROGRAM) $(RBCONFIG) PHONY $(MINIRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb @@ -410,8 +410,8 @@ extconf: $(PREP) $(MAKEDIRS) "$(EXTCONFDIR)" $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS) -$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP) - @$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \ +$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(PREP) + @$(MINIRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \ -install_name=$(RUBY_INSTALL_NAME) \ -so_name=$(RUBY_SO_NAME) rbconfig.rb diff --git a/configure.in b/configure.in index 3680a2d107..baa0930a55 100644 --- a/configure.in +++ b/configure.in @@ -1911,7 +1911,7 @@ else MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib' MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb' PREP='miniruby$(EXEEXT)' - RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)' + RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)' fi AC_SUBST(MINIRUBY) AC_SUBST(PREP) diff --git a/instruby.rb b/tool/instruby.rb index 20ce449214..601c23675a 100755 --- a/instruby.rb +++ b/tool/instruby.rb @@ -4,7 +4,7 @@ load "./rbconfig.rb" include RbConfig $".unshift File.expand_path("./rbconfig.rb") -srcdir = File.dirname(__FILE__) +srcdir = File.expand_path('..', File.dirname(__FILE__)) unless defined?(CROSS_COMPILING) and CROSS_COMPILING $:.replace([File.expand_path("lib", srcdir), Dir.pwd]) end diff --git a/mkconfig.rb b/tool/mkconfig.rb index 393a1b9ef5..d725fe0929 100755 --- a/mkconfig.rb +++ b/tool/mkconfig.rb @@ -4,7 +4,7 @@ $install_name ||= nil $so_name ||= nil -srcdir = File.dirname(__FILE__) +srcdir = File.expand_path('..', File.dirname(__FILE__)) $:.replace [srcdir+"/lib"] unless defined?(CROSS_COMPILING) $:.unshift(".") diff --git a/rubytest.rb b/tool/rubytest.rb index ef23d64b54..e546800279 100755 --- a/rubytest.rb +++ b/tool/rubytest.rb @@ -15,7 +15,7 @@ end $stderr.reopen($stdout) error = '' -srcdir = File.dirname(__FILE__) +srcdir = File.expand_path('..', File.dirname(__FILE__)) `#{ruby} #{srcdir}/sample/test.rb`.each_line do |line| if line =~ /^end of test/ print "\ntest succeeded\n" diff --git a/runruby.rb b/tool/runruby.rb index a72cc653bc..d24b748c96 100755 --- a/runruby.rb +++ b/tool/runruby.rb @@ -33,7 +33,7 @@ while arg = ARGV[0] ARGV.shift end -srcdir ||= File.dirname(__FILE__) +srcdir ||= File.expand_path('..', File.dirname(__FILE__)) archdir ||= '.' abs_archdir = File.expand_path(archdir) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 5e375a134d..c9b245508d 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -232,7 +232,7 @@ MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)" !endif MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT) -RUNRUBY = $(RUNRUBY) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) -- +RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) -- !ifndef RUBY RUBY = ruby !endif |