From 66802d9219364f1a0e85bb214addb95e34bbd318 Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Fri, 13 Jun 2014 17:13:49 +0900 Subject: Add document for `add_conflict` and `add_conflicts`. --- doc/mrbgems/README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'doc') diff --git a/doc/mrbgems/README.md b/doc/mrbgems/README.md index 571c00450..7ae83ef8a 100644 --- a/doc/mrbgems/README.md +++ b/doc/mrbgems/README.md @@ -161,6 +161,21 @@ 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. +* `spec.add_conflicts(*conflicting_gems)` + +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_conflicts 'mruby-hs-regexp', 'mruby-pcre-regexp', '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: -- cgit v1.2.3 From 502baaba399ce4e65b60e60470b51d2c550b594a Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Fri, 13 Jun 2014 17:27:01 +0900 Subject: Update document by regenerating it. --- doc/language/Core.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'doc') diff --git a/doc/language/Core.md b/doc/language/Core.md index 033939865..d7331e7f3 100644 --- a/doc/language/Core.md +++ b/doc/language/Core.md @@ -1328,6 +1328,12 @@ ISO Code | Source File | C Function --- | --- | --- 15.3.1.2.5 | src/kernel.c | mrb_f_block_given_p_m +#### local_variables + +ISO Code | Source File | C Function +--- | --- | --- +15.3.1.2.7 | src/kernel.c | mrb_local_variables + #### raise ISO Code | Source File | C Function @@ -1498,6 +1504,12 @@ ISO Code | Source File | C Function --- | --- | --- 15.3.1.3.26 | src/kernel.c | mrb_obj_is_kind_of_m +#### local_variables + +ISO Code | Source File | C Function +--- | --- | --- +15.3.1.3.28 | src/kernel.c | mrb_local_variables + #### methods ISO Code | Source File | C Function -- cgit v1.2.3 From 8c283e15e4d6f28bd94a4c4e0d1667dfc47e5784 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Fri, 13 Jun 2014 20:34:51 +0900 Subject: update add_confict document; ref #2391 --- doc/mrbgems/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/mrbgems/README.md b/doc/mrbgems/README.md index 7ae83ef8a..f1ae7fc4a 100644 --- a/doc/mrbgems/README.md +++ b/doc/mrbgems/README.md @@ -164,7 +164,6 @@ 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. -* `spec.add_conflicts(*conflicting_gems)` like following code: @@ -173,7 +172,9 @@ like following code: spec.author = 'John Doe' spec.add_conflict 'mruby-onig-regexp', '> 0.0.0' - spec.add_conflicts 'mruby-hs-regexp', 'mruby-pcre-regexp', 'mruby-regexp-pcre' + 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 -- cgit v1.2.3