diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2016-08-18 22:55:33 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-08-18 22:55:33 +0900 |
commit | d073625c7964ecccc58a7b418deb4d43a404f8dc (patch) | |
tree | 1e1130992caea41e02fa2d36e7bd6040f2dde874 | |
parent | d58755d03c9b372633a7bfa5c39c99642330d828 (diff) | |
parent | df476cdaa935204b318a28ee588ba40ed994b072 (diff) | |
download | ruby-openssl-d073625c7964ecccc58a7b418deb4d43a404f8dc.tar.gz |
Merge branch 'topic/gh-pages-rdoc'
* topic/gh-pages-rdoc:
Fix RDoc main page
tool/sync-with-trunk: ignore openssl.gemspec in Ruby tree
Add tool/update-gh-pages
-rw-r--r-- | Rakefile | 3 | ||||
-rwxr-xr-x | tool/sync-with-trunk | 2 | ||||
-rwxr-xr-x | tool/update-gh-pages | 22 |
3 files changed, 25 insertions, 2 deletions
@@ -19,7 +19,8 @@ Rake::ExtensionTask.new('test/mdebug') do |ext| end RDoc::Task.new do |rdoc| - rdoc.rdoc_files.include("README.md", "lib/**/*.rb", "ext/**/*.c") + rdoc.main = "README.md" + rdoc.rdoc_files.include("*.md", "lib/**/*.rb", "ext/**/*.c") end task :test => :debug diff --git a/tool/sync-with-trunk b/tool/sync-with-trunk index c4fcf1f7..21854a7f 100755 --- a/tool/sync-with-trunk +++ b/tool/sync-with-trunk @@ -37,7 +37,7 @@ echo "#### Step 1. Sync '$BRANCH_EXTRACT' with 'ruby/trunk'" git filter-branch -f --prune-empty --index-filter ' git rm --cached -qr --ignore-unmatch . && git reset -q $GIT_COMMIT -- ext/openssl test/openssl sample/openssl && - git rm --cached -q --ignore-unmatch ext/openssl/depend + git rm --cached -q --ignore-unmatch ext/openssl/depend ext/openssl/openssl.gemspec ' -- $filter_range ||: echo "## Adjust path" diff --git a/tool/update-gh-pages b/tool/update-gh-pages new file mode 100755 index 00000000..8eb546a9 --- /dev/null +++ b/tool/update-gh-pages @@ -0,0 +1,22 @@ +#!/bin/sh +set -e + +# Generates RDoc HTML and update gh-pages branch. + +HEAD_DESCRIPTION=$(git describe --dirty --always --abbrev=12) + +[ -d html ] && + rm -r html +rake rdoc + +[ ! -d tmp/gh-pages ] && + git worktree add tmp/gh-pages gh-pages +( + cd tmp/gh-pages + + git rm -r . + cp -r ../../html/* . + rm created.rid js/*.gz # to avoid unnecessary change :x + git add . + git commit -m "Sync with $HEAD_DESCRIPTION" +) |