From 82a881f0375c29f2dde9e1ed3d369f102fcdf056 Mon Sep 17 00:00:00 2001 From: Jerry Crunchtime Date: Fri, 26 Oct 2018 12:28:07 +0200 Subject: [PATCH 1/4] Add Doxygen config --- doc/doxygen.config | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/doxygen.config diff --git a/doc/doxygen.config b/doc/doxygen.config new file mode 100644 index 00000000..e6980566 --- /dev/null +++ b/doc/doxygen.config @@ -0,0 +1,12 @@ +PROJECT_NAME = "Prometheus Client Library for Modern C++" + +EXCLUDE_PATTERNS = */detail/* +EXCLUDE_SYMBOLS = prometheus::detail::* +FILE_PATTERNS = *.h *.cc +GENERATE_LATEX = NO +GRAPHICAL_HIERARCHY = NO +INPUT = core/include core/src pull/include pull/src push/include push/src +RECURSIVE = YES +SHOW_FILES = NO +SHOW_INCLUDE_FILES = NO +SHOW_USED_FILES = NO From 8ad97cd1ed43191a770878e01c1418f6d0b1757a Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Sat, 27 Oct 2018 18:45:40 +0200 Subject: [PATCH 2/4] Rename to doxyfile --- doc/{doxygen.config => Doxyfile} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename doc/{doxygen.config => Doxyfile} (76%) diff --git a/doc/doxygen.config b/doc/Doxyfile similarity index 76% rename from doc/doxygen.config rename to doc/Doxyfile index e6980566..d616c2a6 100644 --- a/doc/doxygen.config +++ b/doc/Doxyfile @@ -5,7 +5,7 @@ EXCLUDE_SYMBOLS = prometheus::detail::* FILE_PATTERNS = *.h *.cc GENERATE_LATEX = NO GRAPHICAL_HIERARCHY = NO -INPUT = core/include core/src pull/include pull/src push/include push/src +INPUT = ../core/include ../core/src ../pull/include ../pull/src ../push/include ../push/src RECURSIVE = YES SHOW_FILES = NO SHOW_INCLUDE_FILES = NO From 8f5ec8997d8c9b5ec642cf7fe54f5cc07f08e62a Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Sat, 27 Oct 2018 18:47:30 +0200 Subject: [PATCH 3/4] git-ignore doxygen html dir --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 210fb7d9..334f845b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ bazel-* cmake-build-*/ _*/ .idea/ +doc/html/ From cf0cd752b671ed64dac19a5d6f0989c89ece5ae3 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Sat, 27 Oct 2018 19:02:43 +0200 Subject: [PATCH 4/4] Deploy gh-pages --- .travis.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.travis.yml b/.travis.yml index ea5d8a68..162b461e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ addons: - bazel - cmake3 - curl + - doxygen - g++-4.8 - gcc-4.8 - git @@ -72,6 +73,20 @@ script: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pip install --user cpp-coveralls && coveralls --root .. --build-root . -E ".*/3rdparty/.*" -E ".*/_.*" -E ".*/tests/.*" -E ".*/benchmarks/.*"; fi - popd + - pushd . + - cd doc + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; doxygen && touch html/.nojekyll; fi + - popd + +deploy: + provider: pages + local-dir: doc/html + skip-cleanup: true + github-token: $GITHUB_TOKEN + on: + branch: master + condition: "$TRAVIS_OS_NAME" == "linux" + # addons: # coverity_scan: # project: