[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/23] tests/docker: Install the NSIS tools in th
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v2 10/23] tests/docker: Install the NSIS tools in the MinGW capable images |
Date: |
Wed, 17 Jul 2019 14:43:22 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
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 <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
---
tests/docker/dockerfiles/debian-win32-cross.docker | 3 +++
tests/docker/dockerfiles/debian-win64-cross.docker | 3 +++
tests/docker/dockerfiles/fedora.docker | 1 +
3 files changed, 7 insertions(+)
diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker
b/tests/docker/dockerfiles/debian-win32-cross.docker
index c787e432454..77f5cc45e92 100644
--- a/tests/docker/dockerfiles/debian-win32-cross.docker
+++ b/tests/docker/dockerfiles/debian-win32-cross.docker
@@ -9,6 +9,8 @@ MAINTAINER Philippe Mathieu-Daudé <address@hidden>
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 \
diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker
b/tests/docker/dockerfiles/debian-win64-cross.docker
index a7068ed6ac6..3908c5abc42 100644
--- a/tests/docker/dockerfiles/debian-win64-cross.docker
+++ b/tests/docker/dockerfiles/debian-win64-cross.docker
@@ -9,6 +9,8 @@ MAINTAINER Philippe Mathieu-Daudé <address@hidden>
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 \
diff --git a/tests/docker/dockerfiles/fedora.docker
b/tests/docker/dockerfiles/fedora.docker
index 2350d494d9a..226ac1026fa 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -52,6 +52,7 @@ ENV PACKAGES \
mingw32-libpng \
mingw32-libtasn1 \
mingw32-nettle \
+ mingw32-nsis \
mingw32-pixman \
mingw32-pkg-config \
mingw32-SDL2 \
--
2.20.1
- [Qemu-devel] [PATCH v2 00/23] testing/next for 4.1-rc2 (win, travis, iotests), Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 01/23] archive-source: also create a stash for submodules, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 02/23] tests/docker: add test-misc for building tools & docs, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 03/23] tests/docker: Install Sphinx in the Ubuntu images, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 05/23] tests/docker: Install Ubuntu images noninteractively, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 04/23] tests/docker: Install Sphinx in the Fedora image, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 06/23] tests/migration-test: don't spam the logs when we fail, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 08/23] shippable: re-enable the windows cross builds, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 07/23] tests/dockerfiles: update the win cross builds to stretch, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 09/23] tests/docker: Install Sphinx in the Debian images, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 10/23] tests/docker: Install the NSIS tools in the MinGW capable images,
Alex Bennée <=
- [Qemu-devel] [PATCH v2 12/23] tests/docker: Install texinfo in the Fedora image, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 11/23] tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 17/23] hw/i386: also turn off VMMOUSE is VMPORT is disabled, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 18/23] travis: enable travis_retry for check phase, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 20/23] tests/qemu-iotests/check: Allow tests without groups, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 14/23] buildsys: The NSIS Windows build requires qemu-nsis.bmp installed, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 15/23] tests/docker: Let the test-mingw test generate a NSIS installer, Alex Bennée, 2019/07/17