On windows, change mscore.exe to MuseScore.exe, wix packaging: deskto…

…p shortcut, start menu shortcut...
chenlung · Dec 8, 2014 · 03bf869 · 03bf869
1 parent d4712da
commit 03bf869
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 56 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -122,10 +122,12 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
 
 # The Mscore version number.
+SET (MUSESCORE_NAME "MuseScore")
 SET(MUSESCORE_VERSION_MAJOR  "2")
 SET(MUSESCORE_VERSION_MINOR  "0")
 SET(MUSESCORE_VERSION_PATCH  "0")
 SET(MUSESCORE_VERSION       "${MUSESCORE_VERSION_MAJOR}.${MUSESCORE_VERSION_MINOR}")
+SET(MUSESCORE_NAME_VERSION "${MUSESCORE_NAME} ${MUSESCORE_VERSION_MAJOR}")
 #
 # version schema x.x.x is hardcoded in source
 #

diff --git a/build/Packaging.cmake b/build/Packaging.cmake
@@ -34,25 +34,25 @@ SET(CPACK_NSIS_COMPRESSOR "/FINAL /SOLID lzma")
 
 IF(MINGW)
 
-    SET(CPACK_PACKAGE_INSTALL_DIRECTORY "MuseScore 2")
-    SET(CPACK_PACKAGE_NAME    "MuseScore")
+    SET(CPACK_PACKAGE_INSTALL_DIRECTORY ${MUSESCORE_NAME_VERSION})
+    SET(CPACK_PACKAGE_NAME    ${MUSESCORE_NAME})
     # There is a bug in NSI that does not handle full unix paths properly. Make
     # sure there is at least one set of four (4) backlasshes.
     SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/build/packaging\\\\installer_head_nsis.bmp")
-    SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\mscore.exe,0")
-    SET(CPACK_NSIS_DISPLAY_NAME "MuseScore ${MUSESCORE_VERSION_FULL}")
+    SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\${MSCORE_OUTPUT_NAME}.exe,0")
+    SET(CPACK_NSIS_DISPLAY_NAME "${MUSESCORE_NAME} ${MUSESCORE_VERSION_FULL}")
     SET(CPACK_NSIS_HELP_LINK "http://www.musescore.org/")
     SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.musescore.org/")
     SET(CPACK_NSIS_CONTACT "[email protected]")
     SET(CPACK_NSIS_MODIFY_PATH OFF)
-    SET(CPACK_STRIP_FILES "mscore.exe")
+    SET(CPACK_STRIP_FILES "${MSCORE_OUTPUT_NAME}.exe")
 
     # File types association:
     SET(CPACK_NSIS_DEFINES "!include ${PROJECT_SOURCE_DIR}/build/packaging\\\\FileAssociation.nsh")
 
     SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
-        \\\${registerExtension} \\\"MuseScore File\\\" \\\".mscx\\\" \\\"\\\$INSTDIR\\\\bin\\\\mscore.exe\\\"
-        \\\${registerExtension} \\\"Compressed MuseScore File\\\" \\\".mscz\\\" \\\"\\\$INSTDIR\\\\bin\\\\mscore.exe\\\"
+        \\\${registerExtension} \\\"MuseScore File\\\" \\\".mscx\\\" \\\"\\\$INSTDIR\\\\bin\\\\${MSCORE_OUTPUT_NAME}.exe\\\"
+        \\\${registerExtension} \\\"Compressed MuseScore File\\\" \\\".mscz\\\" \\\"\\\$INSTDIR\\\\bin\\\\${MSCORE_OUTPUT_NAME}.exe\\\"
     ")
     SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
         \\\${unregisterExtension} \\\".mscx\\\" \\\"MuseScore File\\\"
@@ -61,29 +61,30 @@ IF(MINGW)
 
   file(TO_CMAKE_PATH $ENV{PROGRAMFILES} PROGRAMFILES)
   SET(CPACK_WIX_ROOT "${PROGRAMFILES}/WiX Toolset v3.8")
