Re: [Qemu-devel] [PATCH 2/3] tests/docker: Install the NSIS tools in the MXE images

[Alex Bennée]

Philippe Mathieu-Daudé <address@hidden> writes:

> This fixes:
>
>   $ make installer

We should probably be exercising this via test-mingw (and making it
usable for fedora/debian based mingw build)

>   (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
>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>

Otherwise:

Reviewed-by: Alex Bennée <address@hidden>

> ---
>  tests/docker/dockerfiles/debian-win32-cross.docker | 3 +++
>  tests/docker/dockerfiles/debian-win64-cross.docker | 3 +++
>  2 files changed, 6 insertions(+)
>
> diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker 
> b/tests/docker/dockerfiles/debian-win32-cross.docker
> index c787e43245..77f5cc45e9 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 a7068ed6ac..3908c5abc4 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 \


--
Alex Bennée