Skip to content

Commit 70903cc

Browse files
committed
nsis: adjust for new MinGW paths
Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 3a489d3 commit 70903cc

File tree

1 file changed

+4
-38
lines changed

1 file changed

+4
-38
lines changed

qemu.nsi

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@
3535
!define OUTFILE "qemu-setup.exe"
3636
!endif
3737

38-
; Optionally install documentation.
39-
!ifndef CONFIG_DOCUMENTATION
40-
!define CONFIG_DOCUMENTATION
41-
!endif
42-
4338
; Use maximum compression.
4439
SetCompressor /SOLID lzma
4540

@@ -116,26 +111,13 @@ Section "${PRODUCT} (required)"
116111
; Set output path to the installation directory.
117112
SetOutPath "$INSTDIR"
118113

119-
File "${SRCDIR}\Changelog"
120114
File "${SRCDIR}\COPYING"
121115
File "${SRCDIR}\COPYING.LIB"
122116
File "${SRCDIR}\README.rst"
123117
File "${SRCDIR}\VERSION"
124118

125-
File "${BINDIR}\*.bmp"
126-
File "${BINDIR}\*.bin"
127-
File "${BINDIR}\*.dtb"
128-
File "${BINDIR}\*.fd"
129-
File "${BINDIR}\*.img"
130-
File "${BINDIR}\*.lid"
131-
File "${BINDIR}\*.ndrv"
132-
File "${BINDIR}\*.rom"
133-
File "${BINDIR}\openbios-*"
134-
135119
File /r "${BINDIR}\keymaps"
136-
!ifdef CONFIG_GTK
137120
File /r "${BINDIR}\share"
138-
!endif
139121

140122
!ifdef W64
141123
SetRegView 64
@@ -176,21 +158,11 @@ SectionEnd
176158

177159
!ifdef CONFIG_DOCUMENTATION
178160
Section "Documentation" SectionDoc
179-
SetOutPath "$INSTDIR"
180-
File "${BINDIR}\index.html"
181-
SetOutPath "$INSTDIR\interop"
182-
FILE /r "${BINDIR}\interop\*.*"
183-
SetOutPath "$INSTDIR\specs"
184-
FILE /r "${BINDIR}\specs\*.*"
185-
SetOutPath "$INSTDIR\system"
186-
FILE /r "${BINDIR}\system\*.*"
187-
SetOutPath "$INSTDIR\tools"
188-
FILE /r "${BINDIR}\tools\*.*"
189-
SetOutPath "$INSTDIR\user"
190-
FILE /r "${BINDIR}\user\*.*"
161+
SetOutPath "$INSTDIR\doc"
162+
File /r "${BINDIR}\doc"
191163
SetOutPath "$INSTDIR"
192164
CreateDirectory "$SMPROGRAMS\${PRODUCT}"
193-
CreateShortCut "$SMPROGRAMS\${PRODUCT}\User Documentation.lnk" "$INSTDIR\index.html" "" "$INSTDIR\index.html" 0
165+
CreateShortCut "$SMPROGRAMS\${PRODUCT}\User Documentation.lnk" "$INSTDIR\doc\index.html" "" "$INSTDIR\doc\index.html" 0
194166
SectionEnd
195167
!endif
196168

@@ -238,13 +210,7 @@ Section "Uninstall"
238210
Delete "$INSTDIR\qemu-io.exe"
239211
Delete "$INSTDIR\qemu.exe"
240212
Delete "$INSTDIR\qemu-system-*.exe"
241-
Delete "$INSTDIR\index.html"
242-
RMDir /r "$INSTDIR\interop"
243-
RMDir /r "$INSTDIR\specs"
244-
RMDir /r "$INSTDIR\system"
245-
RMDir /r "$INSTDIR\tools"
246-
RMDir /r "$INSTDIR\user"
247-
RMDir /r "$INSTDIR\keymaps"
213+
RMDir /r "$INSTDIR\doc"
248214
RMDir /r "$INSTDIR\share"
249215
; Remove generated files
250216
Delete "$INSTDIR\stderr.txt"

0 commit comments

Comments
 (0)