update .nsi for rsp

win32/nsi/mt-daapd-example.conf

@@ -1,13 +1,8 @@
-# $Id$
+# This is the Firefly Media Server config file.
 #
-# This is the mt-daapd config file.
+# Note that any changes made to this file will require the server to be
+# shut down and restarted
 #
-# If you have problems or questions with the format of this file,
-# direct your questions to rpedde@users.sourceforge.net.
-#
-# You can also check the website at http://mt-daapd.sourceforge.net,
-# as there is a growing documentation library there, peer-supported
-# forums and possibly more.
 #
 
 
@@ -41,7 +36,7 @@ port=9999
 # This is the password to the administrative pages
 #
 
-admin_pw=mt-daapd
+admin_pw=firefly
 
 
 #
@@ -50,8 +45,9 @@ admin_pw=mt-daapd
 # This is what kind of backend database to store the song
 # info in.  Valid choices are "sqlite" and "sqlite3".
 #
+# sqlite seems to be more stable.
 
-db_type=sqlite3
+db_type=sqlite
 
 #
 # db_parms
@@ -85,7 +81,7 @@ mp3_dir=c:\mp3
 # exported via DAAP.  Also know as "What shows up in iTunes".
 #
 
-servername=mt-daapd
+servername=Firefly Media Server
 
 #
 # runas (required)
@@ -220,7 +216,7 @@ extensions=.mp3,.m4a,.m4p
 #
 #
 
-#rescan_interval 300
+#rescan_interval = 300
 
 # always_scan
 #
@@ -231,7 +227,7 @@ extensions=.mp3,.m4a,.m4p
 # 24x7.  Forcing a scan through the web interface will always work
 # though, even if no users are connected.
 
-# always_scan 0
+# always_scan = 0
 
 #
 # process_m3u
@@ -247,7 +243,7 @@ extensions=.mp3,.m4a,.m4p
 # I'm not sure "unixly" is a word, but you get the idea.
 #
 
-# process_m3u 0
+process_m3u = 1
 
 #
 # scan_type
@@ -292,6 +288,9 @@ scan_type=2
 
 # compress 0
 
+[plugins]
+plugin_dir = .
+plugins = rsp.dll
 
 
 

win32/nsi/mt-daapd.nsi

@@ -2,16 +2,21 @@
 ; Script generated by the HM NIS Edit Script Wizard.
 
 ; HM NIS Edit Wizard helper defines
-!define PRODUCT_NAME "mt-daapd"
-!define PRODUCT_SERVICE "Multi-Threaded DAAP Daemon"
+!define PRODUCT_NAME "Firefly Media Server"
+!define PRODUCT_SERVICE "Firefly Media Server"
 !define /date DATEVER "%Y%m%d"
-!define PRODUCT_VERSION "cvs-${DATEVER}"
+!define PRODUCT_VERSION "Beta 1"
 !define PRODUCT_PUBLISHER "Ron Pedde"
-!define PRODUCT_WEB_SITE "http://www.mt-daapd.org"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\mt-daapd.exe"
+!define PRODUCT_WEB_SITE "http://www.fireflymediaserver.org"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\firefly.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 
+!define PROJROOT "..\..\.."
+!define MTD_SOURCE "${PROJROOT}\mt-daapd\win32\Release"
+!define DLL_SOURCE "${PROJROOT}\win32\dll"
+!define ADMIN_ROOT "${PROJROOT}\mt-daapd\admin-root"
+
 ; MUI 1.67 compatible ------
 !include "MUI.nsh"
 
@@ -24,7 +29,7 @@
 !insertmacro MUI_PAGE_WELCOME
 ; License page
 !define MUI_PAGE_CUSTOMFUNCTION_LEAVE LicensePost
-!insertmacro MUI_PAGE_LICENSE "..\..\admin-root\gpl-license.txt"
+!insertmacro MUI_PAGE_LICENSE "${ADMIN_ROOT}\gpl-license.txt"
 ; Directory page
 !define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPre
 !define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShow
@@ -51,17 +56,12 @@
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "${PRODUCT_NAME}-${PRODUCT_VERSION}.exe"
-InstallDir "$PROGRAMFILES\mt-daapd"
+OutFile "${PRODUCT_NAME} (${PRODUCT_VERSION}).exe"
+InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
 ShowUnInstDetails show
 
-!define PROJROOT "..\..\.."
-!define MTD_SOURCE "${PROJROOT}\mt-daapd\win32\Release"
-!define DLL_SOURCE "${PROJROOT}\win32\dll"
-!define ADMIN_ROOT "${PROJROOT}\mt-daapd\admin-root"
-
 Section -Pre
   nsSCM::QueryStatus "Bonjour Service"
   Pop $0
