* [PATCH for-5.2] meson: Fix argument for makensis (build regression)
@ 2020-11-17 19:06 Stefan Weil
2020-11-18 7:12 ` Marc-André Lureau
2020-11-18 8:58 ` Paolo Bonzini
0 siblings, 2 replies; 3+ messages in thread
From: Stefan Weil @ 2020-11-17 19:06 UTC (permalink / raw)
To: qemu-devel, Paolo Bonzini, Marc-André Lureau,
Daniel P . Berrangé
Cc: Stefan Weil
`make installer` with a DLL directory was broken.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
scripts/nsis.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/nsis.py b/scripts/nsis.py
index e1c409344e..5135a05831 100644
--- a/scripts/nsis.py
+++ b/scripts/nsis.py
@@ -65,7 +65,7 @@ def main():
dlldir = "w64"
makensis += ["-DW64"]
if os.path.exists(os.path.join(args.srcdir, "dll")):
- makensis += "-DDLLDIR={0}/dll/{1}".format(args.srcdir, dlldir)
+ makensis += ["-DDLLDIR={0}/dll/{1}".format(args.srcdir, dlldir)]
makensis += ["-DOUTFILE=" + args.outfile] + args.nsisargs
subprocess.run(makensis)
--
2.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH for-5.2] meson: Fix argument for makensis (build regression)
2020-11-17 19:06 [PATCH for-5.2] meson: Fix argument for makensis (build regression) Stefan Weil
@ 2020-11-18 7:12 ` Marc-André Lureau
2020-11-18 8:58 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Marc-André Lureau @ 2020-11-18 7:12 UTC (permalink / raw)
To: Stefan Weil; +Cc: Paolo Bonzini, Daniel P . Berrangé, qemu-devel
On Tue, Nov 17, 2020 at 11:15 PM Stefan Weil <sw@weilnetz.de> wrote:
>
> `make installer` with a DLL directory was broken.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> scripts/nsis.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/nsis.py b/scripts/nsis.py
> index e1c409344e..5135a05831 100644
> --- a/scripts/nsis.py
> +++ b/scripts/nsis.py
> @@ -65,7 +65,7 @@ def main():
> dlldir = "w64"
> makensis += ["-DW64"]
> if os.path.exists(os.path.join(args.srcdir, "dll")):
> - makensis += "-DDLLDIR={0}/dll/{1}".format(args.srcdir, dlldir)
> + makensis += ["-DDLLDIR={0}/dll/{1}".format(args.srcdir, dlldir)]
>
> makensis += ["-DOUTFILE=" + args.outfile] + args.nsisargs
> subprocess.run(makensis)
> --
> 2.29.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH for-5.2] meson: Fix argument for makensis (build regression)
2020-11-17 19:06 [PATCH for-5.2] meson: Fix argument for makensis (build regression) Stefan Weil
2020-11-18 7:12 ` Marc-André Lureau
@ 2020-11-18 8:58 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2020-11-18 8:58 UTC (permalink / raw)
To: Stefan Weil, qemu-devel, Marc-André Lureau,
Daniel P . Berrangé
On 17/11/20 20:06, Stefan Weil wrote:
> `make installer` with a DLL directory was broken.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> scripts/nsis.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/nsis.py b/scripts/nsis.py
> index e1c409344e..5135a05831 100644
> --- a/scripts/nsis.py
> +++ b/scripts/nsis.py
> @@ -65,7 +65,7 @@ def main():
> dlldir = "w64"
> makensis += ["-DW64"]
> if os.path.exists(os.path.join(args.srcdir, "dll")):
> - makensis += "-DDLLDIR={0}/dll/{1}".format(args.srcdir, dlldir)
> + makensis += ["-DDLLDIR={0}/dll/{1}".format(args.srcdir, dlldir)]
>
> makensis += ["-DOUTFILE=" + args.outfile] + args.nsisargs
> subprocess.run(makensis)
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-18 9:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-17 19:06 [PATCH for-5.2] meson: Fix argument for makensis (build regression) Stefan Weil
2020-11-18 7:12 ` Marc-André Lureau
2020-11-18 8:58 ` Paolo Bonzini
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).