Added functionality to installer. Renamed and moved license file. Fixed installer header.bmp. Added dependencies.

Installer/mRemote.nsi

@@ -1,12 +1,28 @@
 !include "MUI.nsh"
 
-;Basic Config
-Name "mRemoteNG"
-OutFile bin\mRemoteNG-Installer.exe
-InstallDir $PROGRAMFILES\mRemoteNG
-InstallDirRegKey HKCU "Software\mRemoteNG" ""
+!DEFINE PRODUCT_VERSION_MAJOR 1
+!DEFINE PRODUCT_VERSION_MINOR 60
 
-;Design
+!DEFINE PRODUCT_VERSION "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}"
+!DEFINE PRODUCT_VERSION_LONG "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}.0.0"
+
+; Basic Config
+Name "mRemoteNG ${PRODUCT_VERSION}"
+OutFile "bin\mRemoteNG-Installer-${PRODUCT_VERSION}.exe"
+SetCompressor /SOLID lzma
+InstallDir "$PROGRAMFILES\mRemoteNG"
+InstallDirRegKey HKLM "Software\mRemoteNG" "InstallPath"
+
+; Version Information
+VIProductVersion ${PRODUCT_VERSION_LONG}
+!DEFINE LANG_ENGLISH "1033-English"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "mRemoteNG"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" ${PRODUCT_VERSION_LONG}
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright <20> 2007-2010 Felix Deimel, Riley McArdle"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "mRemoteNG ${PRODUCT_VERSION} Installer"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" ${PRODUCT_VERSION_LONG}
+
+; Design
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_BITMAP "header.bmp" ; optional
 !define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
@@ -18,64 +34,70 @@ InstallDirRegKey HKCU "Software\mRemoteNG" ""
 !define MUI_UNWELCOMEFINISHPAGE_BITMAP "welcomefinish.bmp"
 !define MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH
 
-;Install Pages
-!insertmacro MUI_PAGE_LICENSE ..\mRemoteV1\bin\Release\License.txt
+; Install Pages
+!insertmacro MUI_PAGE_LICENSE "..\COPYING.TXT"
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 
-;Finish Page
+; Finish Page
 !define MUI_FINISHPAGE_RUN_NOTCHECKED
-!define MUI_FINISHPAGE_RUN_Text "Start mRemoteNG"
+!define MUI_FINISHPAGE_RUN_Text "Lauch mRemoteNG Now"
 !define MUI_FINISHPAGE_RUN "$INSTDIR\mRemoteNG.exe"
 !insertmacro MUI_PAGE_FINISH
 
-;Uninstall Pages
+; Uninstall Pages
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
 
-;Set Language
+; Set Language
 !insertmacro MUI_LANGUAGE "English"
 
 Section ""
 	SetOutPath $INSTDIR
 
-	;AddFiles
-	File /r /x *.lic ..\mRemoteV1\bin\Release\*.*
+	; AddFiles
+	File /r /x "mRemoteNG.vshost.*" "..\mRemoteV1\bin\Release\*.*"
+	File /r "Dependencies\*.*"
+	File "..\*.txt"
 
-	;Uninstaller
+	; Uninstaller
 	WriteUninstaller "$INSTDIR\Uninstall.exe"
 
-	;Register ActiveX components
+	; Register ActiveX components
 	RegDLL "$INSTDIR\eolwtscom.dll"
 	RegDLL "$INSTDIR\scvncctrl.dll"
  
-	;Start Menu
+	; Start Menu
 	CreateDirectory "$SMPROGRAMS\mRemoteNG"
 	CreateShortCut "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk" "$INSTDIR\mRemoteNG.exe"
 	CreateShortCut "$SMPROGRAMS\mRemoteNG\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
 
-	;Registry
-	WriteRegStr HKCU "Software\mRemoteNG" "" $INSTDIR
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" DisplayName "mRemoteNG"
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" UninstallString '"$INSTDIR\Uninstall.exe"'
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" DisplayIcon "$INSTDIR\mRemoteNG.exe"
+	; Registry
+	WriteRegStr HKLM "Software\mRemoteNG" "InstallPath" $INSTDIR
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayName" "mRemoteNG"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayIcon" "$INSTDIR\mRemoteNG.exe"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "UninstallString" '"$INSTDIR\Uninstall.exe"'
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "VersionMajor" ${PRODUCT_VERSION_MAJOR}
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "VersionMinor" ${PRODUCT_VERSION_MINOR}
 SectionEnd
 
 Section "un.Uninstall"
-	;Unregister ActiveX components
+	; Unregister ActiveX components
 	UnregDLL "$INSTDIR\eolwtscom.dll"
 	UnregDLL "$INSTDIR\scvncctrl.dll"
 
-	;Delete Files
+	; Delete Files
 	RMDIR /r $INSTDIR
 
-	;Start Menu
+	; Start Menu
 	Delete "$SMPROGRAMS\mRemoteNG\mRemote.lnk"
 	Delete "$SMPROGRAMS\mRemoteNG\Uninstall.lnk"
 	RMDir "$SMPROGRAMS\mRemoteNG"
 
-	;Registry
+	; Registry
+	DeleteRegValue HKLM "Software\mRemoteNG" "InstallPath"
+	DeleteRegKey /ifempty HKLM "Software\mRemoteNG"
 	DeleteRegKey /ifempty HKCU "Software\mRemoteNG"
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG"
 SectionEnd

mRemoteV1/mRemoteV1.vbproj

@@ -594,9 +594,6 @@
     <Content Include="Help\Update.htm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="License.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Notes\Help.txt" />
     <Content Include="Notes\ICA.txt" />
     <Content Include="Notes\Misc.txt" />