Kouhei Sutou
null+****@clear*****
Mon Jun 29 19:06:57 JST 2015
Kouhei Sutou 2015-06-29 19:06:57 +0900 (Mon, 29 Jun 2015) New Revision: 91078fe31b4824243fb112c5d5328e859b6cf5f8 https://github.com/groonga/groonga/commit/91078fe31b4824243fb112c5d5328e859b6cf5f8 Message: mrb: create mruby-compiler directory Modified files: .gitignore vendor/mruby/Makefile.am vendor/mruby/built_sources.am vendor/mruby/mruby_build.rb Modified: .gitignore (+1 -1) =================================================================== --- .gitignore 2015-06-29 18:46:17 +0900 (39a8b34) +++ .gitignore 2015-06-29 19:06:57 +0900 (7002b2a) @@ -39,9 +39,9 @@ aclocal.m4 /data/groonga-httpd.conf /data/scripts/groonga-httpd-restart /vendor/nginx-*/objs -/vendor/mruby/parse.c /vendor/mruby/mrblib.c /vendor/mruby/mrbgems_init.c +/vendor/mruby/mruby-compiler/ /vendor/mruby/mruby-onig-regexp/ /vendor/mruby/mruby-env/ /vendor/mruby/mruby-io/ Modified: vendor/mruby/Makefile.am (+1 -1) =================================================================== --- vendor/mruby/Makefile.am 2015-06-29 18:46:17 +0900 (5af9ed9) +++ vendor/mruby/Makefile.am 2015-06-29 19:06:57 +0900 (c4285c1) @@ -28,9 +28,9 @@ include sources.am include built_sources.am libmruby_la_SOURCES += $(BUILT_SOURCES) -parse.c: mruby_build.timestamp mrblib.c: mruby_build.timestamp mrbgems_init.c: mruby_build.timestamp +mruby-compiler/core/parse.c: mruby_build.timestamp mruby-onig-regexp/src/mruby_onig_regexp.c: mruby_build.timestamp mruby-env/src/env.c: mruby_build.timestamp mruby-io/include/mruby/ext/io.h: mruby_build.timestamp Modified: vendor/mruby/built_sources.am (+1 -1) =================================================================== --- vendor/mruby/built_sources.am 2015-06-29 18:46:17 +0900 (08c5e3a) +++ vendor/mruby/built_sources.am 2015-06-29 19:06:57 +0900 (73726cd) @@ -1,7 +1,7 @@ BUILT_SOURCES = \ - parse.c \ mrblib.c \ mrbgems_init.c \ + mruby-compiler/core/parse.c \ mruby-onig-regexp/src/mruby_onig_regexp.c \ mruby-env/src/env.c \ mruby-io/include/mruby/ext/io.h \ Modified: vendor/mruby/mruby_build.rb (+5 -2) =================================================================== --- vendor/mruby/mruby_build.rb 2015-06-29 18:46:17 +0900 (0f4383b) +++ vendor/mruby/mruby_build.rb 2015-06-29 19:06:57 +0900 (e2e8d68) @@ -28,8 +28,6 @@ end FileUtils.touch(timestamp_file) -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| @@ -38,6 +36,11 @@ File.open("mrbgems_init.c", "w") do |mrbgems_init| end end +mruby_compiler_dir = "#{mruby_build_dir}/host/mrbgems/mruby-compiler" +FileUtils.mkdir_p("mruby-compiler/core/") +FileUtils.cp("#{mruby_compiler_dir}/core/y.tab.c", + "mruby-compiler/core/parse.c") + mruby_onig_regexp_dir = "#{mruby_build_dir}/mrbgems/mruby-onig-regexp" FileUtils.mkdir_p("mruby-onig-regexp/") FileUtils.cp_r("#{mruby_onig_regexp_dir}/src/", "mruby-onig-regexp/") -------------- next part -------------- HTML����������������������������...Download