Chromium Code Reviews| Index: doc/support/generate_git.sh |
| diff --git a/doc/support/generate_doxygen.sh b/doc/support/generate_git.sh |
| similarity index 54% |
| copy from doc/support/generate_doxygen.sh |
| copy to doc/support/generate_git.sh |
| index ba565e7bc4633d4d2346d3448b7ab30a4cc48b3d..1a766bfa3f2332449837b82fb48d3420c8694378 100755 |
| --- a/doc/support/generate_doxygen.sh |
| +++ b/doc/support/generate_git.sh |
| @@ -16,14 +16,22 @@ |
| set -e |
| -# Generating Doxygen documentation requires Doxygen, http://www.doxygen.org/. |
| - |
| # Run from the Crashpad project root directory. |
| cd "$(dirname "${0}")/../.." |
| -output_dir=out/doc/doxygen |
| +local_branch=doctmp |
| +remote_master_name=master |
| +remote_master_branch="origin/${remote_master_name}" |
| +remote_doc_name=doc |
| +remote_doc_branch="origin/${remote_doc_name}" |
| +git fetch |
| +git checkout -b "${local_branch}" "${remote_doc_branch}" |
| +master_hash=$(git rev-parse "${remote_master_branch}") |
| +git merge "${remote_master_branch}" -m "Merge ${remote_master_name} ${master_hash} into doc" |
| +doc/support/generate.sh |
| +git add -A doc/generated |
| +git commit -m "Update documentation to ${remote_master_name} ${master_hash}" |
|
agable
2015/10/08 22:22:03
might want to use the short form (7 or 8 character
|
| -rm -rf "${output_dir}" |
| -mkdir -p "${output_dir}" |
| +git push origin "HEAD:${remote_doc_name}" |
| -doxygen doc/support/crashpad.doxy |
| +# TODO(mark): switch back to the original branch |
|
agable
2015/10/08 22:22:03
and the original directory
Mark Mentovai
2015/10/08 22:42:40
agable wrote:
agable
2015/10/08 22:53:53
Exactly. I don't trust bash to not get reused even
|