Skip to content

Commit ecc46bb

Browse files
committed
install qt5 and qt6 to test the build and transition of qt clients
- also update the way openmodelica is added to the sources list
1 parent a4942a9 commit ecc46bb

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

Dockerfile

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ RUN apt-get install -qy \
2121
RUN curl -fsSL http://build.openmodelica.org/apt/openmodelica.asc | gpg --dearmor -o /usr/share/keyrings/openmodelica-keyring.gpg
2222
RUN echo \
2323
"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/openmodelica-keyring.gpg] https://build.openmodelica.org/apt \
24-
$(lsb_release -cs) nightly" | tee /etc/apt/sources.list.d/openmodelica.list > /dev/null
24+
$(cat /etc/os-release | grep "\(UBUNTU\\|DEBIAN\\|VERSION\)_CODENAME" | sort | cut -d= -f 2 | head -1) \
25+
nightly" | tee /etc/apt/sources.list.d/openmodelica.list > /dev/null
2526
RUN echo \
2627
"deb-src [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/openmodelica-keyring.gpg] https://build.openmodelica.org/apt \
27-
nightly contrib" | tee -a /etc/apt/sources.list.d/openmodelica.list > /dev/null
28+
$(cat /etc/os-release | grep "\(UBUNTU\\|DEBIAN\\|VERSION\)_CODENAME" | sort | cut -d= -f 2 | head -1) \
29+
nightly" | tee -a /etc/apt/sources.list.d/openmodelica.list > /dev/null
2830
RUN apt-get update && apt-get build-dep -qy openmodelica
2931

3032
# Install additional dependencies, e.g. to build the User's Guide
@@ -62,6 +64,19 @@ RUN apt-get install -qy \
6264
xvfb \
6365
zip
6466

67+
# Install the qt5 and qt6 packages needed to build the qt clients
68+
RUN apt-get install -qy \
69+
qtwebengine5-dev \
70+
qt6-base-dev \
71+
libqt6svg6-dev \
72+
qt6-tools-dev \
73+
qt6-tools-dev-tools \
74+
libqt6opengl6-dev \
75+
libqt6openglwidgets6 \
76+
qt6-webengine-dev \
77+
qt6-scxml-dev \
78+
libqt6core5compat6-dev
79+
6580
RUN wget https://raw.githubusercontent.com/OpenModelica/OpenModelicaBuildScripts/master/debian/control \
6681
&& mk-build-deps --install -t 'apt-get --force-yes -y' control
6782

0 commit comments

Comments
 (0)