mruby: copy mruby-onig-regexp source

groonga · Aug 7, 2014 · 932d1ec · 932d1ec
1 parent 1b41e3e
commit 932d1ec
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -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/*/

diff --git a/vendor/mruby/Makefile.am b/vendor/mruby/Makefile.am
@@ -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
diff --git a/vendor/mruby/sources.am b/vendor/mruby/sources.am
@@ -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
diff --git a/vendor/mruby/update.rb b/vendor/mruby/update.rb
@@ -1,15 +1,14 @@
 #!/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
 
 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 @@ def source_dir=(dir)
         @@source_dir = dir
       end
 
-      def build_dir=(dir)
-        @@build_dir = dir
-      end
-
       def latest
         @@latest
       end
@@ -30,16 +25,15 @@ def latest
     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 @@ def enable_debug
     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 @@ 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}"
+        nil
       else
         raise "Unsupported gem options: #{params.inspect}"
       end
@@ -73,7 +67,6 @@ def load_special_path_gem(params)
 end
 
 MRuby::Build.source_dir = mruby_source_dir
-MRuby::Build.build_dir = mruby_build_dir
 load build_config_rb
 build = MRuby::Build.latest