Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue with garbled text in generated documentation #388

Merged
merged 1 commit into from
Sep 14, 2023
Merged

Fix issue with garbled text in generated documentation #388

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 18 additions & 30 deletions tools/Dockerfile.harmonic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN echo ::group::Container setup

RUN apt-get update \
&& apt-get install -y \
sudo tzdata lsb-release \
sudo tzdata lsb-release flex bison \
&& apt-get clean

ARG GZ_VERSION_PASSWORD
Expand All @@ -23,36 +23,24 @@ COPY scripts/build_gz.sh scripts/build_gz.sh

RUN echo ::endgroup::

RUN scripts/build_gz.sh gazebosim gz-cmake gz-cmake3 y \
$GZ_VERSION_DATE \
$GZ_VERSION_PASSWORD; exit 0

RUN scripts/build_gz.sh gazebosim gz-utils gz-utils2 y \
$GZ_VERSION_DATE \
$GZ_VERSION_PASSWORD; exit 0

RUN scripts/build_gz.sh gazebosim gz-math gz-math7 y \
$GZ_VERSION_DATE \
$GZ_VERSION_PASSWORD; exit 0

RUN scripts/build_gz.sh gazebosim gz-tools gz-tools2 n \
$GZ_VERSION_DATE \
$GZ_VERSION_PASSWORD; exit 0

RUN scripts/build_gz.sh gazebosim gz-plugin gz-plugin2 y \
$GZ_VERSION_DATE \
$GZ_VERSION_PASSWORD; exit 0

RUN scripts/build_gz.sh gazebosim gz-common gz-common5 y \
$GZ_VERSION_DATE \
$GZ_VERSION_PASSWORD; exit 0

# SDFormat's documentation is uploaded in a different way
# Keeping it here for completeness
# RUN scripts/build_gz.sh osrf sdformat sdf11 n \
# $GZ_VERSION_DATE \
# $GZ_VERSION_PASSWORD; exit 0
RUN echo ::group::Build doxygen from source
# The version of doxygen in Jammy has a bug that generates garbled characters
# when processing xml comment code blocks in markdown. We build doxygen 1.9.2
# from source here since the problem appears to be fixed in that version.
# Adapted from the Dockerfile in the doxygen repo
RUN sudo apt-get remove -y doxygen
RUN git clone https://github.com/doxygen/doxygen.git -b Release_1_9_2 \
&& cd doxygen \
&& mkdir build \
&& cd build \
&& cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr .. \
&& make \
&& sudo make install \
&& cd ../..
RUN echo ::endgroup::

# Packages such as gz-cmake3 will be built and uploaded with Garden,
# so here, we just build packages that have been bumped for Harmonic
RUN scripts/build_gz.sh gazebosim gz-msgs gz-msgs10 y \
$GZ_VERSION_DATE \
$GZ_VERSION_PASSWORD; exit 0
Expand Down
Loading