Kouhei Sutou
null+****@clear*****
Sat Oct 17 23:35:38 JST 2015
Kouhei Sutou 2015-10-17 23:35:38 +0900 (Sat, 17 Oct 2015) New Revision: 5f88e6c598c9c5e4432a67863a2a7f46dae768c9 https://github.com/groonga/groonga/commit/5f88e6c598c9c5e4432a67863a2a7f46dae768c9 Message: Support bundling MeCab and NAIST Jpanese Dictionary Added files: bundled_mecab_naist_jdic_version Modified files: CMakeLists.txt Makefile.am configure.ac packages/source/Makefile.am vendor/mecab/CMakeLists.txt Renamed files: bundled_mecab_version (from mecab_version) Modified: CMakeLists.txt (+12 -4) =================================================================== --- CMakeLists.txt 2015-10-17 23:34:51 +0900 (26f040c) +++ CMakeLists.txt 2015-10-17 23:35:38 +0900 (8835832) @@ -380,11 +380,19 @@ if(NOT ${GRN_WITH_LZ4} STREQUAL "no") endif() endif() -file(READ "${CMAKE_CURRENT_SOURCE_DIR}/mecab_version" GRN_BUNDLED_MECAB_VERSION) -string(REGEX REPLACE "\n" "" - GRN_BUNDLED_MECAB_VERSION - "${GRN_BUNDLED_MECAB_VERSION}") + +file(READ "${CMAKE_CURRENT_SOURCE_DIR}/bundled_mecab_version" + GRN_BUNDLED_MECAB_VERSION) +string(STRIP + "${GRN_BUNDLED_MECAB_VERSION}" + GRN_BUNDLED_MECAB_VERSION) +file(READ "${CMAKE_CURRENT_SOURCE_DIR}/bundled_mecab_naist_jdic_version" + GRN_BUNDLED_MECAB_NAIST_JDIC_VERSION) +string(STRIP + "${GRN_BUNDLED_MECAB_NAIST_JDIC_VERSION}" + GRN_BUNDLED_MECAB_NAIST_JDIC_VERSION) option(GRN_WITH_BUNDLED_MECAB "use bundled MeCab" OFF) + set(GRN_WITH_MECAB "auto" CACHE STRING "use MeCab for morphological analysis") if(NOT ${GRN_WITH_MECAB} STREQUAL "no") Modified: Makefile.am (+2 -1) =================================================================== --- Makefile.am 2015-10-17 23:34:51 +0900 (8f38840) +++ Makefile.am 2015-10-17 23:35:38 +0900 (18fdeff) @@ -27,7 +27,8 @@ EXTRA_DIST = \ gpg_uid \ CMakeLists.txt \ config.h.cmake \ - mecab_version + bundled_mecab_version \ + bundled_mecab_naist_jdic_version pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = groonga.pc Added: bundled_mecab_naist_jdic_version (+1 -0) 100644 =================================================================== --- /dev/null +++ bundled_mecab_naist_jdic_version 2015-10-17 23:35:38 +0900 (f04deb4) @@ -0,0 +1 @@ +0.6.3-20100801 Renamed: bundled_mecab_version (+0 -0) 100% =================================================================== Modified: configure.ac (+6 -0) =================================================================== --- configure.ac 2015-10-17 23:34:51 +0900 (be749be) +++ configure.ac 2015-10-17 23:35:38 +0900 (e4c79fa) @@ -951,6 +951,12 @@ fi # MeCab # NOTE: MUST be checked last + +BUNDLED_MECAB_VERSION=m4_include([bundled_mecab_version]) +AC_SUBST(BUNDLED_MECAB_VERSION) +BUNDLED_MECAB_NAIST_JDIC_VERSION=m4_include([bundled_mecab_naist_jdic_version]) +AC_SUBST(BUNDLED_MECAB_NAIST_JDIC_VERSION) + AC_ARG_WITH(mecab, [AS_HELP_STRING([--with-mecab], [use MeCab for morphological analysis. [default=yes]])], Modified: packages/source/Makefile.am (+12 -0) =================================================================== --- packages/source/Makefile.am 2015-10-17 23:34:51 +0900 (35f07a5) +++ packages/source/Makefile.am 2015-10-17 23:35:38 +0900 (5a21279) @@ -8,6 +8,10 @@ TMP_FILES = \ files/$(PACKAGE)-$(VERSION)$(SUFFIX).tar.gz \ files/$(PACKAGE)-$(VERSION)$(SUFFIX).zip +MECAB_TAR_GZ = \ + mecab-$(BUNDLED_MECAB_VERSION).tar.gz +MECAB_NAIST_JDIC_TAR_GZ = \ + mecab-naist-jdic-$(BUNDLED_MECAB_NAIST_JDIC_VERSION).tar.gz all: @@ -44,5 +48,13 @@ files/$(PACKAGE)-$(VERSION)$(SUFFIX).tar.gz: $(abs_top_builddir)/$(PACKAGE)-$(VE files/$(PACKAGE)-$(VERSION)$(SUFFIX).zip: files/$(PACKAGE)-$(VERSION)$(SUFFIX).tar.gz rm -rf $(PACKAGE)-$(VERSION)$(SUFFIX) tar xzf files/$(PACKAGE)-$(VERSION)$(SUFFIX).tar.gz + curl -L -J -O 'https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7cENtOXlicTFaRUE' + cd $(PACKAGE)-$(VERSION)$(SUFFIX)/vendor && \ + tar xzf ../../$(MECAB_TAR_GZ) + rm -rf $(MECAB_TAR_GZ) + curl -L -O 'http://osdn.dl.sourceforge.jp/naist-jdic/48487/$(MECAB_NAIST_JDIC_TAR_GZ)' + cd $(PACKAGE)-$(VERSION)$(SUFFIX)/vendor && \ + tar xzf ../../$(MECAB_NAIST_JDIC_TAR_GZ) + rm -rf $(MECAB_NAIST_JDIC_TAR_GZ) zip -r $@ $(PACKAGE)-$(VERSION)$(SUFFIX) rm -rf $(PACKAGE)-$(VERSION)$(SUFFIX) Modified: vendor/mecab/CMakeLists.txt (+1 -1) =================================================================== --- vendor/mecab/CMakeLists.txt 2015-10-17 23:34:51 +0900 (527c3ce) +++ vendor/mecab/CMakeLists.txt 2015-10-17 23:35:38 +0900 (763045a) @@ -15,7 +15,7 @@ set(MECAB_VERSION ${GRN_BUNDLED_MECAB_VERSION}) set(MECAB_DICT_VERSION "102") -set(MECAB_NAIST_JDIC_VERSION "0.6.3b-20111013") +set(MECAB_NAIST_JDIC_VERSION ${GRN_BUNDLED_MECAB_NAIST_JDIC_VERSION}) set(MECAB_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../mecab-${MECAB_VERSION}") set(MECAB_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/../mecab-${MECAB_VERSION}") -------------- next part -------------- HTML����������������������������...Download