[Groonga-commit] groonga/groonga at 83e178b [master] mruby: ensure rebuilding mruby when bundled mruby is updated

Back to archive index

Kouhei Sutou null+****@clear*****
Tue Apr 5 18:10:32 JST 2016


Kouhei Sutou	2016-04-05 18:10:32 +0900 (Tue, 05 Apr 2016)

  New Revision: 83e178b69e994e7e73637b02f23b04ec928541a5
  https://github.com/groonga/groonga/commit/83e178b69e994e7e73637b02f23b04ec928541a5

  Message:
    mruby: ensure rebuilding mruby when bundled mruby is updated

  Added files:
    vendor/mruby/version
  Modified files:
    vendor/mruby-source
    vendor/mruby/Makefile.am

  Modified: vendor/mruby-source (+1 -1)
===================================================================
--- vendor/mruby-source    2016-04-05 18:09:43 +0900 (4d909d8)
+++ vendor/mruby-source    2016-04-05 18:10:32 +0900 (d97a37e)
@@ -1 +1 @@
-Subproject commit 4d909d8b2b072e33faf3bb3359911971f2cfe76b
+Subproject commit d97a37eb7b4fe52bb1b16bb6f7410fbae85e3809

  Modified: vendor/mruby/Makefile.am (+2 -1)
===================================================================
--- vendor/mruby/Makefile.am    2016-04-05 18:09:43 +0900 (acafbd4)
+++ vendor/mruby/Makefile.am    2016-04-05 18:10:32 +0900 (5259219)
@@ -50,7 +50,7 @@ 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_build.timestamp: build_config.rb
+mruby_build.timestamp: build_config.rb version
 	$(RUBY) "$(srcdir)/mruby_build.rb"	\
 	  "$(srcdir)/build_config.rb"		\
 	  "$(srcdir)/../mruby-source"		\
@@ -65,5 +65,6 @@ endif
 update:
 	cd "$(srcdir)/../mruby-source" && \
 	  (git checkout master && git pull --rebase)
+	(cd "$(srcdir)/../mruby-source" && git describe) > version
 	cd "$(srcdir)" && \
 	  ./update.rb build_config.rb ../mruby-source > sources.am

  Added: vendor/mruby/version (+1 -0) 100644
===================================================================
--- /dev/null
+++ vendor/mruby/version    2016-04-05 18:10:32 +0900 (b08400c)
@@ -0,0 +1 @@
+1.0.0-3121-gd97a37e
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index