Kouhei Sutou
null+****@clear*****
Sun Oct 18 15:34:23 JST 2015
Kouhei Sutou 2015-10-18 15:34:23 +0900 (Sun, 18 Oct 2015) New Revision: 359454a931d322980c6aa8645ff31f154d126c22 https://github.com/groonga/groonga/commit/359454a931d322980c6aa8645ff31f154d126c22 Message: Use Ruby to download MeCab Added files: vendor/download_mecab.rb Removed files: vendor/download_mecab.sh Modified files: packages/source/Makefile.am vendor/Makefile.am Modified: packages/source/Makefile.am (+1 -1) =================================================================== --- packages/source/Makefile.am 2015-10-18 15:18:21 +0900 (ed31f15) +++ packages/source/Makefile.am 2015-10-18 15:34:23 +0900 (99eb814) @@ -43,6 +43,6 @@ 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 - cd $(PACKAGE)-$(VERSION)$(SUFFIX)/vendor && ./download_mecab.sh + cd $(PACKAGE)-$(VERSION)$(SUFFIX)/vendor && $(RUBY) download_mecab.rb zip -r $@ $(PACKAGE)-$(VERSION)$(SUFFIX) rm -rf $(PACKAGE)-$(VERSION)$(SUFFIX) Modified: vendor/Makefile.am (+2 -1) =================================================================== --- vendor/Makefile.am 2015-10-18 15:18:21 +0900 (3e7a6f2) +++ vendor/Makefile.am 2015-10-18 15:34:23 +0900 (1c640fc) @@ -8,7 +8,8 @@ SUBDIRS = \ EXTRA_DIST = \ $(NGINX_DIR) \ CMakeLists.txt \ - plugins/CMakeLists.txt + plugins/CMakeLists.txt \ + download_mecab.rb dist-hook: rm -rf $(distdir)/$(NGINX_DIR)/objs/ Added: vendor/download_mecab.rb (+34 -0) 100755 =================================================================== --- /dev/null +++ vendor/download_mecab.rb 2015-10-18 15:34:23 +0900 (0f8c2a8) @@ -0,0 +1,34 @@ +#!/usr/bin/env ruby + +require "pathname" +require "fileutils" +require "open-uri" + +base_dir = Pathname.new(__FILE__).expand_path.dirname.parent + +mecab_version = (base_dir + "bundled_mecab_version").read.strip +mecab_naist_jdic_version = (base_dir + "bundled_mecab_naist_jdic_version").read.strip + +mecab_base = "mecab-#{mecab_version}" +mecab_naist_jdic_base = "mecab-naist-jdic-#{mecab_naist_jdic_version}" + +def download(url, base) + tar = "#{base}.tar" + tar_gz = "#{tar}.gz" + open(url) do |remote_tar_gz| + File.open(tar_gz, "wb") do |local_tar_gz| + local_tar_gz.print(remote_tar_gz.read) + end + end + FileUtils.rm_rf(base) + system("7z", "x", tar_gz) + system("7z", "x", tar) + FileUtils.rm_rf(tar) + FileUtils.rm_rf(tar_gz) +end + +download("https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7cENtOXlicTFaRUE", + mecab_base) + +download("http://osdn.dl.sourceforge.jp/naist-jdic/48487/#{mecab_naist_jdic_base}.tar.gz", + mecab_naist_jdic_base) Deleted: vendor/download_mecab.sh (+0 -28) 100755 =================================================================== --- vendor/download_mecab.sh 2015-10-18 15:18:21 +0900 (fb965e6) +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e -set -u - -base_dir="$(cd $(dirname "$0") && pwd)/.." - -mecab_version=$(cat ${base_dir}/bundled_mecab_version) -mecab_naist_jdic_version=$(cat ${base_dir}/bundled_mecab_naist_jdic_version) - -mecab_base=mecab-${mecab_version} -mecab_tar_gz=${mecab_base}.tar.gz -mecab_naist_jdic_base=mecab-naist-jdic-${mecab_naist_jdic_version} -mecab_naist_jdic_tar_gz=${mecab_naist_jdic_base}.tar.gz - -rm -rf ${mecab_tar_gz} -curl -L -J -O \ - 'https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7cENtOXlicTFaRUE' -rm -rf ${mecab_base} -tar xzf ${mecab_tar_gz} -rm -rf ${mecab_tar_gz} - -rm -rf ${mecab_naist_jdic_tar_gz} -curl -L -O \ - "http://osdn.dl.sourceforge.jp/naist-jdic/48487/${mecab_naist_jdic_tar_gz}" -rm -rf ${mecab_naist_jdic_base} -tar xzf ${mecab_naist_jdic_tar_gz} -rm -rf ${mecab_naist_jdic_tar_gz} -------------- next part -------------- HTML����������������������������...Download