merge ron-ssl branch back to trunk in preparation for windows cleanups, merge setup tweaks and credits language as well as update rend-posix from stable-aspl-free

win32/nsi/mt-daapd.nsi.templ

@@ -24,6 +24,10 @@ RequestExecutionLevel admin
 !define ADMIN_ROOT "${MTDROOT}\admin-root"
 !define REDIST_SOURCE "${PROJROOT}\win32\redist"
 
+!include "FileFunc.nsh"
+!insertmacro GetParameters
+!insertmacro GetOptionsS
+
 ; MUI 1.67 compatible ------
 !include "MUI.nsh"
 
@@ -224,6 +228,12 @@ NoProgramItems:
   File "${ADMIN_ROOT}\config.xml"
   File "${ADMIN_ROOT}\aspl-license.txt"
   File "${ADMIN_ROOT}\aspl-license.html"
+  File "${ADMIN_ROOT}\zlib-license.txt"
+  File "${ADMIN_ROOT}\zlib-license.html"
+  File "${ADMIN_ROOT}\xiph-license.txt"
+  File "${ADMIN_ROOT}\xiph-license.html"
+  File "${ADMIN_ROOT}\apache-2.0.txt"
+  File "${ADMIN_ROOT}\apache-2.0.html"
   File "${ADMIN_ROOT}\applet.html"
   File "${ADMIN_ROOT}\spinner.gif"
   File "${ADMIN_ROOT}\spinner_stopped.gif"
@@ -334,9 +344,15 @@ Section -Post
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
   
-  WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "FireflyShell" '"$2\FireflyShell.exe" -q'
   DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "FireflyShell" 
 
+  ${GetParameters} $R0
+  ClearErrors
+  ${GetOptionsS} $R0 "/N" $R1
+  
+  IfErrors 0 +2                    ; Skip the write if we have the /N option
+  WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "FireflyShell" '"$2\FireflyShell.exe" -q'
+
 ;  ExecWait "$2\mt-daapd.exe -i"
 
   nsSCM::Install "${PRODUCT_NAME}" "${PRODUCT_SERVICE}" 16 2 "$2\firefly.exe" "" "Bonjour Service" "" ""
@@ -348,9 +364,23 @@ Section -Post
   MessageBox MB_OK "Error installing service: $1"
 
   lbl_install_success:
-  ExecWait 'netsh firewall add allowedprogram "$2\firefly.exe" "${PRODUCT_NAME}" enable'  
-
+;  ExecWait 'netsh firewall add allowedprogram "$2\firefly.exe" "${PRODUCT_NAME}" enable'  
+; Use the SimpleFC plugin
+ 
+  SimpleFC::IsFirewallServiceRunning
+  Pop $0
+  Pop $1
+  
+  intcmp $1 0 lbl_no_fw     ; if 0, then skip fw config
+  SimpleFC::AddApplication "Firefly Media Server" "$2\Firefly.exe" 0 2 "" 1
+  
+ lbl_no_fw:
   nsSCM::Start "${PRODUCT_NAME}"
+  ${GetParameters} $R0
+  ClearErrors
+  ${GetOptionsS} $R0 "/N" $R1
+  
+  IfErrors 0 +2                    ; Skip the run if we have the /N option
   Exec '"$2\FireflyShell.exe" -q'
 SectionEnd
 
@@ -371,6 +401,7 @@ Function .onInit
   StrCpy $INSTDIR "$PROGRAMFILES\${PRODUCT_NAME}"
   StrCpy $2 "$PROGRAMFILES\${PRODUCT_NAME}"
   StrCpy $3 "$DOCUMENTS\My Music"
+  IfSilent lbl_skip_lang
   
   Push ""
   Push ${LANG_ENGLISH}
@@ -393,6 +424,9 @@ Function .onInit
   Pop $LANGUAGE
   StrCmp $LANGUAGE "cancel" 0 +2
   Abort
+  
+  lbl_skip_lang:
+  
 FunctionEnd
 
 Function LicensePost
@@ -505,7 +539,6 @@ Function GetParent
      
 FunctionEnd
 
-
 Function GetRoot
   Exch $0
   Push $1

win32/versionize.bat

@@ -13,3 +13,7 @@ echo Fixing version info...
 %SUBWC% %0\..\.. %0\..\FireflyShell\version.h.templ %0\..\FireflyShell\version.h
 %SUBWC% %0\..\.. %0\..\ssc-wma\ssc-wma.rc.templ %0\..\ssc-wma\ssc-wma.rc
 %SUBWC% %0\..\.. %0\..\out-daap\out-daap.rc.templ %0\..\out-daap\out-daap.rc
+
+if exist %0\..\do_sig.cmd.templ %SUBWC% %0\..\.. %0\..\do_sig.cmd.templ %0\..\do_sig.cmd
+
+