Hiroshi Hatake
null+****@clear*****
Sun Jun 28 21:39:29 JST 2015
Hiroshi Hatake 2015-06-28 21:39:29 +0900 (Sun, 28 Jun 2015) New Revision: 7b3757333a4841be579aadb0d0040f38996691cf https://github.com/mroonga/homebrew-mroonga/commit/7b3757333a4841be579aadb0d0040f38996691cf Merged 135e0a6: Merge pull request #3 from mroonga/modernize-formula Message: Use "--use-xxx" options for using mysql or mariadb options Modified files: mroonga.rb Modified: mroonga.rb (+7 -10) =================================================================== --- mroonga.rb 2015-06-26 23:43:19 +0900 (832467a) +++ mroonga.rb 2015-06-28 21:39:29 +0900 (22b24cf) @@ -7,8 +7,8 @@ class Mroonga < Formula depends_on "pkg-config" => :build depends_on "groonga-normalizer-mysql" - option "with-homebrew-mysql", "Use MySQL installed by Homebrew." - option "with-homebrew-mariadb", "Use MariaDB installed by Homebrew. You can't use this option with use-homebrew-mysql." + 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 "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-build=PATH", "MySQL build directory (default: guess from with-mysql-source)" @@ -16,18 +16,15 @@ class Mroonga < Formula option "with-debug[=full]", "Build with debug option" option "with-default-parser=PARSER", "Specify the default fulltext parser like with-default-parser=TokenMecab (default: TokenBigram)" - deprecated_option "use-homebrew-mysql" => "with-homebrew-mysql" - deprecated_option "use-homebrew-mariadb" => "with-homebrew-mariadb" - if build.with?("mecab") depends_on "groonga" => "--with-mecab" else depends_on "groonga" end - if build.with?("homebrew-mysql") + if build.include?("use-homebrew-mysql") depends_on "mysql" - elsif build.with?("homebrew-mariadb") + elsif build.include?("use-homebrew-mariadb") depends_on "mariadb" end @@ -37,9 +34,9 @@ class Mroonga < Formula end def install - if build.with?("homebrew-mysql") + if build.include?("use-homebrew-mysql") mysql_formula_name = "mysql" - elsif build.with?("homebrew-mariadb") + elsif build.include?("use-homebrew-mariadb") mysql_formula_name = "mariadb" else mysql_formula_name = nil @@ -55,7 +52,7 @@ class Mroonga < Formula else mysql_source_path = option_value("--with-mysql-source") if mysql_source_path.nil? - raise "--with-homebrew-mysql, --with-homebrew-mariadb or --with-mysql-source=PATH is required" + raise "--use-homebrew-mysql, --use-homebrew-mariadb or --with-mysql-source=PATH is required" end install_mroonga(mysql_source_path, nil) end -------------- next part -------------- HTML����������������������������...下载
