| Message ID | 20220422084611.1083806-1-sw@weilnetz.de |
|---|---|
| State | New |
| Headers | show |
| Series | nsis: Add missing tools to installer for Windows | expand |
On Fri, 22 Apr 2022 at 10:09, Stefan Weil <sw@weilnetz.de> wrote: > > Signed-off-by: Stefan Weil <sw@weilnetz.de> > --- > qemu.nsi | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/qemu.nsi b/qemu.nsi > index 564d617d11..f56a18901c 100644 > --- a/qemu.nsi > +++ b/qemu.nsi > @@ -142,8 +142,12 @@ SectionEnd > > Section "Tools" SectionTools > SetOutPath "$INSTDIR" > + File "${BINDIR}\qemu-edid.exe" > + File "${BINDIR}\qemu-ga.exe" > File "${BINDIR}\qemu-img.exe" > File "${BINDIR}\qemu-io.exe" > + File "${BINDIR}\qemu-nbd.exe" > + File "${BINDIR}\qemu-storage-daemon.exe" > SectionEnd Maybe it would be better to change this section to be created by the nsis.py script? I haven't looked at what exactly we end up with in the tempdir that that script's 'make install' creates, but it might be as simple as "put all the .exe files that aren't qemu-system-*.exe into a tools section that we write out to a nother .nsh include file". Scripting it would also let us handle the "build an installer on a --disable-tools config" case. thanks -- PMM
diff --git a/qemu.nsi b/qemu.nsi index 564d617d11..f56a18901c 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -142,8 +142,12 @@ SectionEnd Section "Tools" SectionTools SetOutPath "$INSTDIR" + File "${BINDIR}\qemu-edid.exe" + File "${BINDIR}\qemu-ga.exe" File "${BINDIR}\qemu-img.exe" File "${BINDIR}\qemu-io.exe" + File "${BINDIR}\qemu-nbd.exe" + File "${BINDIR}\qemu-storage-daemon.exe" SectionEnd SectionGroup "System Emulations" SectionSystem @@ -209,10 +213,7 @@ Section "Uninstall" Delete "$INSTDIR\*.ndrv" Delete "$INSTDIR\*.rom" Delete "$INSTDIR\openbios-*" - Delete "$INSTDIR\qemu-img.exe" - Delete "$INSTDIR\qemu-io.exe" - Delete "$INSTDIR\qemu.exe" - Delete "$INSTDIR\qemu-system-*.exe" + Delete "$INSTDIR\qemu-*.exe" RMDir /r "$INSTDIR\doc" RMDir /r "$INSTDIR\share" ; Remove generated files
Signed-off-by: Stefan Weil <sw@weilnetz.de> --- qemu.nsi | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)