From 9c90717f53dc567c7160d4fb7c322529df3ae22e Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sat, 1 Dec 2018 23:53:30 +0100 Subject: [PATCH 01/13] Update Doxyfile --- Doku/Doxygen/Doxyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doku/Doxygen/Doxyfile b/Doku/Doxygen/Doxyfile index b12e371..720978b 100644 --- a/Doku/Doxygen/Doxyfile +++ b/Doku/Doxygen/Doxyfile @@ -51,7 +51,7 @@ PROJECT_BRIEF = "... better know the details." # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # the logo to the output directory. -PROJECT_LOGO = C:/Users/jnoack/Documents/GITs/coderacer/Doku/Bilder/coderace_logo.JPG +PROJECT_LOGO = ../Doku/Bilder/coderace_logo.JPG # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is From 666f7b8c1323736ae2d3536df18baea25fa5d0da Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sat, 1 Dec 2018 23:56:58 +0100 Subject: [PATCH 02/13] Update Doxyfile --- Doku/Doxygen/Doxyfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Doku/Doxygen/Doxyfile b/Doku/Doxygen/Doxyfile index 720978b..8624cce 100644 --- a/Doku/Doxygen/Doxyfile +++ b/Doku/Doxygen/Doxyfile @@ -51,7 +51,7 @@ PROJECT_BRIEF = "... better know the details." # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # the logo to the output directory. -PROJECT_LOGO = ../Doku/Bilder/coderace_logo.JPG +PROJECT_LOGO = ../Bilder/coderace_logo.JPG # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is @@ -790,7 +790,7 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. -INPUT = ../../Arduino/libraries/CodeRacer +INPUT = ./../../Arduino/libraries/CodeRacer # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses From 99bd6c4e1ebe4899e1e3190c8a13de76a74c3db0 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sun, 2 Dec 2018 00:05:29 +0100 Subject: [PATCH 03/13] Update Doxyfile --- Doku/Doxygen/Doxyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doku/Doxygen/Doxyfile b/Doku/Doxygen/Doxyfile index 8624cce..6ddc4cd 100644 --- a/Doku/Doxygen/Doxyfile +++ b/Doku/Doxygen/Doxyfile @@ -790,7 +790,7 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. -INPUT = ./../../Arduino/libraries/CodeRacer +INPUT = ../../Arduino/libraries/CodeRacer # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses From fccbddcca55e74f795309f626294bd7b948d117a Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sun, 2 Dec 2018 00:07:36 +0100 Subject: [PATCH 04/13] Add new directory --- Doku/Doxygen/html/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Doku/Doxygen/html/.gitkeep diff --git a/Doku/Doxygen/html/.gitkeep b/Doku/Doxygen/html/.gitkeep new file mode 100644 index 0000000..e69de29 From d3e2cd2c8aa12e27a5dc0982cab449bd4b825880 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sun, 2 Dec 2018 00:15:41 +0100 Subject: [PATCH 05/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f19a6d..bc6d62a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,8 @@ image: alpine pages: script: - apk update && apk add doxygen + - ls + - ls ../ - doxygen Doku/Doxygen/Doxyfile - mv Doku/Doxygen/html/ public/ artifacts: From 719ead411768ff9e160a653272a6a4fa0d1db354 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sun, 2 Dec 2018 00:17:15 +0100 Subject: [PATCH 06/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc6d62a..9f19a6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,6 @@ image: alpine pages: script: - apk update && apk add doxygen - - ls - - ls ../ - doxygen Doku/Doxygen/Doxyfile - mv Doku/Doxygen/html/ public/ artifacts: From 6913678000bcc46be782d102c9fec50370d82088 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sun, 2 Dec 2018 00:21:02 +0100 Subject: [PATCH 07/13] Update Doxyfile --- Doku/Doxygen/Doxyfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Doku/Doxygen/Doxyfile b/Doku/Doxygen/Doxyfile index 6ddc4cd..b372bd5 100644 --- a/Doku/Doxygen/Doxyfile +++ b/Doku/Doxygen/Doxyfile @@ -51,14 +51,14 @@ PROJECT_BRIEF = "... better know the details." # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # the logo to the output directory. -PROJECT_LOGO = ../Bilder/coderace_logo.JPG +PROJECT_LOGO = Doku/Bilder/coderace_logo.JPG # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = ./ +OUTPUT_DIRECTORY = Doku/Bilder/Doxygen/ # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and @@ -790,7 +790,7 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. -INPUT = ../../Arduino/libraries/CodeRacer +INPUT = Arduino/libraries/CodeRacer # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses From 85ef9ebf5c335fd417c82e4a8416045e2e320e75 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sun, 2 Dec 2018 00:23:30 +0100 Subject: [PATCH 08/13] Update Doxyfile --- Doku/Doxygen/Doxyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doku/Doxygen/Doxyfile b/Doku/Doxygen/Doxyfile index b372bd5..75884be 100644 --- a/Doku/Doxygen/Doxyfile +++ b/Doku/Doxygen/Doxyfile @@ -58,7 +58,7 @@ PROJECT_LOGO = Doku/Bilder/coderace_logo.JPG # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = Doku/Bilder/Doxygen/ +OUTPUT_DIRECTORY = Doku/Doxygen/ # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and From b3bacc26a4ffddbceea2ece86c388a392467ca88 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sun, 2 Dec 2018 00:33:15 +0100 Subject: [PATCH 09/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f19a6d..a638dcf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,12 @@ # This file is a template, and might need editing before it works on your project. # Full project: https://gitlab.com/pages/doxygen -image: alpine +image: ubuntu:trusty pages: script: - - apk update && apk add doxygen + - apk update + - apl add graphviz + - apk add doxygen - doxygen Doku/Doxygen/Doxyfile - mv Doku/Doxygen/html/ public/ artifacts: From 5c6d5baf1d595be3793edb2b2137c29c6d3eccb5 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sun, 2 Dec 2018 00:35:03 +0100 Subject: [PATCH 10/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a638dcf..dc7e8e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,10 @@ image: ubuntu:trusty pages: script: - - apk update - - apl add graphviz - - apk add doxygen + - export DEBIAN_FRONTEND=noninteractive + - apt-get -yq update + - apt-get -yq install graphviz + - apt-get -yq install doxygen - doxygen Doku/Doxygen/Doxyfile - mv Doku/Doxygen/html/ public/ artifacts: From e1af45e83f11b4e97ca746a0cb565c613c91755d Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sun, 2 Dec 2018 00:35:58 +0100 Subject: [PATCH 11/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc7e8e8..a32c72a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,6 @@ -# This file is a template, and might need editing before it works on your project. -# Full project: https://gitlab.com/pages/doxygen -image: ubuntu:trusty - pages: + stage: build + image: ubuntu:trusty script: - export DEBIAN_FRONTEND=noninteractive - apt-get -yq update From d5ddeab89cb3a4c8b4a8465d48dded79a3423aad Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sun, 2 Dec 2018 00:36:59 +0100 Subject: [PATCH 12/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a32c72a..3a9f71b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,10 @@ +# This file is a template, and might need editing before it works on your project. +# Full project: https://gitlab.com/pages/doxygen +image: alpine + pages: - stage: build - image: ubuntu:trusty script: - - export DEBIAN_FRONTEND=noninteractive - - apt-get -yq update - - apt-get -yq install graphviz - - apt-get -yq install doxygen + - apk update && apk add graphviz && apk add doxygen - doxygen Doku/Doxygen/Doxyfile - mv Doku/Doxygen/html/ public/ artifacts: From 4f962950d5d1c1d2742ae1bf53fd071a5d859fa5 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sun, 2 Dec 2018 00:42:17 +0100 Subject: [PATCH 13/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a9f71b..2d2795f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ image: alpine pages: script: - - apk update && apk add graphviz && apk add doxygen + - apk update && apk add graphviz && apk add ttf-freefont && apk add doxygen - doxygen Doku/Doxygen/Doxyfile - mv Doku/Doxygen/html/ public/ artifacts: