[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH-for-4.1 v2 6/9] buildsys: The NSIS Windows build
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [RFC PATCH-for-4.1 v2 6/9] buildsys: The NSIS Windows build requires the documentation installed |
Date: |
Mon, 15 Jul 2019 19:48:13 +0200 |
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>
---
Not sure is this the only dependency missing, or this is the correct fix...
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 1fcbaed62c..f8dac48981 100644
--- a/Makefile
+++ b/Makefile
@@ -1073,7 +1073,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] [PATCH-for-4.1 v2 0/9] tests/docker: Debian & MXE fixes, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-devel] [NOTFORMERGE PATCH v2 1/9] tests/docker: Kludge to build the Fedora image, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-devel] [PATCH-for-4.1 v2 2/9] tests/docker: Install Sphinx in the Debian images, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-devel] [PATCH-for-4.1 v2 3/9] tests/docker: Install the NSIS tools in the MinGW capable images, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-devel] [PATCH-for-4.1 v2 4/9] tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-devel] [PATCH-for-4.1 v2 5/9] tests/docker: Install texinfo in the Fedora image, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-devel] [RFC PATCH-for-4.1 v2 6/9] buildsys: The NSIS Windows build requires the documentation installed,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH-for-4.1 v2 7/9] buildsys: The NSIS Windows build requires qemu-nsis.bmp installed, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-devel] [PATCH-for-4.1 v2 8/9] tests/docker: Let the test-mingw test generate a NSIS installer, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-devel] [PATCH-for-4.1 v2 9/9] NSIS: Add missing firmware blobs, Philippe Mathieu-Daudé, 2019/07/15
- Re: [Qemu-devel] [PATCH-for-4.1 v2 0/9] tests/docker: Debian & MXE fixes, Alex Bennée, 2019/07/16