Merge.

.gitignore

@@ -22,6 +22,7 @@
 /config.lt
 /config.status
 /config.sub
+/config.sh
 /configure
 /depcomp
 /dist

.travis.yml

@@ -5,14 +5,14 @@ language: cpp
 compiler:
   - gcc
   - clang
+env:
+  - BUILD_TOOL=autotools
+#  - BUILD_TOOL=cmake
 install:
   - curl https://raw.github.com/clear-code/cutter/master/data/travis/setup.sh | sh
-  - sudo apt-get install -qq -y autotools-dev zlib1g-dev liblzo2-dev libmsgpack-dev libevent-dev libmecab-dev mecab-naist-jdic
+  - sudo apt-get install -qq -y autotools-dev zlib1g-dev liblzo2-dev libmsgpack-dev libevent-dev libmecab-dev mecab-naist-jdic cmake
 before_script:
   - rvm use 1.9.3
   - tools/travis-before-script.sh
 script:
-  - NO_RUBY=yes test/unit/run-test.sh
-  - test/command/run-test.sh
-#  - test/command/run-test.sh --interface http
-#  - test/command/run-test.sh --interface http --testee groonga-httpd
+  - tools/travis-script.sh

CMakeLists.txt

@@ -13,7 +13,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.8)
 set(GRN_PROJECT_NAME "groonga")
 project("${GRN_PROJECT_NAME}")
 
@@ -87,6 +87,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
   set(GRN_CXX_COMPILE_FLAGS "${GRN_NO_WARNING_COMPILE_FLAGS} -fexceptions")
 endif()
 
+option(GRN_WITH_DEBUG "enable debug build." OFF)
+if(GRN_WITH_DEBUG)
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    set(GRN_C_COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS} -g3 -O0")
+    set(GRN_CXX_COMPILE_FLAGS "${GRN_CXX_COMPILE_FLAGS} -g3 -O0")
+  endif()
+endif()
+
 add_definitions(
   -DHAVE_CONFIG_H
   )
@@ -156,7 +164,6 @@ if(UNIX)
 endif()
 
 option(GRN_WITH_NFKC "use NFKC based UTF8 normalization." ON)
-option(GRN_WITH_STATIC "build static library." OFF)
 
 if(WIN32)
   ac_check_headers(winsock2.h)
@@ -349,6 +356,18 @@ else()
   set(GRN_WITH_MESSAGE_PACK FALSE)
 endif()
 
+option(GRN_WITH_MRUBY "use mruby" OFF)
+file(READ "${CMAKE_CURRENT_SOURCE_DIR}/mruby_version" MRUBY_VERSION)
+if(GRN_WITH_MRUBY)
+  set(MRUBY_INCLUDE_DIRS
+    "${CMAKE_CURRENT_SOURCE_DIR}/vendor/mruby-${MRUBY_VERSION}/include")
+  set(MRUBY_LIBS "$<TARGET_OBJECTS:mruby>")
+else()
+  set(MRUBY_INCLUDE_DIRS "")
+  set(MRUBY_LIBS "")
+endif()
+
+add_subdirectory(vendor)
 add_subdirectory(lib)
 add_subdirectory(src)
 add_subdirectory(plugins)
@@ -357,6 +376,13 @@ add_subdirectory(data)
 
 configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
+set(RUBY "ruby") # TODO: support customization
+set(GROONGA "${CMAKE_CURRENT_BINARY_DIR}/src/groonga")
+set(GROONGA_SUGGEST_CREATE_DATASET
+  "${CMAKE_CURRENT_BINARY_DIR}/src/suggest/groonga-suggest-create-dataset")
+set(GROONGA_BENCHMARK "${CMAKE_CURRENT_BINARY_DIR}/src/groonga-benchmark")
+configure_file(config.sh.in "${CMAKE_CURRENT_BINARY_DIR}/config.sh" @ONLY)
+
 set(prefix "${CMAKE_INSTALL_PREFIX}")
 set(exec_prefix "${prefix}")
 set(bindir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}")

Makefile.am

@@ -106,28 +106,6 @@ update-document:
 	done
 
 
-echo-cutter:
-	@echo $(CUTTER)
-
-if WITH_RUBY
-echo-ruby:
-	@echo $(RUBY)
-else
-echo-ruby:
-endif
-
-echo-groonga:
-	@echo $(GROONGA)
-
-echo-groonga-httpd:
-	@echo $(GROONGA_HTTPD)
-
-echo-groonga-suggest-create-dataset:
-	@echo $(GROONGA_SUGGEST_CREATE_DATASET)
-
-echo-groonga-benchmark:
-	@echo $(GROONGA_BENCHMARK)
-
 update-version:
 	@if test -z "$(NEW_VERSION)"; then	\
 	  echo "\$$(NEW_VERSION) is missing";	\