-  SET(CPACK_WIX_PRODUCT_GUID "813E140C-60A8-4E3D-A1C6-668AC0FBBBCD")
+  SET(CPACK_WIX_PRODUCT_GUID "6D698D22-1EAE-4092-8DD5-EE556BE6C71D")
   SET(CPACK_WIX_UPGRADE_GUID "6CF17D7E-4CF1-42CF-A23A-B52F7E883D51")
   SET(CPACK_WIX_LICENSE_RTF   "${PROJECT_SOURCE_DIR}/LICENSE.rtf")
   SET(CPACK_WIX_PRODUCT_ICON "${PROJECT_SOURCE_DIR}/mscore/data/mscore.ico")
   SET(CPACK_WIX_UI_BANNER "${PROJECT_SOURCE_DIR}/build/packaging/installer_banner_wix.bmp")
   SET(CPACK_WIX_UI_DIALOG "${PROJECT_SOURCE_DIR}/build/packaging/installer_background_wix.bmp")
-  SET(CPACK_WIX_PROGRAM_MENU_FOLDER "MuseScore 2")
-  SET(CPACK_CREATE_DESKTOP_LINKS "MuseScore 2")
+  SET(CPACK_WIX_PROGRAM_MENU_FOLDER "${MUSESCORE_NAME_VERSION}")
+  SET(CPACK_CREATE_DESKTOP_LINKS "${MUSESCORE_NAME_VERSION}")
   SET(CPACK_WIX_EXTENSIONS "WixUtilExtension")
 
-  set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/packaging" ${CMAKE_MODULE_PATH}) # Use custom version of NSIS.InstallOptions.ini
+  SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/packaging" ${CMAKE_MODULE_PATH}) # Use custom version of NSIS.InstallOptions.ini
+  SET(CPACK_PACKAGE_EXECUTABLES   "${MUSESCORE_NAME}" "${MUSESCORE_NAME_VERSION}") # exe name, label
+  SET(CPACK_CREATE_DESKTOP_LINKS "${MUSESCORE_NAME}" "${MUSESCORE_NAME_VERSION}") #exe name, label
 
-    
+  SET(CPACK_PACKAGE_FILE_NAME     "${MUSESCORE_NAME}-${MUSESCORE_VERSION_FULL}${git_date_string}")
 ELSE(MINGW)
     SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mscore/data/mscore.bmp")
-    SET(CPACK_STRIP_FILES "mscore")
+    SET(CPACK_STRIP_FILES "${MSCORE_OUTPUT_NAME}")
     SET(CPACK_SOURCE_STRIP_FILES "")
+    SET(CPACK_PACKAGE_EXECUTABLES   "mscore" "MuseScore")
+    SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mscore")
+    SET(CPACK_PACKAGE_FILE_NAME     "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${MUSESCORE_VERSION_FULL}${git_date_string}")
 ENDIF(MINGW)
 
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mscore")
-SET(CPACK_PACKAGE_FILE_NAME     "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${MUSESCORE_VERSION_FULL}${git_date_string}")
-SET(CPACK_PACKAGE_EXECUTABLES   "mscore" "MuseScore")
-
 set(CPACK_DEBIAN_PACKAGE_NAME         "mscore")
 set(CPACK_DEBIAN_PACKAGE_VERSION      "${MUSESCORE_VERSION_FULL}${git_date_string}")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER   "[email protected]")

diff --git a/build/packaging/NSIS.template.in b/build/packaging/NSIS.template.in
@@ -151,11 +151,11 @@ Var AR_RegFlags
 ;--- End of Add/Remove macros ---
 
 Function InstallDesktopShortcut
-  CreateShortcut "$DESKTOP\MuseScore.lnk" "$INSTDIR\bin\mscore.exe"
+  CreateShortcut "$DESKTOP\MuseScore 2.lnk" "$INSTDIR\bin\MuseScore.exe"
 FunctionEnd
 
 Function un.InstallDesktopShortcut
-  Delete "$DESKTOP\MuseScore.lnk"
+  Delete "$DESKTOP\MuseScore 2.lnk"
 FunctionEnd
 
 ;--------------------------------
@@ -165,7 +165,7 @@ FunctionEnd
   !define MUI_ABORTWARNING
   !define MUI_FINISHPAGE_LINK "http://musescore.org"
   !define MUI_FINISHPAGE_LINK_LOCATION "http://musescore.org"
-  !define MUI_FINISHPAGE_RUN "$INSTDIR\bin\mscore.exe"
+  !define MUI_FINISHPAGE_RUN "$INSTDIR\bin\MuseScore.exe"
   !define MUI_FINISHPAGE_SHOWREADME ""
   !define MUI_FINISHPAGE_SHOWREADME_CHECKED
   !define MUI_FINISHPAGE_SHOWREADME_TEXT $(createDesktopShortcut)

