Peter M. Groen / CLI11

Commit 608124bd81a4076a5233d3e63eaf134d4cb0cded

Authored by Henry Fredrick Schreiner
1 parent 057e3df8

Adding new build location

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