tomosm
null+****@clear*****
Thu Dec 29 21:20:40 JST 2016
tomosm 2016-12-29 21:20:40 +0900 (Thu, 29 Dec 2016) New Revision: e05f01d6d784379349ed518db858652b555f75de https://github.com/mroonga/homebrew-mroonga/commit/e05f01d6d784379349ed518db858652b555f75de Merged d974f45: Merge pull request #10 from tomosm/master Message: Add mysql5.6 option Modified files: mroonga.rb Modified: mroonga.rb (+10 -3) =================================================================== --- mroonga.rb 2016-11-29 17:54:03 +0900 (dc5adaa) +++ mroonga.rb 2016-12-29 21:20:40 +0900 (fe0308b) @@ -7,9 +7,10 @@ class Mroonga < Formula depends_on "pkg-config" => :build option "use-homebrew-mysql", "Use MySQL installed by Homebrew." - option "use-homebrew-mariadb", "Use MariaDB installed by Homebrew. You can't use this option with use-homebrew-mysql." + option "use-homebrew-mysql56", "Use MySQL installed by Homebrew." + option "use-homebrew-mariadb", "Use MariaDB installed by Homebrew. You can't use this option with use-homebrew-mysql and use-homebrew-mysql56." option "with-mecab", "Use MeCab installed by Homebrew. You can use additional tokenizer - TokenMecab. Note that you need to build Groonga with MeCab" - option "with-mysql-source=PATH", "MySQL source directory. You can't use this option with use-homebrew-mysql and use-homebrew-mariadb" + option "with-mysql-source=PATH", "MySQL source directory. You can't use this option with use-homebrew-mysql, use-homebrew-mysql56 and use-homebrew-mariadb" option "with-mysql-build=PATH", "MySQL build directory (default: guess from with-mysql-source)" option "with-mysql-config=PATH", "mysql_config path (default: guess from with-mysql-source)" option "with-debug[=full]", "Build with debug option" @@ -25,6 +26,10 @@ class Mroonga < Formula depends_on "cmake" => :build depends_on "boost" => :build depends_on "mysql" + elsif build.include?("use-homebrew-mysql56") + depends_on "cmake" => :build + depends_on "boost" => :build + depends_on "mysql �� 5.6" elsif build.include?("use-homebrew-mariadb") depends_on "cmake" => :build depends_on "mariadb" @@ -38,6 +43,8 @@ class Mroonga < Formula def install if build.include?("use-homebrew-mysql") mysql_formula_name = "mysql" + elsif build.include?("use-homebrew-mysql56") + mysql_formula_name = "mysql �� 5.6" elsif build.include?("use-homebrew-mariadb") mysql_formula_name = "mariadb" else @@ -54,7 +61,7 @@ class Mroonga < Formula else mysql_source_path = option_value("--with-mysql-source") if mysql_source_path.nil? - raise "--use-homebrew-mysql, --use-homebrew-mariadb or --with-mysql-source=PATH is required" + raise "--use-homebrew-mysql, --use-homebrew-mysql56, --use-homebrew-mariadb or --with-mysql-source=PATH is required" end install_mroonga(mysql_source_path, nil) end -------------- next part -------------- HTML����������������������������...다운로드