diff --git a/build/packaging/WIX.README b/build/packaging/WIX.README
@@ -1,5 +1,5 @@
 The Wix.template.in file contains one absolute path to the exe file. It needs to be changed.
-<?define ExeId="CM_FP_bin.mscore.exe" ?>
+<?define ExeId="CM_FP_bin.$(var.CPACK_PACKAGE_NAME).exe" ?>
 
 To create new version, the 3 digits version of MuseScore needs to be 
 changed and the product ID as well (see Packaging.cmake)

diff --git a/build/packaging/WIX.template.in b/build/packaging/WIX.template.in
@@ -3,17 +3,19 @@
 <?include "cpack_variables.wxi"?>
 
 <?define ShortVersion="$(var.CPACK_PACKAGE_VERSION)" ?>
-<?define ProdName="$(var.CPACK_PACKAGE_NAME) 2" ?>
-<?define ShortProdName="$(var.CPACK_PACKAGE_NAME)2" ?>
-<?define ExeId="CM_FP_bin.mscore.exe" ?>
+<?define VShortVersion="2" ?>
+<?define ProdName="$(var.CPACK_PACKAGE_NAME) $(var.VShortVersion)" ?>
+<?define ShortProdName="$(var.CPACK_PACKAGE_NAME)$(var.VShortVersion)" ?>
+<?define ExeName="$(var.CPACK_PACKAGE_NAME).exe" ?>
+<?define ExeKey="$(var.ShortProdName).exe" ?>
+<?define ExeId="CM_FP_bin.$(var.CPACK_PACKAGE_NAME).exe" ?>
 <?define RegistryRoot="HKMU" ?> <!--HKCU / HKLM-->
 
-
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
     RequiredVersion="3.6.3303.0">
 
     <Product Id="$(var.CPACK_WIX_PRODUCT_GUID)"
-        Name="$(var.CPACK_PACKAGE_NAME)"
+        Name="$(var.ProdName)"
         Language="1033"
         Version="$(var.CPACK_PACKAGE_VERSION)"
         Manufacturer="$(var.CPACK_PACKAGE_VENDOR)"
@@ -42,8 +44,11 @@
         <?ifdef CPACK_WIX_UI_DIALOG?>
         <WixVariable Id="WixUIDialogBmp" Value="$(var.CPACK_WIX_UI_DIALOG)"/>
         <?endif?>
+
+        <Property Id='ARPCONTACT'>http://musescore.org</Property>
+        <Property Id='ARPHELPLINK'>http://musescore.org</Property>
+        <Property Id='ARPURLINFOABOUT'>http://musescore.org</Property>
 
-
         <!-- Add to checkbox to launch program after install ²-->
         <UI>
             <UIRef Id='WixUI_InstallDir'/>
@@ -52,9 +57,9 @@
                 Event="DoAction" 
                 Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
         </UI>
-        <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch MuseScore"/>
+        <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch $(var.ProdName)"/>
         <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1"/>
-        <Property Id="WixShellExecTarget" Value="[#CM_FP_bin.mscore.exe]" />
+        <Property Id="WixShellExecTarget" Value="[#CM_FP_bin.$(var.CPACK_PACKAGE_NAME).exe]" />
         <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
 
 
