Kouhei Sutou
null+****@clear*****
Mon Jun 29 18:46:17 JST 2015
Kouhei Sutou 2015-06-29 18:46:17 +0900 (Mon, 29 Jun 2015) New Revision: 82e4e33ffcb034b32a7a9109e6a0b6dce189b349 https://github.com/groonga/groonga/commit/82e4e33ffcb034b32a7a9109e6a0b6dce189b349 Message: Update mruby It includes a bug fix of GC related crash. Modified files: vendor/mruby-source vendor/mruby/Makefile.am vendor/mruby/build_config.rb vendor/mruby/mruby_build.rb vendor/mruby/sources.am Modified: vendor/mruby-source (+1 -1) =================================================================== --- vendor/mruby-source 2015-06-29 18:31:40 +0900 (6246483) +++ vendor/mruby-source 2015-06-29 18:46:17 +0900 (1c2fc94) @@ -1 +1 @@ -Subproject commit 6246483f12366818e38a5cd6070f71fefe0b8b94 +Subproject commit 1c2fc94c207ab4d4a43d701e7a784fddd3328cad Modified: vendor/mruby/Makefile.am (+5 -4) =================================================================== --- vendor/mruby/Makefile.am 2015-06-29 18:31:40 +0900 (d995ccf) +++ vendor/mruby/Makefile.am 2015-06-29 18:46:17 +0900 (5af9ed9) @@ -3,10 +3,11 @@ EXTRA_DIST = \ mruby_build.rb \ mruby_build.timestamp -DEFAULT_INCLUDES = \ - -I$(srcdir)/../mruby-source/include \ - -I$(srcdir)/../mruby-source/src \ - -Imruby-io/include \ +DEFAULT_INCLUDES = \ + -I$(srcdir)/../mruby-source/include \ + -I$(srcdir)/../mruby-source/src \ + -I$(srcdir)/../mruby-source/mrbgems/mruby-compiler/core \ + -Imruby-io/include \ -I$(srcdir)/mruby-io/include CFLAGS += $(NO_FLOAT_EQUAL_CFLAGS) Modified: vendor/mruby/build_config.rb (+1 -0) =================================================================== --- vendor/mruby/build_config.rb 2015-06-29 18:31:40 +0900 (5a963f9) +++ vendor/mruby/build_config.rb 2015-06-29 18:46:17 +0900 (f487e08) @@ -12,6 +12,7 @@ MRuby::Build.new do |conf| enable_debug + conf.gem :core => "mruby-compiler" conf.gem :core => "mruby-sprintf" conf.gem :core => "mruby-print" conf.gem :core => "mruby-math" Modified: vendor/mruby/mruby_build.rb (+2 -1) =================================================================== --- vendor/mruby/mruby_build.rb 2015-06-29 18:31:40 +0900 (f0db931) +++ vendor/mruby/mruby_build.rb 2015-06-29 18:46:17 +0900 (0f4383b) @@ -28,7 +28,8 @@ end FileUtils.touch(timestamp_file) -FileUtils.cp("#{mruby_build_dir}/host/src/y.tab.c", "parse.c") +FileUtils.cp("#{mruby_build_dir}/host/mrbgems/mruby-compiler/core/y.tab.c", + "parse.c") FileUtils.cp("#{mruby_build_dir}/host/mrblib/mrblib.c", "./") File.open("mrbgems_init.c", "w") do |mrbgems_init| Modified: vendor/mruby/sources.am (+3 -3) =================================================================== --- vendor/mruby/sources.am 2015-06-29 18:31:40 +0900 (68f15c6) +++ vendor/mruby/sources.am 2015-06-29 18:46:17 +0900 (78ecc9b) @@ -2,7 +2,7 @@ libmruby_la_SOURCES = \ ../mruby-source/src/array.c \ ../mruby-source/src/backtrace.c \ ../mruby-source/src/class.c \ - ../mruby-source/src/codegen.c \ + ../mruby-source/src/codedump.c \ ../mruby-source/src/compar.c \ ../mruby-source/src/crc.c \ ../mruby-source/src/debug.c \ @@ -17,8 +17,6 @@ libmruby_la_SOURCES = \ ../mruby-source/src/init.c \ ../mruby-source/src/kernel.c \ ../mruby-source/src/load.c \ - ../mruby-source/src/mrb_throw.h \ - ../mruby-source/src/node.h \ ../mruby-source/src/numeric.c \ ../mruby-source/src/object.c \ ../mruby-source/src/opcode.h \ @@ -33,6 +31,8 @@ libmruby_la_SOURCES = \ ../mruby-source/src/variable.c \ ../mruby-source/src/version.c \ ../mruby-source/src/vm.c \ + ../mruby-source/mrbgems/mruby-compiler/core/codegen.c \ + ../mruby-source/mrbgems/mruby-compiler/core/node.h \ ../mruby-source/mrbgems/mruby-sprintf/src/kernel.c \ ../mruby-source/mrbgems/mruby-sprintf/src/sprintf.c \ ../mruby-source/mrbgems/mruby-print/src/print.c \ -------------- next part -------------- HTML����������������������������...Download