@@ -77,12 +77,13 @@ SectionEnd
 Section "MainSection" SEC01
   SetOutPath "$2"
   SetOverwrite ifnewer
-  File "${MTD_SOURCE}\mt-daapd.exe"
+  File /oname=firefly.exe "${MTD_SOURCE}\mt-daapd.exe" 
   File "${DLL_SOURCE}\gnu_regex.dll"
   File "${DLL_SOURCE}\pthreadVC2.dll"
   File "${DLL_SOURCE}\sqlite.dll"
   File "${DLL_SOURCE}\sqlite3.dll"
   File "${DLL_SOURCE}\zlib1.dll"
+  File "..\Release\rsp.dll"
 
   SetOutPath "$2\admin-root"
   File "${ADMIN_ROOT}\thanks.html"
@@ -126,7 +127,7 @@ Section "MainSection" SEC01
   File "${ADMIN_ROOT}\lib-js\script.aculo.us\slider.js"
   File "${ADMIN_ROOT}\lib-js\script.aculo.us\unittest.js"
   SetOutPath "$2"
-  File "mt-daapd-example.conf"
+  File "mt-daapd-example.conf" 
   IfFileExists "$2\mt-daapd.conf" HasConf
   SetOverwrite off
   CopyFiles "$2\mt-daapd-example.conf" "$2\mt-daapd.conf"
@@ -137,11 +138,11 @@ SectionEnd
 
 Section -AdditionalIcons
   WriteIniStr "$2\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
-  CreateDirectory "$SMPROGRAMS\mt-daapd"
-  CreateShortCut "$SMPROGRAMS\mt-daapd\Website.lnk" "$2\${PRODUCT_NAME}.url"
-  CreateShortCut "$SMPROGRAMS\mt-daapd\Uninstall.lnk" "$2\uninst.exe"
-  CreateShortCut "$SMPROGRAMS\mt-daapd\Debug Mode.lnk" "$2\mt-daapd.exe" "-d9 -f"
-  CreateShortCut "$SMPROGRAMS\mt-daapd\Config File.lnk" "notepad.exe" "$2\mt-daapd.conf"
+  CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$2\${PRODUCT_NAME}.url"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$2\uninst.exe"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Debug Mode.lnk" "$2\firefly.exe" "-d9 -f"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Configure Media Server.lnk" "notepad.exe" "$2\mt-daapd.conf"
 SectionEnd
 
 Section -Post
@@ -155,7 +156,7 @@ Section -Post
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
 ;  ExecWait "$2\mt-daapd.exe -i"
 
-  nsSCM::Install "${PRODUCT_NAME}" "${PRODUCT_SERVICE}" 16 2 "$2\mt-daapd.exe" "" "Bonjour Service" "" ""
+  nsSCM::Install "${PRODUCT_NAME}" "${PRODUCT_SERVICE}" 16 2 "$2\firefly.exe" "" "Bonjour Service" "" ""
   Pop $0
   Pop $1
 
@@ -228,9 +229,10 @@ SaveInstallDir:
   Goto EndDirectoryLeave
 
 SaveMusicDir:
-  Push $INSTDIR
-  Call GetParent
-  Pop $3
+;  Push $INSTDIR
+;  Call GetParent
+;  Pop $3
+  StrCpy $3 $INSTDIR
 
 EndDirectoryLeave:
 FunctionEnd
@@ -349,6 +351,9 @@ Section Uninstall
   Delete "$INSTDIR\sqlite3.dll"
   Delete "$INSTDIR\mt-daapd.conf"
   Delete "$INSTDIR\zlib1.dll"
+  Delete "$INSTDIR\rsp.dll"
+  Delete "$INSTDIR\songs.db"
+  Delete "$INSTDIR\songs3.db"
   Delete "$INSTDIR\mt-daapd-example.conf"
   Delete "$INSTDIR\admin-root\applet.html"
   Delete "$INSTDIR\admin-root\aspl-license.html"
@@ -391,14 +396,15 @@ Section Uninstall
   RMDir  "$INSTDIR\admin-root\lib-js"
   RMDir  "$INSTDIR\admin-root"
 
-  Delete "$INSTDIR\mt-daapd.exe"
+  Delete "$INSTDIR\firefly.exe"
 
-  Delete "$SMPROGRAMS\mt-daapd\Uninstall.lnk"
-  Delete "$SMPROGRAMS\mt-daapd\Website.lnk"
-  Delete "$SMPROGRAMS\mt-daapd\Config File.lnk"
-  Delete "$SMPROGRAMS\mt-daapd\Debug Mode.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Configure Media Server.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Debug Mode.lnk"
+  
 
-  RMDir "$SMPROGRAMS\mt-daapd"
+  RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
   RMDir "$INSTDIR"
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"