From a186717821a26657c92ff4c9e16d81fcb89bf0a4 Mon Sep 17 00:00:00 2001 From: Bjarne von Horn Date: Wed, 16 Nov 2022 10:31:01 +0100 Subject: [PATCH] Use IgH doxygen theme and remove pages output as the html pages will be served by other repository --- .gitlab-ci.yml | 10 +++++----- .gitmodules | 3 +++ Doxyfile.in | 10 +++++++--- doxygen-layout | 1 + 4 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 .gitmodules create mode 160000 doxygen-layout diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d03db08d..2dfaf468 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,20 +41,20 @@ test cmake: - make - ldd userexample -pages: +doxygen: stage: deploy rules: - if: $CI_COMMIT_BRANCH == "stable-1.5" + variables: + GIT_SUBMODULE_STRATEGY: recursive script: - ./bootstrap - ./configure --with-linux-dir=/usr/src/linux-obj/$(uname -i)/default --disable-8139too --enable-tty --with-devices=2 --enable-ccat - doxygen - - mkdir public - - echo "/ethercat /ethercat/v1 301" > public/_redirects - - mv doxygen-output/html/ public/v1/ + - mv doxygen-output/html/ html/ artifacts: paths: - - public/ + - html/ documentation: stage: deploy diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..fb11256b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "doxygen-layout"] + path = doxygen-layout + url = https://gitlab.com/etherlab.org/doxygen-layout.git diff --git a/Doxyfile.in b/Doxyfile.in index a3fbe8da..4218ea7d 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -45,7 +45,7 @@ PROJECT_BRIEF = # exceed 55 pixels and the maximum width should not exceed 200 pixels. # Doxygen will copy the logo to the output directory. -PROJECT_LOGO = +PROJECT_LOGO = doxygen-layout/images/igh+logo.svg # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. @@ -886,13 +886,13 @@ HTML_FILE_EXTENSION = .html # have to redo this when upgrading to a newer version of doxygen or when # changing the value of configuration settings such as GENERATE_TREEVIEW! -HTML_HEADER = +HTML_HEADER = doxygen-layout/style/html_header.html # The HTML_FOOTER tag can be used to specify a personal HTML footer for # each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = +HTML_FOOTER = doxygen-layout/style/html_footer.html # The HTML_STYLESHEET tag can be used to specify a user-defined cascading # style sheet that is used by each HTML page. It can be used to @@ -903,6 +903,10 @@ HTML_FOOTER = HTML_STYLESHEET = +HTML_EXTRA_STYLESHEET = doxygen-layout/style/custom.css \ + doxygen-layout/style/custom_igh_theme.css + + # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the HTML output directory. Note # that these files will be copied to the base HTML output directory. Use the diff --git a/doxygen-layout b/doxygen-layout new file mode 160000 index 00000000..fa4893ab --- /dev/null +++ b/doxygen-layout @@ -0,0 +1 @@ +Subproject commit fa4893ab56b9f41c9ca84fee7ffa31841805f41a