qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Adam Baxter" <voltagex@voltagex.org>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Stefan Weil" <sw@weilnetz.de>,
	"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH 4/5] nsis: fix location of icons to be bundled in the installer
Date: Tue, 29 Jan 2019 11:39:20 +0000	[thread overview]
Message-ID: <20190129113921.21599-5-berrange@redhat.com> (raw)
In-Reply-To: <20190129113921.21599-1-berrange@redhat.com>

The bmp icon files no longer exist in the root of the installation
tree. Instead we must reference the new icons subdirectory location
introduced in

  commit a8260d3876389eb52ca5c62ed4d80cdb7e025c85
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   Thu Jan 10 12:00:45 2019 +0000

    ui: install logo icons to $prefix/share/icons

Reported-by: Adam Baxter <voltagex@voltagex.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 qemu.nsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qemu.nsi b/qemu.nsi
index 75f1608b9e..53fd974877 100644
--- a/qemu.nsi
+++ b/qemu.nsi
@@ -119,12 +119,12 @@ Section "${PRODUCT} (required)"
     File "${SRCDIR}\README"
     File "${SRCDIR}\VERSION"
 
-    File "${BINDIR}\*.bmp"
     File "${BINDIR}\*.bin"
     File "${BINDIR}\*.dtb"
     File "${BINDIR}\*.rom"
     File "${BINDIR}\openbios-*"
 
+    File /r "${BINDIR}\icons"
     File /r "${BINDIR}\keymaps"
 !ifdef CONFIG_GTK
     File /r "${BINDIR}\share"
@@ -206,7 +206,6 @@ Section "Uninstall"
     Delete "$INSTDIR\COPYING.LIB"
     Delete "$INSTDIR\README"
     Delete "$INSTDIR\VERSION"
-    Delete "$INSTDIR\*.bmp"
     Delete "$INSTDIR\*.bin"
     Delete "$INSTDIR\*.dll"
     Delete "$INSTDIR\*.dtb"
@@ -217,6 +216,7 @@ Section "Uninstall"
     Delete "$INSTDIR\qemu.exe"
     Delete "$INSTDIR\qemu-system-*.exe"
     Delete "$INSTDIR\qemu-doc.html"
+    RMDir /r "$INSTDIR\icons"
     RMDir /r "$INSTDIR\keymaps"
     RMDir /r "$INSTDIR\share"
     ; Remove generated files
-- 
2.20.1

  parent reply	other threads:[~2019-01-29 11:39 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-29 11:39 [Qemu-devel] [PATCH 0/5] misc fixes to deal with icon location changes Daniel P. Berrangé
2019-01-29 11:39 ` [Qemu-devel] [PATCH 1/5] nsis: don't install files into /tmp Daniel P. Berrangé
2019-01-29 21:07   ` Eric Blake
2019-02-01  7:28     ` Stefan Weil
2019-01-29 11:39 ` [Qemu-devel] [PATCH 2/5] make: don't insert a '/' after $(DESTDIR) Daniel P. Berrangé
2019-01-29 21:09   ` Eric Blake
2019-01-29 11:39 ` [Qemu-devel] [PATCH 3/5] nsis: ensure we always pass -W64 flag to nsis installer script Daniel P. Berrangé
2019-02-01  7:18   ` Stefan Weil
2019-01-29 11:39 ` Daniel P. Berrangé [this message]
2019-01-29 11:39 ` [Qemu-devel] [PATCH 5/5] configure: stop trying to link non-existant bmp file from bios dir Daniel P. Berrangé
2019-01-29 11:57   ` Peter Maydell
2019-02-01  7:52 ` [Qemu-devel] [PATCH 0/5] misc fixes to deal with icon location changes Stefan Weil
2019-02-01  9:23   ` Daniel P. Berrangé

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=20190129113921.21599-5-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=sw@weilnetz.de \
    --cc=voltagex@voltagex.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).