Kouhei Sutou
null+****@clear*****
Tue Feb 3 16:45:25 JST 2015
Kouhei Sutou 2015-02-03 16:45:25 +0900 (Tue, 03 Feb 2015) New Revision: 4d19729cbd16e91595795b6f78dd7420dd446469 https://github.com/groonga/groonga/commit/4d19729cbd16e91595795b6f78dd7420dd446469 Message: Support installing sharding plugin Added files: plugins/sharding/Makefile.am plugins/sharding/sources.am Copied files: plugins/sharding/CMakeLists.txt (from plugins/CMakeLists.txt) Modified files: configure.ac plugins/CMakeLists.txt plugins/Makefile.am Modified: configure.ac (+4 -0) =================================================================== --- configure.ac 2015-02-03 16:07:58 +0900 (98c1375) +++ configure.ac 2015-02-03 16:45:25 +0900 (1d74bac) @@ -235,6 +235,7 @@ AC_CONFIG_FILES([ plugins/query_expanders/Makefile plugins/ruby/Makefile plugins/token_filters/Makefile + plugins/sharding/Makefile examples/Makefile examples/dictionary/Makefile examples/dictionary/edict/Makefile @@ -1343,6 +1344,9 @@ AC_SUBST(ruby_pluginsdir) token_filter_pluginsdir="\${pluginsdir}/token_filters" AC_SUBST(token_filter_pluginsdir) +sharding_pluginsdir="\${pluginsdir}/sharding" +AC_SUBST(sharding_pluginsdir) + AC_MSG_CHECKING(for the suffix of plugin shared libraries) shrext_cmds=$(./libtool --config | grep '^shrext_cmds=') eval $shrext_cmds Modified: plugins/CMakeLists.txt (+2 -1) =================================================================== --- plugins/CMakeLists.txt 2015-02-03 16:07:58 +0900 (42a3045) +++ plugins/CMakeLists.txt 2015-02-03 16:45:25 +0900 (a4d84f9) @@ -1,4 +1,4 @@ -# Copyright(C) 2012-2014 Brazil +# Copyright(C) 2012-2015 Brazil # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,3 +19,4 @@ add_subdirectory(table) add_subdirectory(query_expanders) add_subdirectory(ruby) add_subdirectory(token_filters) +add_subdirectory(sharding) Modified: plugins/Makefile.am (+2 -1) =================================================================== --- plugins/Makefile.am 2015-02-03 16:07:58 +0900 (1d1abf1) +++ plugins/Makefile.am 2015-02-03 16:45:25 +0900 (4ffdbf7) @@ -4,7 +4,8 @@ SUBDIRS = \ table \ query_expanders \ ruby \ - token_filters + token_filters \ + sharding EXTRA_DIST = \ CMakeLists.txt Copied: plugins/sharding/CMakeLists.txt (+8 -7) 68% =================================================================== --- plugins/CMakeLists.txt 2015-02-03 16:07:58 +0900 (42a3045) +++ plugins/sharding/CMakeLists.txt 2015-02-03 16:45:25 +0900 (8d0cdd9) @@ -1,4 +1,4 @@ -# Copyright(C) 2012-2014 Brazil +# Copyright(C) 2015 Brazil # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -13,9 +13,10 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -add_subdirectory(suggest) -add_subdirectory(tokenizers) -add_subdirectory(table) -add_subdirectory(query_expanders) -add_subdirectory(ruby) -add_subdirectory(token_filters) +if(GRN_WITH_MRUBY) + set(GRN_RELATIVE_SHARDING_PLUGINS_DIR "${GRN_RELATIVE_PLUGINS_DIR}/sharding") + + read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/sources.am SHARDING_SCRIPTS) + install(FILES ${SHARDING_SCRIPTS} + DESTINATION "${GRN_RELATIVE_SHARDING_PLUGINS_DIR}") +endif() Added: plugins/sharding/Makefile.am (+9 -0) 100644 =================================================================== --- /dev/null +++ plugins/sharding/Makefile.am 2015-02-03 16:45:25 +0900 (196a6c2) @@ -0,0 +1,9 @@ +EXTRA_DIST = \ + CMakeLists.txt + +if WITH_MRUBY +sharding_plugins_DATA = \ + $(sharding_scripts) +endif + +include sources.am Added: plugins/sharding/sources.am (+2 -0) 100644 =================================================================== --- /dev/null +++ plugins/sharding/sources.am 2015-02-03 16:45:25 +0900 (5dd42e7) @@ -0,0 +1,2 @@ +sharding_scripts = \ + search.rb -------------- next part -------------- HTML����������������������������...Download