Commit 608124bd81a4076a5233d3e63eaf134d4cb0cded
1 parent
057e3df8
Adding new build location
Showing
2 changed files
with
7 additions
and
4 deletions
.ci/build_docs.sh
| ... | ... | @@ -44,8 +44,9 @@ GH_REPO_REF="github.com/$GH_REPO_ORG/$GH_REPO_NAME.git" |
| 44 | 44 | |
| 45 | 45 | # Create a clean working directory for this script. |
| 46 | 46 | # Get the current gh-pages branch |
| 47 | -git clone -b gh-pages https://git@$GH_REPO_REF code_docs | |
| 48 | -cd code_docs | |
| 47 | +cd docs | |
| 48 | +git clone -b gh-pages https://git@$GH_REPO_REF html | |
| 49 | +cd html | |
| 49 | 50 | |
| 50 | 51 | ##### Configure git. |
| 51 | 52 | # Set the push default to simple i.e. push only the current branch. |
| ... | ... | @@ -71,6 +72,7 @@ echo "" > .nojekyll |
| 71 | 72 | ##### Generate the Doxygen code documentation and log the output. ##### |
| 72 | 73 | echo 'Generating Doxygen code documentation...' |
| 73 | 74 | # Redirect both stderr and stdout to the log file AND the console. |
| 75 | +cd .. | |
| 74 | 76 | doxygen $DOXYFILE 2>&1 | tee doxygen.log |
| 75 | 77 | |
| 76 | 78 | ################################################################################ |
| ... | ... | @@ -80,6 +82,7 @@ doxygen $DOXYFILE 2>&1 | tee doxygen.log |
| 80 | 82 | # both exist. This is a good indication that Doxygen did it's work. |
| 81 | 83 | if [ -d "html" ] && [ -f "html/index.html" ]; then |
| 82 | 84 | |
| 85 | + cd html | |
| 83 | 86 | echo 'Uploading documentation to the gh-pages branch...' |
| 84 | 87 | # Add everything in this directory (the Doxygen code documentation) to the |
| 85 | 88 | # gh-pages branch. | ... | ... |
docs/Doxyfile
| ... | ... | @@ -790,7 +790,7 @@ WARN_LOGFILE = |
| 790 | 790 | # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING |
| 791 | 791 | # Note: If this tag is empty the current directory is searched. |
| 792 | 792 | |
| 793 | -INPUT = ../include ../docs/mainpage.md | |
| 793 | +INPUT = ../include mainpage.md | |
| 794 | 794 | |
| 795 | 795 | # This tag can be used to specify the character encoding of the source files |
| 796 | 796 | # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses |
| ... | ... | @@ -1111,7 +1111,7 @@ GENERATE_HTML = YES |
| 1111 | 1111 | # The default directory is: html. |
| 1112 | 1112 | # This tag requires that the tag GENERATE_HTML is set to YES. |
| 1113 | 1113 | |
| 1114 | -HTML_OUTPUT = | |
| 1114 | +HTML_OUTPUT = html | |
| 1115 | 1115 | |
| 1116 | 1116 | # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each |
| 1117 | 1117 | # generated HTML page (for example: .htm, .php, .asp). | ... | ... |