diff mbox series

nsis: adjust for new MinGW paths

Message ID 20210121134813.1002946-1-pbonzini@redhat.com (mailing list archive)
State New, archived
Headers show
Series nsis: adjust for new MinGW paths | expand

Commit Message

Paolo Bonzini Jan. 21, 2021, 1:48 p.m. UTC 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 qemu.nsi | 42 ++++--------------------------------------
 1 file changed, 4 insertions(+), 38 deletions(-)

Comments

Philippe Mathieu-Daudé Jan. 25, 2021, 4:12 p.m. UTC | #1 
Forgot to Cc the maintainer, doing it now:

./scripts/get_maintainer.pl -f qemu.nsi
Stefan Weil <sw@weilnetz.de> (maintainer:W32, W64)

On 1/21/21 2:48 PM, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  qemu.nsi | 42 ++++--------------------------------------
>  1 file changed, 4 insertions(+), 38 deletions(-)
> 
> diff --git a/qemu.nsi b/qemu.nsi
> index 1a0112265b..c3df8c9d3b 100644
> --- a/qemu.nsi
> +++ b/qemu.nsi
> @@ -35,11 +35,6 @@
>  !define OUTFILE "qemu-setup.exe"
>  !endif
>  
> -; Optionally install documentation.
> -!ifndef CONFIG_DOCUMENTATION
> -!define CONFIG_DOCUMENTATION
> -!endif
> -
>  ; Use maximum compression.
>  SetCompressor /SOLID lzma
>  
> @@ -116,26 +111,13 @@ Section "${PRODUCT} (required)"
>      ; Set output path to the installation directory.
>      SetOutPath "$INSTDIR"
>  
> -    File "${SRCDIR}\Changelog"
>      File "${SRCDIR}\COPYING"
>      File "${SRCDIR}\COPYING.LIB"
>      File "${SRCDIR}\README.rst"
>      File "${SRCDIR}\VERSION"
>  
> -    File "${BINDIR}\*.bmp"
> -    File "${BINDIR}\*.bin"
> -    File "${BINDIR}\*.dtb"
> -    File "${BINDIR}\*.fd"
> -    File "${BINDIR}\*.img"
> -    File "${BINDIR}\*.lid"
> -    File "${BINDIR}\*.ndrv"
> -    File "${BINDIR}\*.rom"
> -    File "${BINDIR}\openbios-*"
> -
>      File /r "${BINDIR}\keymaps"
> -!ifdef CONFIG_GTK
>      File /r "${BINDIR}\share"
> -!endif
>  
>  !ifdef W64
>      SetRegView 64
> @@ -176,21 +158,11 @@ SectionEnd
>  
>  !ifdef CONFIG_DOCUMENTATION
>  Section "Documentation" SectionDoc
> -    SetOutPath "$INSTDIR"
> -    File "${BINDIR}\index.html"
> -    SetOutPath "$INSTDIR\interop"
> -    FILE /r "${BINDIR}\interop\*.*"
> -    SetOutPath "$INSTDIR\specs"
> -    FILE /r "${BINDIR}\specs\*.*"
> -    SetOutPath "$INSTDIR\system"
> -    FILE /r "${BINDIR}\system\*.*"
> -    SetOutPath "$INSTDIR\tools"
> -    FILE /r "${BINDIR}\tools\*.*"
> -    SetOutPath "$INSTDIR\user"
> -    FILE /r "${BINDIR}\user\*.*"
> +    SetOutPath "$INSTDIR\doc"
> +    File /r "${BINDIR}\doc"
>      SetOutPath "$INSTDIR"
>      CreateDirectory "$SMPROGRAMS\${PRODUCT}"
> -    CreateShortCut "$SMPROGRAMS\${PRODUCT}\User Documentation.lnk" "$INSTDIR\index.html" "" "$INSTDIR\index.html" 0
> +    CreateShortCut "$SMPROGRAMS\${PRODUCT}\User Documentation.lnk" "$INSTDIR\doc\index.html" "" "$INSTDIR\doc\index.html" 0
>  SectionEnd
>  !endif
>  
> @@ -238,13 +210,7 @@ Section "Uninstall"
>      Delete "$INSTDIR\qemu-io.exe"
>      Delete "$INSTDIR\qemu.exe"
>      Delete "$INSTDIR\qemu-system-*.exe"
> -    Delete "$INSTDIR\index.html"
> -    RMDir /r "$INSTDIR\interop"
> -    RMDir /r "$INSTDIR\specs"
> -    RMDir /r "$INSTDIR\system"
> -    RMDir /r "$INSTDIR\tools"
> -    RMDir /r "$INSTDIR\user"
> -    RMDir /r "$INSTDIR\keymaps"
> +    RMDir /r "$INSTDIR\doc"
>      RMDir /r "$INSTDIR\share"
>      ; Remove generated files
>      Delete "$INSTDIR\stderr.txt"
>
diff mbox series

