MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-20 18:54:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make title not include version number, fix error overwriting message on firefly.exe, add .wma to extensions, add manifest for xp style controls.

Browse Source
This commit is contained in:
Ron Pedde 2006-06-06 05:22:25 +00:00
parent b925279bb2
commit 1fc3d376fc
1 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
win32/nsi/mt-daapd.nsi.templ
View File

@ -57,7 +57,7 @@
; MUI end ------ ; MUI end ------
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" Name "${PRODUCT_NAME}"
Icon "..\ff.ico" Icon "..\ff.ico"
UninstallIcon "..\ff.ico" UninstallIcon "..\ff.ico"
OutFile "${PRODUCT_NAME} (${PRODUCT_VERSION}).exe" OutFile "${PRODUCT_NAME} (${PRODUCT_VERSION}).exe"
@ -67,6 +67,22 @@ ShowInstDetails show
ShowUnInstDetails show ShowUnInstDetails show
Section -Pre Section -Pre
!include WinMessages.nsh
FindWindow $0 "" "FireflyShellNotifyIconHidden"
SendMessage $0 ${WM_CLOSE} 0 0
nsSCM::QueryStatus "Bonjour Service"
Pop $0
Pop $1
StrCmp $0 "success" lbl_got_bonjour
MessageBox MB_OK "Bonjour for Windows service not found. Please install Apple's Bonjour for Windows."
Quit
lbl_got_bonjour:
IntOp $9 0 + 0
nsSCM::QueryStatus "${PRODUCT_NAME}" nsSCM::QueryStatus "${PRODUCT_NAME}"
Pop $0 Pop $0
Pop $1 Pop $1
@ -93,21 +109,13 @@ Section -Pre
lbl_continue: lbl_continue:
; should really loop until service stops... ; should really loop until service stops...
DetailPrint "Sent stop message... waiting for stop" DetailPrint "Sent stop message... waiting for stop"
Sleep 5000
Sleep 1000
Delete $2\firefly.exe
IntOp $9 $9 + 1
IntCmp $9 10 +1 +2
IfErrors lbl_continue
!include WinMessages.nsh
FindWindow $0 "" "FireflyShellNotifyIconHidden"
SendMessage $0 ${WM_CLOSE} 0 0
nsSCM::QueryStatus "Bonjour Service"
Pop $0
Pop $1
StrCmp $0 "success" lbl_got_bonjour
MessageBox MB_OK "Bonjour for Windows service not found. Please install Apple's Bonjour for Windows."
Quit
lbl_got_bonjour:
SectionEnd SectionEnd
@ -116,6 +124,7 @@ Section "MainSection" SEC01
SetOverwrite ifnewer SetOverwrite ifnewer
File /oname=firefly.exe "${MTD_SOURCE}\mt-daapd.exe" File /oname=firefly.exe "${MTD_SOURCE}\mt-daapd.exe"
File "${CONFIG_SOURCE}\FireflyShell.exe" File "${CONFIG_SOURCE}\FireflyShell.exe"
File "${CONFIG_SOURCE}\..\FireflyShell.exe.manifest"
File "${DLL_SOURCE}\gnu_regex.dll" File "${DLL_SOURCE}\gnu_regex.dll"
File "${DLL_SOURCE}\pthreadVC2.dll" File "${DLL_SOURCE}\pthreadVC2.dll"
File "${DLL_SOURCE}\sqlite.dll" File "${DLL_SOURCE}\sqlite.dll"
@ -203,6 +212,15 @@ HasConf:
WriteINIStr "$2\mt-daapd.conf" "general" "logfile" "firefly.log" WriteINIStr "$2\mt-daapd.conf" "general" "logfile" "firefly.log"
logfile_skip: logfile_skip:
; Check for default exts
ReadINIStr $0 "$2\mt-daapd.conf" "general" "extensions"
StrCmp $0 ".mp3,.m4a,.m4p" ext_set ext_skip
ext_set:
WriteINIStr "$2\mt-daapd.conf" "general" "extensions" ".mp3,.m4a,.m4p,.wma"
ext_skip:
SetAutoClose False SetAutoClose False
SectionEnd SectionEnd
@ -494,6 +512,7 @@ Section Uninstall
Delete "$INSTDIR\firefly.exe" Delete "$INSTDIR\firefly.exe"
Delete "$INSTDIR\FireflyShell.exe" Delete "$INSTDIR\FireflyShell.exe"
Delete "$INSTDIR\FireflyShell.exe.manifest"
Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
Delete "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" Delete "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk"