diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-30 21:50:40 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-30 21:50:40 +0000 |
| commit | 3729e62609891a10f3c2aca15aa7d65eff89a450 (patch) | |
| tree | 1d1cfc1a715176496e26298478b1d7a594b392fb | |
| parent | f0d305182fbd95a1b6f191f8ed330e37a70d1209 (diff) | |
* trunk/common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross
compiling.
* configure.in, {win,bcc}32/Makefile.sub (MINIRUBY): -I$(srcdir)/lib
moved.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@14807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 2 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | version.h | 6 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
6 files changed, 15 insertions, 7 deletions
@@ -1,3 +1,11 @@ +Mon Dec 31 06:50:38 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * trunk/common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross + compiling. + + * configure.in, {win,bcc}32/Makefile.sub (MINIRUBY): -I$(srcdir)/lib + moved. + Sun Dec 30 22:48:37 2007 Tadayoshi Funaba <tadf@dotrb.org> * lib/date.rb (_valid_time?): I'm not sure to recommend such an diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index cbdff389a2..d3eebc8cb2 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -157,7 +157,7 @@ EXEEXT = .exe PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT) RUBYDEF = $(RUBY_SO_NAME).def -MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT) +MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT) RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" -- ORGLIBPATH = $(LIB) @@ -294,7 +294,7 @@ test-all: $(RUNRUBY) "$(srcdir)/test/runner.rb" --basedir="$(TESTSDIR)" --runner=$(TESTUI) $(TESTS) extconf: - $(MINIRUBY) -I$(srcdir)/lib -run -e mkdir -- -p "$(EXTCONFDIR)" + $(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)" $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS) $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP) diff --git a/configure.in b/configure.in index 8502b523b5..a00456ab35 100644 --- a/configure.in +++ b/configure.in @@ -1313,7 +1313,7 @@ if test x"$cross_compiling" = xyes; then PREP=fake.rb RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`' else - MINIRUBY='./miniruby$(EXEEXT)' + MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib' PREP='miniruby$(EXEEXT)' RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)' fi @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-12-27" +#define RUBY_RELEASE_DATE "2007-12-31" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20071227 +#define RUBY_RELEASE_CODE 20071231 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 27 +#define RUBY_RELEASE_DAY 31 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 6a0840308b..546a17d686 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -166,7 +166,7 @@ EXEEXT = .exe PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT) RUBYDEF = $(RUBY_SO_NAME).def -MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT) +MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT) RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" -- !if !defined(STACK) |