ruby-changes:18237
From: yugui <ko1@a...>
Date: Mon, 20 Dec 2010 22:30:15 +0900 (JST)
Subject: [ruby-changes:18237] Ruby:r30260 (ruby_1_9_2): merges r29840 from trunk into ruby_1_9_2.
yugui 2010-12-20 22:22:43 +0900 (Mon, 20 Dec 2010) New Revision: 30260 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30260 Log: merges r29840 from trunk into ruby_1_9_2. -- add dependency(insns.inc) to compile.obj Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/common.mk branches/ruby_1_9_2/version.h Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 30259) +++ ruby_1_9_2/ChangeLog (revision 30260) @@ -1,3 +1,7 @@ +Sat Nov 20 01:57:55 2010 Akio Tajima <artonx@y...> + + * common.mk: add dependency(insns.inc) to compile.obj + Thu Nov 18 00:02:17 2010 James Edward Gray II <jeg2@r...> * lib/csv.rb: Upgrading output encoding with ASCII content Index: ruby_1_9_2/common.mk =================================================================== --- ruby_1_9_2/common.mk (revision 30259) +++ ruby_1_9_2/common.mk (revision 30260) @@ -643,7 +643,7 @@ compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \ $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \ {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc {$(VPATH)}debug.h \ - {$(VPATH)}optunifs.inc {$(VPATH)}opt_sc.inc + {$(VPATH)}optunifs.inc {$(VPATH)}opt_sc.inc {$(VPATH)}insns.inc iseq.$(OBJEXT): {$(VPATH)}iseq.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \ $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \ {$(VPATH)}insns_info.inc {$(VPATH)}node_name.inc {$(VPATH)}debug.h Index: ruby_1_9_2/version.h =================================================================== --- ruby_1_9_2/version.h (revision 30259) +++ ruby_1_9_2/version.h (revision 30260) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 100 +#define RUBY_PATCHLEVEL 101 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/