Support bundling MeCab and NAIST Jpanese Dictionary

groonga · Oct 17, 2015 · 5f88e6c · 5f88e6c
1 parent a37d875
commit 5f88e6c
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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")

diff --git a/Makefile.am b/Makefile.am
@@ -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

diff --git a/bundled_mecab_naist_jdic_version b/bundled_mecab_naist_jdic_version
@@ -0,0 +1 @@
+0.6.3-20100801
diff --git a/mecab_version → bundled_mecab_version b/mecab_version → bundled_mecab_version
diff --git a/configure.ac b/configure.ac
@@ -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]])],

diff --git a/packages/source/Makefile.am b/packages/source/Makefile.am
@@ -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)
diff --git a/vendor/mecab/CMakeLists.txt b/vendor/mecab/CMakeLists.txt
@@ -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}")