@@ -63,9 +68,9 @@
             <!-- File association-->
             <!-- Capabilities keys for Vista/7 "Set Program Access and Defaults" -->
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities" Name="ApplicationDescription" Value="$(var.ProdName)" Type="string" KeyPath="yes"/>
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities" Name="ApplicationIcon" Value="[INSTALL_ROOT]bin\mscore.exe,0" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities" Name="ApplicationIcon" Value="[INSTALL_ROOT]bin\$(var.ExeName),0" Type="string" />
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities" Name="ApplicationName" Value="$(var.ProdName)" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\DefaultIcon" Value="[INSTALL_ROOT]bin\mscore.exe,1" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\DefaultIcon" Value="[INSTALL_ROOT]bin\$(var.ExeName),1" Type="string" />
 
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\FileAssociations" Name=".mscz" Value="MuseScore.mscz" Type="string" />
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\FileAssociations" Name=".mscx" Value="MuseScore.mscx" Type="string" />
@@ -74,35 +79,35 @@
 
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\MIMEAssociations" Name="application/x-musescore" Value="MuseScore.mscz" Type="string" />
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\MIMEAssociations" Name="application/x-musescore+xml" Value="MuseScore.mscx" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\shell\open\command" Value="&quot;[INSTALL_ROOT]bin\mscore.exe&quot; &quot;%1&quot;" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\shell\open\command" Value="&quot;[INSTALL_ROOT]bin\$(var.ExeName)&quot; &quot;%1&quot;" Type="string" />
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\RegisteredApplications" Name="$(var.ProdName)" Value="SOFTWARE\$(var.ShortProdName)\Capabilities" Type="string" />
 
             <!-- App Paths to support Start,Run -> "myapp" -->
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\mscore2.exe" Value="[INSTALL_ROOT]bin\mscore.exe" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\mscore2.exe" Name="Path" Value="[INSTALL_ROOT]bin" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\$(var.ExeKey)" Value="[INSTALL_ROOT]bin\$(var.ExeName)" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\$(var.ExeKey)" Name="Path" Value="[INSTALL_ROOT]bin" Type="string" />
 
             <!-- Extend to the "open with" list + Win7 jump menu pinning  -->
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".mscz" Value="" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".mscx" Value="" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".mxl" Value="" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".xml" Value="" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".cap" Value="" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".bww" Value="" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".mid" Value="" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".midi" Value="" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".kar" Value="" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".ove" Value="" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".sgu" Value="" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".mgu" Value="" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".md" Value="" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".gp3" Value="" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".gp4" Value="" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".gp5" Value="" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\SupportedTypes" Name=".gpx" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".mscz" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".mscx" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".mxl" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".xml" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".cap" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".bww" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".mid" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".midi" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".kar" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".ove" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".sgu" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".mgu" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".md" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".gp3" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".gp4" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".gp5" Value="" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\SupportedTypes" Name=".gpx" Value="" Type="string" />
 
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe" Name="FriendlyAppName" Value="$(var.ProdName)" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\shell\open" Name="FriendlyAppName" Value="$(var.ProdName)" Type="string" />
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\mscore2.exe\shell\open\command" Value="&quot;[INSTALL_ROOT]bin\mscore.exe&quot; &quot;%1&quot;" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)" Name="FriendlyAppName" Value="$(var.ProdName)" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\shell\open" Name="FriendlyAppName" Value="$(var.ProdName)" Type="string" />
+            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\shell\open\command" Value="&quot;[INSTALL_ROOT]bin\$(var.ExeName)&quot; &quot;%1&quot;" Type="string" />
 
             <!-- MyApp.Document ProgIDs -->
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\MuseScore.mscz" Value="Compressed MuseScore File" Type="string"/>

diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
@@ -335,6 +335,10 @@ target_link_libraries(mscore
       kqoauth
       )
 
+if (MINGW)
+      set(MSCORE_OUTPUT_NAME ${MUSESCORE_NAME})
+endif (MINGW)
+
 #if MSCORE_OUTPUT_NAME is set (e.g, when cmake is called by the user), the output executable will be
 #called MSCORE_OUTPUT_NAME instead of 'mscore'. This can be used to have MuseScore stable and unstable
 #both installed in the same prefix on a Linux system.

diff --git a/vtest/gen-ref.bat b/vtest/gen-ref.bat
@@ -1,7 +1,7 @@
 
 rem create reference
 
-set MSCORE=..\win32install\bin\mscore.exe
+set MSCORE=..\win32install\bin\musescore.exe
 set DPI=130
 
 %MSCORE% %1.mscz -r %DPI% -o %1.png

diff --git a/vtest/gen.bat b/vtest/gen.bat
@@ -25,7 +25,7 @@ set SRC=mmrest-1,bravura-mmrest,gonville-mmrest,mmrest-2,mmrest-4,mmrest-5,mmres
  user-offset-1,user-offset-2,chord-space-1,chord-space-2,tablature-1,image-1, ^
  lyrics-1,lyrics-2,lyrics-3,voice-1,slash-1,slash-2
 
-set MSCORE=..\win32install\bin\mscore.exe
+set MSCORE=..\win32install\bin\musescore.exe
 set DPI=130
 set F=vtest.html