diff options
| author | Jose Narvaez <[email protected]> | 2014-06-13 12:37:18 +0100 |
|---|---|---|
| committer | Jose Narvaez <[email protected]> | 2014-06-13 12:37:18 +0100 |
| commit | e457b4d68675a37e4671a1bb0e400805e14243f6 (patch) | |
| tree | 0573de77381853092f70ab964b73dad32bae9a64 /doc | |
| parent | 6b642637b3c7f3ebe8e290eadfd892030c57c993 (diff) | |
| parent | 40b92e35293d7d1bfbffee2efd2eac2cfe7f105a (diff) | |
| download | mruby-e457b4d68675a37e4671a1bb0e400805e14243f6.tar.gz mruby-e457b4d68675a37e4671a1bb0e400805e14243f6.zip | |
Merge branch 'master' into fix-clang-analizer-warnings
* master:
update add_confict document; ref #2391
Update document by regenerating it.
Add :doc task to run document generator.
Add document for `add_conflict` and `add_conflicts`.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/language/Core.md | 12 | ||||
| -rw-r--r-- | doc/mrbgems/README.md | 16 |
2 files changed, 28 insertions, 0 deletions
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 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: |