Kouhei Sutou
null+****@clear*****
Thu Aug 7 23:15:18 JST 2014
Kouhei Sutou 2014-08-07 23:15:18 +0900 (Thu, 07 Aug 2014) New Revision: 932d1ecf7695d41bcf7781fa5918d195f008fb2a https://github.com/groonga/groonga/commit/932d1ecf7695d41bcf7781fa5918d195f008fb2a Message: mruby: copy mruby-onig-regexp source Modified files: .gitignore vendor/mruby/Makefile.am vendor/mruby/sources.am vendor/mruby/update.rb Modified: .gitignore (+1 -0) =================================================================== --- .gitignore 2014-08-07 23:14:11 +0900 (aa505f1) +++ .gitignore 2014-08-07 23:15:18 +0900 (7d4a81c) @@ -40,6 +40,7 @@ /vendor/mruby/parse.c /vendor/mruby/mrblib.c /vendor/mruby/mrbgems_init.c +/vendor/mruby/mruby_onig_regexp.c /vendor/mruby/mruby-build.timestamp /vendor/mruby-build/ /vendor/plugins/*/ Modified: vendor/mruby/Makefile.am (+7 -1) =================================================================== --- vendor/mruby/Makefile.am 2014-08-07 23:14:11 +0900 (dc2c500) +++ vendor/mruby/Makefile.am 2014-08-07 23:15:18 +0900 (ce18336) @@ -32,6 +32,12 @@ mrbgems_init.c: mruby-build.timestamp cat $(MRUBY_BUILD_DIR)/host/mrbgems/*/gem_init.c; \ ) > $@ +BUILT_SOURCES += mruby_onig_regexp.c +libmruby_la_SOURCES += mruby_onig_regexp.c +MRUBY_ONIG_REGEXP_DIR = $(MRUBY_BUILD_DIR)/mrbgems/mruby-onig-regexp +mruby_onig_regexp.c: mruby-build.timestamp + cp $(MRUBY_ONIG_REGEXP_DIR)/src/mruby_onig_regexp.c $@ + MRUBY_CONFIG = $(abs_srcdir)/build_config.rb mruby-build.timestamp: build_config.rb rm -rf $(MRUBY_BUILD_DIR) @@ -47,4 +53,4 @@ endif update: cd "$(srcdir)/../mruby-source" && git pull --rebase cd "$(srcdir)" && \ - ./update.rb build_config.rb ../mruby-source ../mruby-build > sources.am + ./update.rb build_config.rb ../mruby-source > sources.am Modified: vendor/mruby/sources.am (+1 -2) =================================================================== --- vendor/mruby/sources.am 2014-08-07 23:14:11 +0900 (61ea750) +++ vendor/mruby/sources.am 2014-08-07 23:15:18 +0900 (b470d58) @@ -53,5 +53,4 @@ libmruby_la_SOURCES = \ ../mruby-source/mrbgems/mruby-object-ext/src/object.c \ ../mruby-source/mrbgems/mruby-objectspace/src/mruby_objectspace.c \ ../mruby-source/mrbgems/mruby-fiber/src/fiber.c \ - ../mruby-source/mrbgems/mruby-kernel-ext/src/kernel.c \ - ../mruby-build/mrbgems/mruby-onig-regexp/src/mruby_onig_regexp.c + ../mruby-source/mrbgems/mruby-kernel-ext/src/kernel.c Modified: vendor/mruby/update.rb (+6 -13) =================================================================== --- vendor/mruby/update.rb 2014-08-07 23:14:11 +0900 (514ed96) +++ vendor/mruby/update.rb 2014-08-07 23:15:18 +0900 (888c3d3) @@ -1,7 +1,7 @@ #!/usr/bin/env ruby -if ARGV.size != 3 - puts("Usage: #{$0} BUILD_COFNIG.RB MRUBY_SOURCE_DIR MRUBY_BUILD_DIR") +if ARGV.size != 2 + puts("Usage: #{$0} BUILD_COFNIG.RB MRUBY_SOURCE_DIR") exit(false) end @@ -9,7 +9,6 @@ require "find" build_config_rb = ARGV.shift mruby_source_dir = ARGV.shift -mruby_build_dir = ARGV.shift module MRuby class Build @@ -18,10 +17,6 @@ module MRuby @@source_dir = dir end - def build_dir=(dir) - @@build_dir = dir - end - def latest @@latest end @@ -30,16 +25,15 @@ module MRuby attr_reader :config def initialize(&block) @@latest = self - @config = Config.new(@@source_dir, @@build_dir) + @config = Config.new(@@source_dir) @config.instance_eval(&block) end end class Config attr_reader :gem_dirs - def initialize(source_dir, build_dir) + def initialize(source_dir) @source_dir = source_dir - @build_dir = build_dir @gem_dirs = [] end @@ -54,6 +48,7 @@ module MRuby def gem(gem_dir) if gem_dir.is_a?(Hash) gem_dir = load_special_path_gem(gem_dir) + return if gem_dir.nil? end @gem_dirs << gem_dir end @@ -63,8 +58,7 @@ module MRuby if params[:core] "#{@source_dir}/mrbgems/#{params[:core]}" elsif params[:github] - owner, repository = params[:github].split("/", 2) - "#{@build_dir}/mrbgems/#{repository}" + nil else raise "Unsupported gem options: #{params.inspect}" end @@ -73,7 +67,6 @@ module MRuby end MRuby::Build.source_dir = mruby_source_dir -MRuby::Build.build_dir = mruby_build_dir load build_config_rb build = MRuby::Build.latest -------------- next part -------------- HTML����������������������������...Download