Skip to content

Commit c50c856

Browse files
committed
Update to Doxygen 1.10.0
Update the Doxyfile to the same version, and restore the default value of EXPAND_ONLY_PREDEF to avoid mqtt.h warnings from Doxygen not understanding that MQTT_5 is set.
1 parent 658c226 commit c50c856

File tree

4 files changed

+282
-125
lines changed

4 files changed

+282
-125
lines changed

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ jobs:
8282
if: matrix.os == 'macos-latest'
8383
run: |
8484
brew install coreutils make mosquitto mtr rlwrap
85-
# Doxygen 1.9.7 is broken with ifdefs again, install 1.9.4 which works.
86-
wget https://raw.githubusercontent.com/Homebrew/homebrew-core/41828ee36b96e35b63b2a4c8cfc2df2c3728944a/Formula/doxygen.rb
85+
# Doxygen version needs to be in sync with Doxyfile.
86+
wget https://github.com/Homebrew/homebrew-core/raw/f434ee2dce9ae11b27d7450a7cfb7af775a47719/Formula/d/doxygen.rb
8787
brew install doxygen.rb
8888
rm doxygen.rb
8989
python3 -m pip -q install matplotlib

.readthedocs.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ build:
1010
python: "3.8"
1111
jobs:
1212
post_install:
13-
- wget -nv https://sourceforge.net/projects/doxygen/files/rel-1.9.4/doxygen-1.9.4.linux.bin.tar.gz/download -O doxygen-1.9.4.linux.bin.tar.gz
14-
- tar zxf doxygen-1.9.4.linux.bin.tar.gz doxygen-1.9.4/bin/doxygen --strip-components 2 --one-top-level=tools/doxygen
15-
- rm doxygen-1.9.4.linux.bin.tar.gz
13+
- wget -nv https://sourceforge.net/projects/doxygen/files/rel-1.10.0/doxygen-1.10.0.linux.bin.tar.gz/download -O doxygen.linux.bin.tar.gz
14+
- tar xf doxygen.linux.bin.tar.gz doxygen-1.10.0/bin/doxygen --strip-components 2 --one-top-level=tools/doxygen
15+
- rm doxygen.linux.bin.tar.gz
1616

1717
python:
1818
install:

tools/docker/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@ COPY --chown=root:root files/remap-user.sh /usr/local/bin/remap-user.sh
151151
# Remove the PDF manual and html directory to reduce image size.
152152
# Use the most recent version of ccache to ensure it supports the compiler
153153
# versions in the docker image.
154-
RUN wget -nv https://sourceforge.net/projects/doxygen/files/rel-1.9.4/doxygen-1.9.4.linux.bin.tar.gz/download -O doxygen-1.9.4.linux.bin.tar.gz && \
155-
tar zxf doxygen-1.9.4.linux.bin.tar.gz -C ${HOME}/.local && \
156-
rm -rf ${HOME}/.local/doxygen-1.9.4/html ${HOME}/.local/doxygen-1.9.4/*.pdf doxygen-1.9.4.linux.bin.tar.gz && \
157-
(cd ${HOME}/.local/bin && ln -s ../doxygen-1.9.4/bin/doxygen .) && \
154+
RUN wget -nv https://sourceforge.net/projects/doxygen/files/rel-1.10.0/doxygen-1.10.0.linux.bin.tar.gz/download -O doxygen.linux.bin.tar.gz && \
155+
tar zxf doxygen.linux.bin.tar.gz -C ${HOME}/.local && \
156+
rm -rf ${HOME}/.local/doxygen-1.10.0/html ${HOME}/.local/doxygen-1.10.0/*.pdf doxygen.linux.bin.tar.gz && \
157+
(cd ${HOME}/.local/bin && ln -s ../doxygen-1.10.0/bin/doxygen .) && \
158158
wget -nv https://github.com/ccache/ccache/releases/download/v4.8.2/ccache-4.8.2-linux-x86_64.tar.xz && \
159159
tar xf ccache-4.8.2-linux-x86_64.tar.xz -C ${HOME}/.local/bin --strip-components=1 ccache-4.8.2-linux-x86_64/ccache && \
160160
rm ccache-*-linux-x86_64.tar.xz

0 commit comments

Comments
 (0)