summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-06-13 20:35:00 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-06-13 20:35:00 +0900
commit17da8f3c996fd3085dc2d3662a0a1c8d62e4abb4 (patch)
tree2aae8e9bc8b4baa3b9ccd370be3477bf979475cc
parent7275096f563dfea06f43a3a80e9a35aa6ff96849 (diff)
parent8c283e15e4d6f28bd94a4c4e0d1667dfc47e5784 (diff)
downloadmruby-17da8f3c996fd3085dc2d3662a0a1c8d62e4abb4.tar.gz
mruby-17da8f3c996fd3085dc2d3662a0a1c8d62e4abb4.zip
git push origin masterMerge branch 'take-cheeze-conflict_doc'
-rw-r--r--doc/mrbgems/README.md16
1 files changed, 16 insertions, 0 deletions
diff --git a/doc/mrbgems/README.md b/doc/mrbgems/README.md
index 571c00450..f1ae7fc4a 100644
--- a/doc/mrbgems/README.md
+++ b/doc/mrbgems/README.md
@@ -161,6 +161,22 @@ Its format is same as argument of method `MRuby::Build#gem`, expect that it can'
When a special version of depedency is required,
use `MRuby::Build#gem` in *build_config.rb* to override default gem.
+If you have conflicting GEMs use either or both of the following methods
+* `spec.add_conflict(gem, *requirements)`
+ * The `requirements` argument is same as in `add_dependency` method.
+
+like following code:
+
+ MRuby::Gem::Specification.new 'some-regexp-binding' do |spec|
+ spec.license = 'BSD'
+ spec.author = 'John Doe'
+
+ spec.add_conflict 'mruby-onig-regexp', '> 0.0.0'
+ spec.add_conflict 'mruby-hs-regexp'
+ spec.add_conflict 'mruby-pcre-regexp'
+ spec.add_conflict 'mruby-regexp-pcre'
+ end
+
In case your GEM has more complex build requirements you can use
the following options additionally inside of your GEM specification: