2 files changed, 25 insertions, 5 deletions
diff --git a/win/C#/Installer/Installer.nsi b/win/C#/Installer/Installer.nsi
index aa92ec015..c3013a88e 100644
--- a/win/C#/Installer/Installer.nsi
+++ b/win/C#/Installer/Installer.nsi
@@ -7,9 +7,9 @@
 ; Script generated by the HM NIS Edit Script Wizard.
 
 ; HM NIS Edit Wizard helper defines
-!define PRODUCT_NAME "Handbrake"
-!define PRODUCT_VERSION "SVN 3191 Snapshot"
-!define PRODUCT_VERSION_NUMBER "svn3191"
+!define PRODUCT_NAME "HandBrake"
+!define PRODUCT_VERSION "0.9.5"
+!define PRODUCT_VERSION_NUMBER "0.9.5"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -30,7 +30,7 @@ SetCompressor lzma
 !define MUI_UNICON "handbrakepineapple.ico"
 
 ; Welcome page
-!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_WELCOME 
 ; License page
 !insertmacro MUI_PAGE_LICENSE "doc\COPYING"
 ; Directory page
diff --git a/win/C#/Installer/MakeNightly.nsi.tmpl b/win/C#/Installer/MakeNightly.nsi.tmpl
index 7adbe40d7..de049fb4f 100644
--- a/win/C#/Installer/MakeNightly.nsi.tmpl
+++ b/win/C#/Installer/MakeNightly.nsi.tmpl
@@ -120,8 +120,9 @@ Section "Handbrake" SEC01
      SetDetailsView show
   ${EndIf}
   
-  
+  ; Install Files
   File "Handbrake.exe"
+  File "HandBrakeCLI.exe"
   CreateDirectory "$SMPROGRAMS\Handbrake"
   CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
   CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
@@ -134,6 +135,16 @@ Section "Handbrake" SEC01
   File "HandBrake.ApplicationServices.dll"
   File "Microsoft.WindowsAPICodePack.Shell.dll"
   File "Microsoft.WindowsAPICodePack.dll"
+
+  ; Copy the standard doc set into the doc folder
+  SetOutPath "$INSTDIR\doc"
+  SetOverwrite ifnewer
+  File "doc\AUTHORS"
+  File "doc\COPYING"
+  File "doc\CREDITS"
+  File "doc\NEWS"
+  File "doc\THANKS"
+  File "doc\TRANSLATIONS"
 SectionEnd
 
 Section -AdditionalIcons
@@ -166,13 +177,22 @@ Section Uninstall
   Delete "$INSTDIR\Interop.QTOLibrary.dll"
   Delete "$INSTDIR\Interop.QTOControlLib.dll"
   Delete "$INSTDIR\AxInterop.QTOControlLib.dll"
+  Delete "$INSTDIR\HandBrakeCLI.exe"
+  Delete "$INSTDIR\handbrakepineapple.ico"
   Delete "$INSTDIR\Handbrake.exe"
   Delete "$INSTDIR\Handbrake.exe.config"
   Delete "$INSTDIR\Growl.Connector.dll"
   Delete "$INSTDIR\Growl.CoreLibrary.dll"
+  Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
   Delete "$INSTDIR\HandBrake.ApplicationServices.dll"
   Delete "$INSTDIR\Microsoft.WindowsAPICodePack.Shell.dll"
   Delete "$INSTDIR\Microsoft.WindowsAPICodePack.dll"
+  Delete "$INSTDIR\doc\AUTHORS"
+  Delete "$INSTDIR\doc\COPYING"
+  Delete "$INSTDIR\doc\CREDITS"
+  Delete "$INSTDIR\doc\NEWS"
+  Delete "$INSTDIR\doc\THANKS"
+  Delete "$INSTDIR\doc\TRANSLATIONS"
   RMDir  "$INSTDIR"
   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
   Delete "$DESKTOP\Handbrake.lnk"