Patch

diff --git a/qemu.nsi b/qemu.nsi
index 1a0112265b..c3df8c9d3b 100644
--- a/qemu.nsi
+++ b/qemu.nsi
@@ -35,11 +35,6 @@ 
 !define OUTFILE "qemu-setup.exe"
 !endif
 
-; Optionally install documentation.
-!ifndef CONFIG_DOCUMENTATION
-!define CONFIG_DOCUMENTATION
-!endif
-
 ; Use maximum compression.
 SetCompressor /SOLID lzma
 
@@ -116,26 +111,13 @@  Section "${PRODUCT} (required)"
     ; Set output path to the installation directory.
     SetOutPath "$INSTDIR"
 
-    File "${SRCDIR}\Changelog"
     File "${SRCDIR}\COPYING"
     File "${SRCDIR}\COPYING.LIB"
     File "${SRCDIR}\README.rst"
     File "${SRCDIR}\VERSION"
 
-    File "${BINDIR}\*.bmp"
-    File "${BINDIR}\*.bin"
-    File "${BINDIR}\*.dtb"
-    File "${BINDIR}\*.fd"
-    File "${BINDIR}\*.img"
-    File "${BINDIR}\*.lid"
-    File "${BINDIR}\*.ndrv"
-    File "${BINDIR}\*.rom"
-    File "${BINDIR}\openbios-*"
-
     File /r "${BINDIR}\keymaps"
-!ifdef CONFIG_GTK
     File /r "${BINDIR}\share"
-!endif
 
 !ifdef W64
     SetRegView 64
@@ -176,21 +158,11 @@  SectionEnd
 
 !ifdef CONFIG_DOCUMENTATION
 Section "Documentation" SectionDoc
-    SetOutPath "$INSTDIR"
-    File "${BINDIR}\index.html"
-    SetOutPath "$INSTDIR\interop"
-    FILE /r "${BINDIR}\interop\*.*"
-    SetOutPath "$INSTDIR\specs"
-    FILE /r "${BINDIR}\specs\*.*"
-    SetOutPath "$INSTDIR\system"
-    FILE /r "${BINDIR}\system\*.*"
-    SetOutPath "$INSTDIR\tools"
-    FILE /r "${BINDIR}\tools\*.*"
-    SetOutPath "$INSTDIR\user"
-    FILE /r "${BINDIR}\user\*.*"
+    SetOutPath "$INSTDIR\doc"
+    File /r "${BINDIR}\doc"
     SetOutPath "$INSTDIR"
     CreateDirectory "$SMPROGRAMS\${PRODUCT}"
-    CreateShortCut "$SMPROGRAMS\${PRODUCT}\User Documentation.lnk" "$INSTDIR\index.html" "" "$INSTDIR\index.html" 0
+    CreateShortCut "$SMPROGRAMS\${PRODUCT}\User Documentation.lnk" "$INSTDIR\doc\index.html" "" "$INSTDIR\doc\index.html" 0
 SectionEnd
 !endif
 
@@ -238,13 +210,7 @@  Section "Uninstall"
     Delete "$INSTDIR\qemu-io.exe"
     Delete "$INSTDIR\qemu.exe"
     Delete "$INSTDIR\qemu-system-*.exe"
-    Delete "$INSTDIR\index.html"
-    RMDir /r "$INSTDIR\interop"
-    RMDir /r "$INSTDIR\specs"
-    RMDir /r "$INSTDIR\system"
-    RMDir /r "$INSTDIR\tools"
-    RMDir /r "$INSTDIR\user"
-    RMDir /r "$INSTDIR\keymaps"
+    RMDir /r "$INSTDIR\doc"
     RMDir /r "$INSTDIR\share"
     ; Remove generated files
     Delete "$INSTDIR\stderr.txt"