Kouhei Sutou
null+****@clear*****
Wed Dec 17 11:49:35 JST 2014
Kouhei Sutou 2014-12-17 11:49:35 +0900 (Wed, 17 Dec 2014) New Revision: 51edf984c7d17222d665429e5f2afde63465abb1 https://github.com/groonga/groonga/commit/51edf984c7d17222d665429e5f2afde63465abb1 Message: mrb: use mruby-io Modified files: .gitignore vendor/mruby/Makefile.am vendor/mruby/build_config.rb Modified: .gitignore (+2 -1) =================================================================== --- .gitignore 2014-12-17 11:35:16 +0900 (0467e77) +++ .gitignore 2014-12-17 11:49:35 +0900 (e575346) @@ -40,7 +40,8 @@ aclocal.m4 /vendor/mruby/parse.c /vendor/mruby/mrblib.c /vendor/mruby/mrbgems_init.c -/vendor/mruby/mruby_onig_regexp.c +/vendor/mruby/mruby-onig-regexp/ +/vendor/mruby/mruby-io/ /vendor/mruby/mruby-build.timestamp /vendor/mruby-build/ /vendor/plugins/*/ Modified: vendor/mruby/Makefile.am (+23 -5) =================================================================== --- vendor/mruby/Makefile.am 2014-12-17 11:35:16 +0900 (41385bc) +++ vendor/mruby/Makefile.am 2014-12-17 11:49:35 +0900 (8546186) @@ -3,7 +3,8 @@ EXTRA_DIST = \ DEFAULT_INCLUDES = \ -I$(srcdir)/../mruby-source/include \ - -I$(srcdir)/../mruby-source/src + -I$(srcdir)/../mruby-source/src \ + -I$(srcdir)/mruby-io/include if WITH_MRUBY noinst_LTLIBRARIES = libmruby.la @@ -22,18 +23,31 @@ include sources.am BUILT_SOURCES = \ parse.c \ mrblib.c \ - mrbgems_init.c \ - mruby_onig_regexp.c + mrbgems_init.c +BUILT_SOURCES += \ + mruby-onig-regexp/src/mruby_onig_regexp.c +BUILT_SOURCES += \ + mruby-io/include/mruby/ext/io.h \ + mruby-io/src/file.c \ + mruby-io/src/file_test.c \ + mruby-io/src/io.c \ + mruby-io/src/mruby_io_gem.c libmruby_la_SOURCES += $(BUILT_SOURCES) parse.c: mruby-build.timestamp mrblib.c: mruby-build.timestamp mrbgems_init.c: mruby-build.timestamp -mruby_onig_regexp.c: mruby-build.timestamp +mruby-onig-regexp/src/mruby_onig_regexp.c: mruby-build.timestamp +mruby-io/include/mruby/ext/io.h: mruby-build.timestamp +mruby-io/src/file.c: mruby-build.timestamp +mruby-io/src/file_test.c: mruby-build.timestamp +mruby-io/src/io.c: mruby-build.timestamp +mruby-io/src/mruby_io_gem.c: mruby-build.timestamp MRUBY_CONFIG = $(abs_srcdir)/build_config.rb MRUBY_BUILD_DIR = $(abs_top_builddir)/vendor/mruby-build MRUBY_ONIG_REGEXP_DIR = $(MRUBY_BUILD_DIR)/mrbgems/mruby-onig-regexp +MRUBY_IO_DIR = $(MRUBY_BUILD_DIR)/mrbgems/mruby-io mruby-build.timestamp: build_config.rb rm -rf $(MRUBY_BUILD_DIR) cd $(srcdir)/../mruby-source && \ @@ -47,7 +61,11 @@ mruby-build.timestamp: build_config.rb cat $(MRUBY_BUILD_DIR)/host/mrbgems/gem_init.c; \ cat $(MRUBY_BUILD_DIR)/host/mrbgems/*/gem_init.c; \ ) > mrbgems_init.c - cp $(MRUBY_ONIG_REGEXP_DIR)/src/mruby_onig_regexp.c ./ + $(MKDIR_P) mruby-onig-regexp/ + cp -r $(MRUBY_ONIG_REGEXP_DIR)/src/ mruby-onig-regexp/ + $(MKDIR_P) mruby-io/ + cp -r $(MRUBY_IO_DIR)/include/ mruby-io/ + cp -r $(MRUBY_IO_DIR)/src/ mruby-io/ EXTRA_DIST += \ mruby-build.timestamp Modified: vendor/mruby/build_config.rb (+1 -0) =================================================================== --- vendor/mruby/build_config.rb 2014-12-17 11:35:16 +0900 (e2128a4) +++ vendor/mruby/build_config.rb 2014-12-17 11:49:35 +0900 (d94cced) @@ -30,5 +30,6 @@ MRuby::Build.new do |conf| conf.gem :core => "mruby-kernel-ext" conf.gem :github => "mattn/mruby-onig-regexp" + conf.gem :github => "iij/mruby-io" conf.gem :github => "kou/mruby-pp" end -------------- next part -------------- HTML����������������������������...Download
