Kouhei Sutou
null+****@clear*****
Thu Aug 7 22:34:57 JST 2014
Kouhei Sutou 2014-08-07 22:34:57 +0900 (Thu, 07 Aug 2014) New Revision: 6a5dbcac1297b8aa297f3cf1c2f74093664bcd0e https://github.com/groonga/groonga/commit/6a5dbcac1297b8aa297f3cf1c2f74093664bcd0e Message: mruby: use mruby-onig-regexp It requires Onigruma. We bundle Onigmo instead of Oniguruma. Added files: vendor/onigmo-source Modified files: .gitmodules configure.ac vendor/Makefile.am vendor/mruby/Makefile.am vendor/mruby/build_config.rb vendor/mruby/sources.am vendor/mruby/update.rb Modified: .gitmodules (+3 -0) =================================================================== --- .gitmodules 2014-08-07 12:24:43 +0900 (cdbf702) +++ .gitmodules 2014-08-07 22:34:57 +0900 (3ea587a) @@ -1,3 +1,6 @@ [submodule "vendor/mruby-source"] path = vendor/mruby-source url = https://github.com/mruby/mruby.git +[submodule "vendor/onigmo-source"] + path = vendor/onigmo-source + url = https://github.com/k-takata/Onigmo.git Modified: configure.ac (+2 -0) =================================================================== --- configure.ac 2014-08-07 12:24:43 +0900 (ea96a1a) +++ configure.ac 2014-08-07 22:34:57 +0900 (4f2d3d9) @@ -1348,6 +1348,8 @@ if test "$enable_mruby" = "yes"; then AC_DEFINE(GRN_WITH_MRUBY, [1], [Define to 1 if mruby is enabled.]) MRUBY_CFLAGS="-I\$(top_srcdir)/vendor/mruby-source/include" MRUBY_LIBS="\$(top_builddir)/vendor/mruby/libmruby.la" + MRUBY_LIBS="${MRUBY_LIBS} \$(top_builddir)/vendor/onigmo-source/libonig.la" + AC_CONFIG_SUBDIRS([vendor/onigmo-source]) else MRUBY_CFLAGS= MRUBY_LIBS= Modified: vendor/Makefile.am (+9 -1) =================================================================== --- vendor/Makefile.am 2014-08-07 12:24:43 +0900 (c8e92b8) +++ vendor/Makefile.am 2014-08-07 22:34:57 +0900 (0644a63) @@ -1,6 +1,12 @@ NGINX_DIR = nginx-$(NGINX_VERSION) -SUBDIRS = mruby +SUBDIRS = +if WITH_MRUBY +SUBDIRS += onigmo-source +endif + +SUBDIRS = \ + mruby EXTRA_DIST = \ $(NGINX_DIR) \ @@ -11,3 +17,5 @@ EXTRA_DIST = \ dist-hook: GIT_DIR=$(srcdir)/mruby-source/.git git archive --format=tar HEAD | \ tar xf - -C $(distdir)/mruby-source + GIT_DIR=$(srcdir)/onigmo-source/.git git archive --format=tar HEAD | \ + tar xf - -C $(distdir)/onigmo-source Modified: vendor/mruby/Makefile.am (+4 -1) =================================================================== --- vendor/mruby/Makefile.am 2014-08-07 12:24:43 +0900 (d619bd9) +++ vendor/mruby/Makefile.am 2014-08-07 22:34:57 +0900 (dc2c500) @@ -5,6 +5,9 @@ DEFAULT_INCLUDES = \ if WITH_MRUBY noinst_LTLIBRARIES = libmruby.la +AM_CFLAGS = \ + -I$(srcdir)/../onigmo-source + include sources.am BUILT_SOURCES = @@ -44,4 +47,4 @@ endif update: cd "$(srcdir)/../mruby-source" && git pull --rebase cd "$(srcdir)" && \ - ./update.rb build_config.rb ../mruby-source > sources.am + ./update.rb build_config.rb ../mruby-source ../mruby-build > sources.am Modified: vendor/mruby/build_config.rb (+2 -0) =================================================================== --- vendor/mruby/build_config.rb 2014-08-07 12:24:43 +0900 (c427512) +++ vendor/mruby/build_config.rb 2014-08-07 22:34:57 +0900 (2380c04) @@ -28,4 +28,6 @@ MRuby::Build.new do |conf| conf.gem :core => "mruby-enum-lazy" conf.gem :core => "mruby-toplevel-ext" conf.gem :core => "mruby-kernel-ext" + + conf.gem :github => "mattn/mruby-onig-regexp" end Modified: vendor/mruby/sources.am (+2 -1) =================================================================== --- vendor/mruby/sources.am 2014-08-07 12:24:43 +0900 (b470d58) +++ vendor/mruby/sources.am 2014-08-07 22:34:57 +0900 (61ea750) @@ -53,4 +53,5 @@ 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-source/mrbgems/mruby-kernel-ext/src/kernel.c \ + ../mruby-build/mrbgems/mruby-onig-regexp/src/mruby_onig_regexp.c Modified: vendor/mruby/update.rb (+14 -4) =================================================================== --- vendor/mruby/update.rb 2014-08-07 12:24:43 +0900 (54c5489) +++ vendor/mruby/update.rb 2014-08-07 22:34:57 +0900 (514ed96) @@ -1,7 +1,7 @@ #!/usr/bin/env ruby -if ARGV.size != 2 - puts("Usage: #{$0} BUILD_COFNIG.RB MRUBY_SOURCE_DIR") +if ARGV.size != 3 + puts("Usage: #{$0} BUILD_COFNIG.RB MRUBY_SOURCE_DIR MRUBY_BUILD_DIR") exit(false) end @@ -9,6 +9,7 @@ require "find" build_config_rb = ARGV.shift mruby_source_dir = ARGV.shift +mruby_build_dir = ARGV.shift module MRuby class Build @@ -17,6 +18,10 @@ module MRuby @@source_dir = dir end + def build_dir=(dir) + @@build_dir = dir + end + def latest @@latest end @@ -25,15 +30,16 @@ module MRuby attr_reader :config def initialize(&block) @@latest = self - @config = Config.new(@@source_dir) + @config = Config.new(@@source_dir, @@build_dir) @config.instance_eval(&block) end end class Config attr_reader :gem_dirs - def initialize(source_dir) + def initialize(source_dir, build_dir) @source_dir = source_dir + @build_dir = build_dir @gem_dirs = [] end @@ -56,6 +62,9 @@ module MRuby def load_special_path_gem(params) if params[:core] "#{@source_dir}/mrbgems/#{params[:core]}" + elsif params[:github] + owner, repository = params[:github].split("/", 2) + "#{@build_dir}/mrbgems/#{repository}" else raise "Unsupported gem options: #{params.inspect}" end @@ -64,6 +73,7 @@ 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 Added: vendor/onigmo-source (+1 -0) 160000 =================================================================== --- /dev/null +++ vendor/onigmo-source 2014-08-07 22:34:57 +0900 (1f20fb9) @@ -0,0 +1 @@ +Subproject commit 1f20fb94c049c10e11c670181c7a7a799e329dd4 -------------- next part -------------- HTML����������������������������...Download