tests/docker: Install the NSIS tools in the MinGW capable images
This fixes: $ make installer (cd /tmp/qemu-nsis; \ for i in qemu-system-*.exe; do \ arch=${i%.exe}; \ arch=${arch#qemu-system-}; \ echo Section \"$arch\" Section_$arch; \ echo SetOutPath \"\$INSTDIR\"; \ echo File \"\${BINDIR}\\$i\"; \ echo SectionEnd; \ done \ ) >/tmp/qemu-nsis/system-emulations.nsh makensis -V2 -NOCD \ -DCONFIG_DOCUMENTATION="y" \ \ -DBINDIR="/tmp/qemu-nsis" \ \ -DSRCDIR="/home/phil/source/qemu" \ -DOUTFILE="qemu-setup-4.0.90.exe" \ -DDISPLAYVERSION="4.0.90" \ /home/phil/source/qemu/qemu.nsi /bin/sh: 1: makensis: not found Makefile:1077: recipe for target 'qemu-setup-4.0.90.exe' failed make: *** [qemu-setup-4.0.90.exe] Error 127 Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20190715174817.18981-4-philmd@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
parent
8d16a31028
commit
c054f3f43a
|
@ -9,6 +9,8 @@ MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|||
|
||||
ENV TARGET i686
|
||||
|
||||
ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin
|
||||
|
||||
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
|
||||
apt-get install -y --no-install-recommends \
|
||||
mxe-$TARGET-w64-mingw32.shared-bzip2 \
|
||||
|
@ -19,6 +21,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
|
|||
mxe-$TARGET-w64-mingw32.shared-lzo \
|
||||
mxe-$TARGET-w64-mingw32.shared-nettle \
|
||||
mxe-$TARGET-w64-mingw32.shared-ncurses \
|
||||
mxe-$TARGET-w64-mingw32.shared-nsis \
|
||||
mxe-$TARGET-w64-mingw32.shared-pixman \
|
||||
mxe-$TARGET-w64-mingw32.shared-pkgconf \
|
||||
mxe-$TARGET-w64-mingw32.shared-pthreads \
|
||||
|
|
|
@ -9,6 +9,8 @@ MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|||
|
||||
ENV TARGET x86-64
|
||||
|
||||
ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin
|
||||
|
||||
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
|
||||
apt-get install -y --no-install-recommends \
|
||||
mxe-$TARGET-w64-mingw32.shared-bzip2 \
|
||||
|
@ -19,6 +21,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
|
|||
mxe-$TARGET-w64-mingw32.shared-lzo \
|
||||
mxe-$TARGET-w64-mingw32.shared-nettle \
|
||||
mxe-$TARGET-w64-mingw32.shared-ncurses \
|
||||
mxe-$TARGET-w64-mingw32.shared-nsis \
|
||||
mxe-$TARGET-w64-mingw32.shared-pixman \
|
||||
mxe-$TARGET-w64-mingw32.shared-pkgconf \
|
||||
mxe-$TARGET-w64-mingw32.shared-pthreads \
|
||||
|
|
|
@ -52,6 +52,7 @@ ENV PACKAGES \
|
|||
mingw32-libpng \
|
||||
mingw32-libtasn1 \
|
||||
mingw32-nettle \
|
||||
mingw32-nsis \
|
||||
mingw32-pixman \
|
||||
mingw32-pkg-config \
|
||||
mingw32-SDL2 \
|
||||
|
|
Loading…
Reference in a new issue