[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/23] buildsys: The NSIS Windows build requires the
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 13/23] buildsys: The NSIS Windows build requires the documentation installed |
Date: |
Tue, 23 Jul 2019 11:36:02 +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_GTK="y" \
-DBINDIR="/tmp/qemu-nsis" \
\
-DSRCDIR="/source/qemu" \
-DOUTFILE="qemu-setup-4.0.90.exe" \
-DDISPLAYVERSION="4.0.90" \
/source/qemu/qemu.nsi
File: "/tmp/qemu-nsis\qemu-doc.html" -> no files found.
Usage: File [/nonfatal] [/a] ([/r] [/x filespec [...]] filespec [...] |
/oname=outfile one_file_only)
Error in script "/source/qemu/qemu.nsi" on line 173 -- aborting creation
process
make: *** [Makefile:1080: qemu-setup-4.0.90.exe] Error 1
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
diff --git a/Makefile b/Makefile
index ecb788b2ce3..b3357691cad 100644
--- a/Makefile
+++ b/Makefile
@@ -1077,7 +1077,7 @@ installer: $(INSTALLER)
INSTDIR=/tmp/qemu-nsis
-$(INSTALLER): $(SRC_PATH)/qemu.nsi
+$(INSTALLER): install-doc $(SRC_PATH)/qemu.nsi
$(MAKE) install prefix=${INSTDIR}
ifdef SIGNCODE
(cd ${INSTDIR}; \
--
2.20.1
- [Qemu-devel] [PULL 10/23] tests/docker: Install the NSIS tools in the MinGW capable images, (continued)
- [Qemu-devel] [PULL 10/23] tests/docker: Install the NSIS tools in the MinGW capable images, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 12/23] tests/docker: Install texinfo in the Fedora image, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 23/23] gitlab-ci: Remove qcow2 tests that are handled by "make check" already, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 11/23] tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 19/23] tests/docker: invoke the DEBUG shell with --noprofile/--norc, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 21/23] tests/qemu-iotests/group: Remove some more tests from the "auto" group, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 17/23] hw/i386: also turn off VMMOUSE is VMPORT is disabled, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 14/23] buildsys: The NSIS Windows build requires qemu-nsis.bmp installed, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 22/23] tests: Run the iotests during "make check" again, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 18/23] travis: enable travis_retry for check phase, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 13/23] buildsys: The NSIS Windows build requires the documentation installed,
Alex Bennée <=
- [Qemu-devel] [PULL 15/23] tests/docker: Let the test-mingw test generate a NSIS installer, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 20/23] tests/qemu-iotests/check: Allow tests without groups, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 16/23] NSIS: Add missing firmware blobs, Alex Bennée, 2019/07/23
- Re: [Qemu-devel] [PULL for 4.1-rc2 00/23] testing updates (green CI!), Peter Maydell, 2019/07/23
- Re: [Qemu-devel] [PULL for 4.1-rc2 00/23] testing updates (green CI!), Alex Bennée, 2019/07/23
- Re: [Qemu-devel] [PULL for 4.1-rc2 00/23] testing updates (green CI!), Philippe Mathieu-Daudé, 2019/07/23
- Re: [Qemu-devel] [PULL for 4.1-rc2 00/23] testing updates (green CI!), Peter Maydell, 2019/07/23
- Re: [Qemu-devel] [PULL for 4.1-rc2 00/23] testing updates (green CI!), Alex Bennée, 2019/07/23
- Re: [Qemu-devel] [PULL for 4.1-rc2 00/23] testing updates (green CI!), Peter Maydell, 2019/07/23
- Re: [Qemu-devel] [PULL for 4.1-rc2 00/23] testing updates (green CI!), Thomas Huth, 2019/07/23