summaryrefslogtreecommitdiffhomepage
path: root/doc
diff options
context:
space:
mode:
authorDaniel Bovensiepen <[email protected]>2013-06-15 03:53:50 +0800
committerDaniel Bovensiepen <[email protected]>2013-06-15 03:53:50 +0800
commit373122a299ebec890cfaa95ee41fde221ac6a543 (patch)
tree346e79bb8a30a4e0b4102babf7dd9407beb36979 /doc
parentad07d41bd1b42fe7d23e04361839f511c5f9cd7f (diff)
parent961cd408a86580c4d428f56153da00fd46738e35 (diff)
downloadmruby-373122a299ebec890cfaa95ee41fde221ac6a543.tar.gz
mruby-373122a299ebec890cfaa95ee41fde221ac6a543.zip
Merge upstream
Diffstat (limited to 'doc')
-rw-r--r--doc/compile/README.md4
-rw-r--r--doc/mrbgems/README.md7
2 files changed, 8 insertions, 3 deletions
diff --git a/doc/compile/README.md b/doc/compile/README.md
index a244d06b2..e7f382f15 100644
--- a/doc/compile/README.md
+++ b/doc/compile/README.md
@@ -33,7 +33,8 @@ customized path using the *$MRUBY_CONFIG* environment variable.
To compile just call ```./minirake``` inside of the mruby source root. To
generate and execute the test tools call ```./minirake test```. To clean
-all build files call ```./minirake clean```.
+all build files call ```./minirake clean```. To see full command line on
+build, call ```./minirake -v```.
## Build Configuration
@@ -177,6 +178,7 @@ Integrate GEMs in the build process.
conf.gem 'path/to/another/gem'
+See doc/mrbgems/README.md for more option about mrbgems.
### Mrbtest
Configuration Mrbtest build process.
diff --git a/doc/mrbgems/README.md b/doc/mrbgems/README.md
index e89fd1a56..881fbb228 100644
--- a/doc/mrbgems/README.md
+++ b/doc/mrbgems/README.md
@@ -25,6 +25,9 @@ A remote GIT repository location for a GEM is also supported:
conf.gem :bitbucket => 'mruby/mrbgems-example', :branch => 'master'
+To pull all gems from remote GIT repository on build, call ```./minirake -p```,
+or ```./minirake --pull-gems```.
+
NOTE: `:bitbucket` option supports only git. Hg is unsupported in this version.
## GemBox
@@ -96,7 +99,7 @@ GEM directory. A typical GEM specification could look like this for example:
MRuby::Gem::Specification.new('c_and_ruby_extension_example') do |spec|
spec.license = 'MIT'
- spec.authors = 'mruby developers'
+ spec.author = 'mruby developers'
end
The mrbgems build process will use this specification to compile Object and Ruby
@@ -121,7 +124,7 @@ In case your GEM is depending on other GEMs please use
MRuby::Gem::Specification.new('c_and_ruby_extension_example') do |spec|
spec.license = 'MIT'
- spec.authors = 'mruby developers'
+ spec.author = 'mruby developers'
# add GEM dependency mruby-parser.
# Version has to be between 1.0.0 and 1.5.2