summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-28 00:43:30 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-28 00:43:30 +0000
commit067071c01640bfc54b81b185195b0a548661397f (patch)
treea5f21433f08c508c0bf3e70b6e6786720d583cdd
parent22fef20d1f054df1c97c4c366d95b4ef8cea082b (diff)
merged r19970-r19971 from trunk into ruby_1_9_1.
* 2008-10-28 * win32/Makefile.sub (RUNRUBY): now ruby requires something from gem_prelude, so need to set library path. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@19972 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--version.h6
-rw-r--r--win32/Makefile.sub2
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 07853e6d9c..332d703609 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 28 09:19:40 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (RUNRUBY): now ruby requires something from
+ gem_prelude, so need to set library path.
+
Mon Oct 27 22:29:11 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* vm_insnhelper.c (vm_yield_setup_args): supports optional parameters.
diff --git a/version.h b/version.h
index 7fad935d69..27848f399b 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-10-27"
+#define RUBY_RELEASE_DATE "2008-10-28"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20081027
+#define RUBY_RELEASE_CODE 20081028
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DAY 28
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 583c1910a5..20763633dd 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -214,7 +214,7 @@ MINIRUBY = $(RUBY) -I$(MAKEDIR) -rfake
RUNRUBY = $(MINIRUBY)
!else
MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib
-RUNRUBY = .\$(PROGRAM) -I"$(EXTOUT)/$(arch)"
+RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)"
!endif
MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT)
RUNRUBY = $(RUNRUBY) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --