Skip to content

Commit

Permalink
* common.mk (prelude.c): depends on enc/prelude.rb.
Browse files Browse the repository at this point in the history
* enc/prelude.rb: fixed initial library names.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Apr 8, 2008
1 parent 2d9e9c3 commit 7dc2650
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
@@ -1,3 +1,9 @@
Tue Apr 8 10:30:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>

* common.mk (prelude.c): depends on enc/prelude.rb.

* enc/prelude.rb: fixed initial library names.

Tue Apr 8 03:39:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>

* load.c (rb_provided): check expanded path for relative path
Expand Down
8 changes: 5 additions & 3 deletions common.mk
Expand Up @@ -85,6 +85,9 @@ OBJS = dln.$(OBJEXT) \

GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)

PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb
PRELUDES = prelude.c miniprelude.c golf_prelude.c

SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \
--extout="$(EXTOUT)" \
--mflags="$(MFLAGS)" \
Expand Down Expand Up @@ -734,9 +737,9 @@ transdb.h: $(PREP)
miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@

prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $(RBCONFIG) $(PREP)
prelude.c: $(srcdir)/tool/compile_prelude.rb $(PRELUDE_SCRIPTS) $(RBCONFIG) $(PREP)
$(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb \
$(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb $@.new
$(PRELUDE_SCRIPTS) $@.new
$(IFCHANGE) "$@" "$@.new"

golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP)
Expand All @@ -747,7 +750,6 @@ prereq: incs srcs preludes

preludes: {$(VPATH)}miniprelude.c
preludes: {$(srcdir)}golf_prelude.c
PRELUDES = prelude.c miniprelude.c golf_prelude.c

docs:
$(BASERUBY) -I$(srcdir) $(srcdir)/tool/makedocs.rb $(INSNS2VMOPT)
Expand Down
2 changes: 1 addition & 1 deletion enc/prelude.rb
@@ -1,4 +1,4 @@
%w'enc/init enc/trans/init'.each do |init|
%w'enc/encdb enc/trans/transdb'.each do |init|
begin
require(init)
rescue LoadError
Expand Down

0 comments on commit 7dc2650

Please sign in to comment.