README

@@ -1 +1 @@
-Read doc/ja/README.
+Read doc/locale/en/html/index.html or doc/locale/ja/html/index.html.

base_version

@@ -1 +1 @@
-3.0.7
+3.0.8

config.h.cmake

@@ -79,6 +79,7 @@
 #cmakedefine GRN_WITH_LZO
 #cmakedefine GRN_WITH_MECAB
 #cmakedefine GRN_WITH_MESSAGE_PACK
+#cmakedefine GRN_WITH_MRUBY
 #cmakedefine GRN_WITH_NFKC
 #cmakedefine GRN_WITH_ZEROMQ
 #cmakedefine GRN_WITH_ZLIB

config.sh.in

@@ -0,0 +1,6 @@
+export CUTTER="@CUTTER@"
+export RUBY="@RUBY@"
+export GROONGA="@GROONGA@"
+export GROONGA_HTTPD="@GROONGA_HTTPD@"
+export GROONGA_SUGGEST_CREATE_DATASET="@GROONGA_SUGGEST_CREATE_DATASET@"
+export GROONGA_BENCHMARK="@GROONGA_BENCHMARK@"

configure.ac

@@ -220,13 +220,15 @@ AC_CONFIG_FILES([
   src/httpd/Makefile
   lib/Makefile
   lib/dat/Makefile
+  lib/mrb/Makefile
   include/Makefile
   include/groonga/Makefile
   plugins/Makefile
   plugins/tokenizers/Makefile
   plugins/suggest/Makefile
   plugins/table/Makefile
   plugins/query_expanders/Makefile
+  plugins/ruby/Makefile
   examples/Makefile
   examples/dictionary/Makefile
   examples/dictionary/edict/Makefile
@@ -655,15 +657,15 @@ AC_SUBST(WINDOWS_LDFLAGS)
 AC_SUBST(WINDOWS_LIBS)
 
 # groonga binary path
-GROONGA="\$(abs_top_builddir)/src/groonga"
+GROONGA="${ac_pwd}/src/groonga"
 AC_SUBST(GROONGA)
 
 # groonga-benchmark binary path
-GROONGA_BENCHMARK="\$(abs_top_builddir)/src/groonga-benchmark"
+GROONGA_BENCHMARK="${ac_pwd}/src/groonga-benchmark"
 AC_SUBST(GROONGA_BENCHMARK)
 
 # groonga-suggest-create-dataset binary path
-GROONGA_SUGGEST_CREATE_DATASET="\$(abs_top_builddir)/src/suggest/groonga-suggest-create-dataset"
+GROONGA_SUGGEST_CREATE_DATASET="${ac_pwd}/src/suggest/groonga-suggest-create-dataset"
 AC_SUBST(GROONGA_SUGGEST_CREATE_DATASET)
 
 # check Cutter with GLib support if available
@@ -1179,6 +1181,9 @@ AC_SUBST(suggest_pluginsdir)
 table_pluginsdir="\${pluginsdir}/table"
 AC_SUBST(table_pluginsdir)
 
+ruby_pluginsdir="\${pluginsdir}/ruby"
+AC_SUBST(ruby_pluginsdir)
+
 AC_MSG_CHECKING(for the suffix of plugin shared libraries)
 shrext_cmds=$(./libtool --config | grep '^shrext_cmds=')
 eval $shrext_cmds
@@ -1247,7 +1252,7 @@ NGINX_VERSION=nginx_version
 AC_SUBST(NGINX_VERSION)
 
 # groonga-httpd binary path
-GROONGA_HTTPD="\$(abs_top_builddir)/vendor/nginx-${NGINX_VERSION}/objs/nginx"
+GROONGA_HTTPD="${ac_pwd}/vendor/nginx-${NGINX_VERSION}/objs/nginx"
 AC_SUBST(GROONGA_HTTPD)
 
 AC_ARG_ENABLE(groonga_httpd,
@@ -1266,7 +1271,7 @@ AM_CONDITIONAL(WITH_GROONGA_HTTPD, test "$enable_groonga_httpd" = "yes")
 # mruby
 AC_ARG_ENABLE(mruby,
   [AS_HELP_STRING([--enable-mruby],
-    [enable mruby. [default=auto]])],
+    [enable mruby. [default=no]])],
   [enable_mruby="$enableval"],
   [enable_mruby="no"])
 
@@ -1354,6 +1359,7 @@ AC_OUTPUT([
   packages/rpm/fedora/groonga.spec
   packages/apt/debian/groonga-keyring.postrm
   groonga.pc
+  config.sh
   groonga-httpd-conf.sh
   data/groonga-httpd.conf
   data/scripts/groonga-httpd-restart

doc/files.am

@@ -20,9 +20,14 @@ absolute_source_files = \
 	$(top_srcdir)/doc/source/development/travis-ci.txt \
 	$(top_srcdir)/doc/source/example/completion-1.log \
 	$(top_srcdir)/doc/source/example/correction-1.log \
+	$(top_srcdir)/doc/source/example/reference/commands/cache_limit/get.log \
+	$(top_srcdir)/doc/source/example/reference/commands/cache_limit/set.log \
 	$(top_srcdir)/doc/source/example/reference/commands/column_rename/column_rename.log \
+	$(top_srcdir)/doc/source/example/reference/commands/delete/cascade.log \
+	$(top_srcdir)/doc/source/example/reference/commands/delete/status.log \
 	$(top_srcdir)/doc/source/example/reference/commands/normalize/normalizer_auto_ascii.log \
 	$(top_srcdir)/doc/source/example/reference/commands/register/query_expanders_tsv.log \
+	$(top_srcdir)/doc/source/example/reference/commands/ruby_eval/calc.log \
 	$(top_srcdir)/doc/source/example/reference/commands/select/filter_equal.log \
 	$(top_srcdir)/doc/source/example/reference/commands/select/filter_less_than.log \
 	$(top_srcdir)/doc/source/example/reference/commands/select/limit_negative.log \
@@ -347,6 +352,7 @@ absolute_source_files = \
 	$(top_srcdir)/doc/source/rdoc.py \
 	$(top_srcdir)/doc/source/reference.txt \
 	$(top_srcdir)/doc/source/reference/api.txt \
+	$(top_srcdir)/doc/source/reference/api/grn_cache.txt \
 	$(top_srcdir)/doc/source/reference/api/grn_column.txt \
 	$(top_srcdir)/doc/source/reference/api/grn_command_version.txt \
 	$(top_srcdir)/doc/source/reference/api/grn_ctx.txt \
@@ -389,6 +395,7 @@ absolute_source_files = \
 	$(top_srcdir)/doc/source/reference/commands/normalize.txt \
 	$(top_srcdir)/doc/source/reference/commands/quit.txt \
 	$(top_srcdir)/doc/source/reference/commands/register.txt \
+	$(top_srcdir)/doc/source/reference/commands/ruby_eval.txt \
 	$(top_srcdir)/doc/source/reference/commands/select.txt \
 	$(top_srcdir)/doc/source/reference/commands/shutdown.txt \
 	$(top_srcdir)/doc/source/reference/commands/status.txt \
@@ -499,9 +506,14 @@ source_files_relative_from_doc_dir = \
 	source/development/travis-ci.txt \
 	source/example/completion-1.log \
 	source/example/correction-1.log \
+	source/example/reference/commands/cache_limit/get.log \
+	source/example/reference/commands/cache_limit/set.log \
 	source/example/reference/commands/column_rename/column_rename.log \
+	source/example/reference/commands/delete/cascade.log \
+	source/example/reference/commands/delete/status.log \
 	source/example/reference/commands/normalize/normalizer_auto_ascii.log \
 	source/example/reference/commands/register/query_expanders_tsv.log \
+	source/example/reference/commands/ruby_eval/calc.log \
 	source/example/reference/commands/select/filter_equal.log \
 	source/example/reference/commands/select/filter_less_than.log \
 	source/example/reference/commands/select/limit_negative.log \
@@ -826,6 +838,7 @@ source_files_relative_from_doc_dir = \
 	source/rdoc.py \
 	source/reference.txt \
 	source/reference/api.txt \
+	source/reference/api/grn_cache.txt \
 	source/reference/api/grn_column.txt \
 	source/reference/api/grn_command_version.txt \
 	source/reference/api/grn_ctx.txt \
@@ -868,6 +881,7 @@ source_files_relative_from_doc_dir = \
 	source/reference/commands/normalize.txt \
 	source/reference/commands/quit.txt \
 	source/reference/commands/register.txt \
+	source/reference/commands/ruby_eval.txt \
 	source/reference/commands/select.txt \
 	source/reference/commands/shutdown.txt \
 	source/reference/commands/status.txt \
@@ -1072,6 +1086,7 @@ html_files_relative_from_locale_dir = \
 	html/_sources/news/senna.txt \
 	html/_sources/reference.txt \
 	html/_sources/reference/api.txt \
+	html/_sources/reference/api/grn_cache.txt \
 	html/_sources/reference/api/grn_column.txt \
 	html/_sources/reference/api/grn_command_version.txt \
 	html/_sources/reference/api/grn_ctx.txt \
@@ -1114,6 +1129,7 @@ html_files_relative_from_locale_dir = \
 	html/_sources/reference/commands/normalize.txt \
 	html/_sources/reference/commands/quit.txt \
 	html/_sources/reference/commands/register.txt \
+	html/_sources/reference/commands/ruby_eval.txt \
 	html/_sources/reference/commands/select.txt \
 	html/_sources/reference/commands/shutdown.txt \
 	html/_sources/reference/commands/status.txt \
@@ -1251,6 +1267,7 @@ html_files_relative_from_locale_dir = \
 	html/objects.inv \
 	html/reference.html \
 	html/reference/api.html \
+	html/reference/api/grn_cache.html \
 	html/reference/api/grn_column.html \
 	html/reference/api/grn_command_version.html \
 	html/reference/api/grn_ctx.html \
@@ -1293,6 +1310,7 @@ html_files_relative_from_locale_dir = \
 	html/reference/commands/normalize.html \
 	html/reference/commands/quit.html \
 	html/reference/commands/register.html \
+	html/reference/commands/ruby_eval.html \
 	html/reference/commands/select.html \
 	html/reference/commands/shutdown.html \
 	html/reference/commands/status.html \

doc/locale/en/LC_MESSAGES/contribution.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: groonga 2.0.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-07 22:49+0900\n"
+"POT-Creation-Date: 2013-09-30 11:09+0900\n"
 "PO-Revision-Date: 2012-07-23 17:58+0900\n"
 "Last-Translator: Kouhei Sutou <kou@clear-code.com>\n"
 "Language-Team: English\n"
@@ -296,15 +296,24 @@ msgstr "htmlの作成"
 msgid "以下のコマンドでhtmlが作成されます。::"
 msgstr "以下のコマンドでhtmlが作成されます。::"
 
+# 8d4e2300b2fc488fbd3297674f1e7dbf
+#: ../../../source/contribution/development/document.txt:23
+msgid ""
+"This document is also ditributed in forms of release source archive and "
+"updated time to time. If you want to refer latest documentation in source "
+"form, you can view such files via GitHub repository browser (https://github."
+"com/groonga/groonga/tree/master/doc/source)."
+msgstr ""
+
 # e1e9872bf31d4c428864aaa3a2869a4c
 # 62dcfa5796a642dda7bade7db0ae3170
-#: ../../../source/contribution/development/document.txt:24
-#: ../../../source/contribution/development/document.txt:36
+#: ../../../source/contribution/development/document.txt:27
+#: ../../../source/contribution/development/document.txt:39
 msgid "pdfの作成"
 msgstr "pdfの作成"
 
 # f935bdc93ed040f2bdaaa10f7baa5b3b
-#: ../../../source/contribution/development/document.txt:26
+#: ../../../source/contribution/development/document.txt:29
 msgid ""
 "groongaのドキュメントは、pdf出力することもできます。rst2pdfと、IPAフォント"
 "(IPA Gothic/IPAexGothic)が必要となります。"
@@ -313,17 +322,17 @@ msgstr ""
 "(IPA Gothic/IPAexGothic)が必要となります。"
 
 # efde2d7e5d5541e59884a0b6fcfecbdc
-#: ../../../source/contribution/development/document.txt:29
+#: ../../../source/contribution/development/document.txt:32
 msgid "rst2pdfのインストール"
 msgstr "rst2pdfのインストール"
 
 # f0bf4a8ebf58472193bc825cee8c4974
-#: ../../../source/contribution/development/document.txt:31
+#: ../../../source/contribution/development/document.txt:34
 msgid "以下のようにしてインストールできます。::"
 msgstr "以下のようにしてインストールできます。::"
 
 # d894374c5817453f878e48f04ee93c5b
-#: ../../../source/contribution/development/document.txt:38
+#: ../../../source/contribution/development/document.txt:41
 msgid "以下のコマンドでpdfが作成されます。::"
 msgstr "以下のコマンドでpdfが作成されます。::"
 

doc/locale/en/LC_MESSAGES/index.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: groonga 2.0.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-28 14:44\n"
+"POT-Creation-Date: 2013-09-30 11:09+0900\n"
 "PO-Revision-Date: 2012-07-23 17:58+0900\n"
 "Last-Translator: Kouhei Sutou <kou@clear-code.com>\n"
 "Language-Team: English\n"