update windows installer to include version number

Author: robhagemans

packaging/windows/pcbasic.nsi

@@ -9,15 +9,15 @@
 ;Enter the windows uninstall reg sub key to add uninstall information to Add/Remove Programs also.
 
 !define INSTDIR_REG_ROOT "HKLM"
-!define INSTDIR_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\PC-BASIC"
+!define INSTDIR_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\PC-BASIC-1.2"
 
 
 ; multiuser, modern UI
 
 !define MULTIUSER_EXECUTIONLEVEL Highest
 !define MULTIUSER_MUI
 !define MULTIUSER_INSTALLMODE_COMMANDLINE
-!define MULTIUSER_INSTALLMODE_INSTDIR "PC-BASIC"
+!define MULTIUSER_INSTALLMODE_INSTDIR "PC-BASIC-1.2"
 !include "MultiUser.nsh"
 !include "MUI2.nsh"
 !include "AdvUninstLog.nsh"
@@ -27,7 +27,7 @@
 
 
 ;Name and file
-Name "PC-BASIC"
+Name "PC-BASIC 1.2"
 OutFile "pcbasic-win32.exe"
 
 !include LogicLib.nsh
@@ -36,7 +36,7 @@ OutFile "pcbasic-win32.exe"
 
 ;Start Menu Folder Page Configuration
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
-!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\PC-BASIC"
+!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\PC-BASIC-1.2"
 !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
 
 ;--------------------------------
@@ -81,7 +81,7 @@ Var UserShortcuts
 ;--------------------------------
 ;Installer Sections
 
-Section "PC-BASIC" SecDummy
+Section "PC-BASIC 1.2" SecDummy
     SetOutPath "$INSTDIR"
 
     !insertmacro UNINSTALL.LOG_OPEN_INSTALL
@@ -91,7 +91,7 @@ Section "PC-BASIC" SecDummy
     !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
 
     ;Store installation folder
-    WriteRegStr HKCU "Software\PC-BASIC" "" $INSTDIR
+    WriteRegStr HKCU "Software\PC-BASIC-1.2" "" $INSTDIR
 
     !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
 
@@ -103,15 +103,15 @@ Section "PC-BASIC" SecDummy
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\PC-BASIC.lnk" "$INSTDIR\pcbasic.exe"
 
     ; workaround as multiuser doesn't seem to get the right location for shortcuts if an admin user installs 'just for me'
-    WriteRegStr HKCU "Software\PC-BASIC" "Shortcuts" "$SMPROGRAMS\$StartMenuFolder"
+    WriteRegStr HKCU "Software\PC-BASIC-1.2" "Shortcuts" "$SMPROGRAMS\$StartMenuFolder"
 
     ; create link to ini file in current user's start menu
     SetShellVarContext "current"
     CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Settings.lnk" "$APPDATA\PCBASIC\PCBASIC.INI"
+    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Settings.lnk" "$APPDATA\PCBASIC-1.2\PCBASIC.INI"
 
     ; workaround as multiuser doesn't seem to get the right location for shortcuts if an admin user installs 'just for me'
-    WriteRegStr HKCU "Software\PC-BASIC" "UserShortcuts" "$SMPROGRAMS\$StartMenuFolder"
+    WriteRegStr HKCU "Software\PC-BASIC-1.2" "UserShortcuts" "$SMPROGRAMS\$StartMenuFolder"
 
     !insertmacro MUI_STARTMENU_WRITE_END
 SectionEnd
@@ -143,21 +143,21 @@ Section UnInstall
     !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
 
     ; workaround as multiuser doesn't seem to get the right location for shortcuts if an admin user installs 'just for me'
-    ReadRegStr $Shortcuts HKCU "Software\PC-BASIC" "Shortcuts"
+    ReadRegStr $Shortcuts HKCU "Software\PC-BASIC-1.2" "Shortcuts"
 
     Delete "$Shortcuts\PC-BASIC.lnk"
     Delete "$Shortcuts\Documentation.lnk"
     Delete "$Shortcuts\Uninstall.lnk"
     RMDir "$Shortcuts"
 
     ;
-    ReadRegStr $UserShortcuts HKCU "Software\PC-BASIC" "UserShortcuts"
+    ReadRegStr $UserShortcuts HKCU "Software\PC-BASIC-1.2" "UserShortcuts"
 
     Delete "$UserShortcuts\Settings.lnk"
     RMDir "$UserShortcuts"
 
-    DeleteRegKey HKCU "Software\PC-BASIC"
-;    DeleteRegKey /ifempty HKCU "Software\PC-BASIC"
+    DeleteRegKey HKCU "Software\PC-BASIC-1.2"
+;    DeleteRegKey /ifempty HKCU "Software\PC-BASIC-1.2"
 SectionEnd