From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PATCH v2 13/23] buildsys: The NSIS Windows build requires the documentation installed
Date: Wed, 17 Jul 2019 14:43:25 +0100 [thread overview]
Message-ID: <20190717134335.15351-14-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org>
From: Philippe Mathieu-Daudé <philmd@redhat.com>
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é <philmd@redhat.com>
Message-Id: <20190715174817.18981-7-philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index f9791dcb827..5a462629370 100644
--- a/Makefile
+++ b/Makefile
@@ -1075,7 +1075,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
next prev parent reply other threads:[~2019-07-17 13:52 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-17 13:43 [Qemu-devel] [PATCH v2 00/23] testing/next for 4.1-rc2 (win, travis, iotests) Alex Bennée
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 01/23] archive-source: also create a stash for submodules Alex Bennée
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 02/23] tests/docker: add test-misc for building tools & docs Alex Bennée
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 03/23] tests/docker: Install Sphinx in the Ubuntu images Alex Bennée
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 04/23] tests/docker: Install Sphinx in the Fedora image Alex Bennée
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 05/23] tests/docker: Install Ubuntu images noninteractively Alex Bennée
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 06/23] tests/migration-test: don't spam the logs when we fail Alex Bennée
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 07/23] tests/dockerfiles: update the win cross builds to stretch Alex Bennée
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 08/23] shippable: re-enable the windows cross builds Alex Bennée
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 09/23] tests/docker: Install Sphinx in the Debian images Alex Bennée
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 10/23] tests/docker: Install the NSIS tools in the MinGW capable images Alex Bennée
2019-07-17 13:43 ` [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 13:43 ` [Qemu-devel] [PATCH v2 12/23] tests/docker: Install texinfo in the Fedora image Alex Bennée
2019-07-17 13:43 ` Alex Bennée [this message]
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 14/23] buildsys: The NSIS Windows build requires qemu-nsis.bmp installed Alex Bennée
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 15/23] tests/docker: Let the test-mingw test generate a NSIS installer Alex Bennée
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 16/23] NSIS: Add missing firmware blobs Alex Bennée
2019-07-17 14:47 ` Philippe Mathieu-Daudé
2019-07-17 18:23 ` Stefan Weil
2019-07-22 20:06 ` Philippe Mathieu-Daudé
2019-07-23 5:33 ` Stefan Weil
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 17/23] hw/i386: also turn off VMMOUSE is VMPORT is disabled Alex Bennée
2019-07-17 16:02 ` Thomas Huth
2019-07-22 20:02 ` Philippe Mathieu-Daudé
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 18/23] travis: enable travis_retry for check phase Alex Bennée
2019-07-22 20:01 ` Philippe Mathieu-Daudé
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 19/23] tests/docker: invoke the DEBUG shell with --noprofile/--norc Alex Bennée
2019-07-23 7:03 ` Philippe Mathieu-Daudé
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 20/23] tests/qemu-iotests/check: Allow tests without groups Alex Bennée
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 21/23] tests/qemu-iotests/group: Remove some more tests from the "auto" group Alex Bennée
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 22/23] tests: Run the iotests during "make check" again Alex Bennée
2019-07-22 19:53 ` Philippe Mathieu-Daudé
2019-07-23 7:20 ` [Qemu-devel] make vm-build-openbsd (was: Re: [PATCH v2 22/23] tests: Run the iotests during "make check" again) Thomas Huth
2019-07-23 8:58 ` Thomas Huth
2019-08-02 14:28 ` Gerd Hoffmann
2019-08-02 14:44 ` Thomas Huth
2019-07-23 9:30 ` [Qemu-devel] [PATCH v2 22/23] tests: Run the iotests during "make check" again Thomas Huth
2019-07-17 13:43 ` [Qemu-devel] [PATCH v2 23/23] gitlab-ci: Remove qcow2 tests that are handled by "make check" already Alex Bennée
2019-07-22 18:29 ` [Qemu-devel] [PATCH v2 00/23] testing/next for 4.1-rc2 (win, travis, iotests) Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190717134335.15351-14-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).