Installer improvements

kumir2.nsi

@@ -5,6 +5,7 @@
 #  OutFile "kumir2-...exe"
 #  Name "-2.x"
 #  InstallDir "$PROGRAMFILES\Kumir2x"
+#  !define VERSION_SUFFIX "master"
 !include nsis_version_info.nsh
 
 
@@ -69,15 +70,15 @@ Section "Kumir" Kumir
     
     Call RefreshShellIcons
 
-    CreateDirectory "$SMPROGRAMS\2"
-    CreateShortCut "$SMPROGRAMS\2\-.lnk" "$INSTDIR\bin\kumir2-classic.exe"
-    CreateShortCut "$SMPROGRAMS\2\   .lnk" "$INSTDIR\bin\kumir2-highgrade.exe"
-    CreateShortCut "$SMPROGRAMS\2\-.lnk" "$INSTDIR\bin\kumir2-ide.exe"
-    CreateShortCut "$SMPROGRAMS\2\  .lnk" "$INSTDIR\bin\kumir2-teacher.exe"
-    CreateShortCut "$SMPROGRAMS\2\ .lnk" "$INSTDIR\uninstall.exe"
+    CreateDirectory "$SMPROGRAMS\ ${VERSION_SUFFIX}"
+    CreateShortCut "$SMPROGRAMS\ ${VERSION_SUFFIX}\-.lnk" "$INSTDIR\bin\kumir2-classic.exe"
+    CreateShortCut "$SMPROGRAMS\ ${VERSION_SUFFIX}\   .lnk" "$INSTDIR\bin\kumir2-highgrade.exe"
+    CreateShortCut "$SMPROGRAMS\ ${VERSION_SUFFIX}\-.lnk" "$INSTDIR\bin\kumir2-ide.exe"
+    CreateShortCut "$SMPROGRAMS\ ${VERSION_SUFFIX}\  .lnk" "$INSTDIR\bin\kumir2-teacher.exe"
+    CreateShortCut "$SMPROGRAMS\ ${VERSION_SUFFIX}\ .lnk" "$INSTDIR\uninstall.exe"
     ; Uninstaller registration
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\kumir2" "DisplayName" "2"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\kumir2" "UninstallString" "$INSTDIR\uninstall.exe"
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\kumir_${VERSION_SUFFIX}" "DisplayName" " ${VERSION_SUFFIX}"
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\kumir_${VERSION_SUFFIX}" "UninstallString" "$INSTDIR\uninstall.exe"
 
     WriteUninstaller $INSTDIR\uninstall.exe
     
@@ -87,7 +88,7 @@ function un.onInit
 	SetShellVarContext all
  
 	#Verify the uninstaller - last chance to back out
-        MessageBox MB_OKCANCEL " 2?" IDOK next
+        MessageBox MB_OKCANCEL "  ${VERSION_SUFFIX}?" IDOK next
 		Abort
 	next:
 	
@@ -97,12 +98,12 @@ Section "uninstall"
 
     Delete /REBOOTOK "$INSTDIR\uninstall.exe"
     RMDir /r /REBOOTOK "$INSTDIR"
-    RMDir /r /REBOOTOK "$SMPROGRAMS\2"
+    RMDir /r /REBOOTOK "$SMPROGRAMS\ ${VERSION_SUFFIX}"
 
     DeleteRegKey HKCR ".kum"
     DeleteRegKey HKCR "ru.niisi.kumir2.program"
     DeleteRegKey HKCR ".kod"
     DeleteRegKey HKCR "ru.niisi.kumir2.bytecode"
-    DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\kumir2"
+    DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\kumir_${VERSION_SUFFIX}"
 
 SectionEnd

scripts/query_version_info.py

@@ -187,11 +187,13 @@ def nsis_include_file():
         data += "OutFile \"kumir2-"+version_name+"-install.exe\"\r\n"
         data += "Name \"Кумир "+version_name+"\"\r\n"
         data += "InstallDir \"$PROGRAMFILES\\Kumir-"+version_name+"\"\r\n"
+        data += "!define VERSION_SUFFIX \"" + version_name + "\"\r\n"
     else:
         branch, ghash = _split_into_branch_and_hash(version_name)
         data += "OutFile \"kumir2-" + branch + "-" + ghash + "-install.exe\"\r\n"
-        data += "Name \"Кумир2-" + version_name + "\"\r\n"
+        data += "Name \"Кумир 2.x-" + branch + "\"\r\n"
         data += "InstallDir \"$PROGRAMFILES\\Kumir2x-" + branch + "\"\r\n"
+        data += "!define VERSION_SUFFIX \"" + branch + "\"\r\n"
     if sys.stdout==OUT_FILE:
         OUT_FILE.write(data)
     else: