diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-29 11:52:50 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-29 11:52:50 +0000 |
commit | 4790c08906f296eea070c06933a5c2484b30584e (patch) | |
tree | 2f1835afaf8562c9ae611c80b7361c1eaa79b897 /tool | |
parent | 26a9bf756bf66e77dd7b897f7ad97a7ffdfb3275 (diff) | |
download | ruby-4790c08906f296eea070c06933a5c2484b30584e.tar.gz |
Merge rdoc-6.0.0.beta1.
This version fixed strange behavior of ruby code parser.
We will list all of impromovement to Changelog when 6.0.0 releasing.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59686 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rw-r--r-- | tool/sync_default_gems.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index e943a6420d..f533ad61bb 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -1,7 +1,7 @@ # sync following repositories to ruby repository # # * https://github.com/rubygems/rubygems -# * https://github.com/rdoc/rdoc +# * https://github.com/ruby/rdoc # * https://github.com/flori/json # * https://github.com/ruby/psych # * https://github.com/ruby/fileutils @@ -25,7 +25,7 @@ $repositories = { rubygems: 'rubygems/rubygems', - rdoc: 'rdoc/rdoc', + rdoc: 'ruby/rdoc', json: 'flori/json', psych: 'ruby/psych', fileutils: 'ruby/fileutils', @@ -65,10 +65,11 @@ def sync_default_gems(gem) `cp ../../rubygems/rubygems/LICENSE.txt ./lib/rubygems` when "rdoc" `rm -rf lib/rdoc* test/rdoc` - `cp -rf ../../rdoc/rdoc/lib/rdoc* ./lib` - `cp -rf ../../rdoc/rdoc/test test/rdoc` - `cp ../../rdoc/rdoc/rdoc.gemspec ./lib/rdoc` + `cp -rf ../rdoc/lib/rdoc* ./lib` + `cp -rf ../rdoc/test test/rdoc` + `cp ../rdoc/rdoc.gemspec ./lib/rdoc` `rm -f lib/rdoc/markdown.kpeg lib/rdoc/markdown/literals.kpeg lib/rdoc/rd/block_parser.ry lib/rdoc/rd/inline_parser.ry` + `git checkout lib/rdoc/.document` when "json" `rm -rf ext/json test/json` `cp -rf ../../flori/json/ext/json/ext ext/json` |