Skip to content

Commit 1ee2fe3

Browse files
committed
fix alpha release
Alpha release installer replaced public stable release on Windows
1 parent bd1f852 commit 1ee2fe3

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

.appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ image: Visual Studio 2019
99
branches:
1010
only:
1111
- master
12-
- 3.5alpha
12+
- 3.5alpha2
1313

1414
# build cache to preserve files/folders between builds
1515
cache:

build/Packaging.cmake

+10-10
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,21 @@ IF(MINGW OR MSVC)
5050
SET(CPACK_STRIP_FILES "${MSCORE_EXECUTABLE_NAME}.exe")
5151

5252
# File types association:
53-
SET(CPACK_NSIS_DEFINES "!include ${PROJECT_SOURCE_DIR}/build/packaging\\\\FileAssociation.nsh")
53+
# SET(CPACK_NSIS_DEFINES "!include ${PROJECT_SOURCE_DIR}/build/packaging\\\\FileAssociation.nsh")
5454

55-
SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
56-
\\\${registerExtension} \\\"MuseScore File\\\" \\\".mscx\\\" \\\"\\\$INSTDIR\\\\bin\\\\${MSCORE_EXECUTABLE_NAME}.exe\\\"
57-
\\\${registerExtension} \\\"Compressed MuseScore File\\\" \\\".mscz\\\" \\\"\\\$INSTDIR\\\\bin\\\\${MSCORE_EXECUTABLE_NAME}.exe\\\"
58-
")
59-
SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
60-
\\\${unregisterExtension} \\\".mscx\\\" \\\"MuseScore File\\\"
61-
\\\${unregisterExtension} \\\".mscz\\\" \\\"Compressed MuseScore File\\\"
62-
")
55+
# SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
56+
# \\\${registerExtension} \\\"MuseScore File\\\" \\\".mscx\\\" \\\"\\\$INSTDIR\\\\bin\\\\${MSCORE_EXECUTABLE_NAME}.exe\\\"
57+
# \\\${registerExtension} \\\"Compressed MuseScore File\\\" \\\".mscz\\\" \\\"\\\$INSTDIR\\\\bin\\\\${MSCORE_EXECUTABLE_NAME}.exe\\\"
58+
# ")
59+
# SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
60+
# \\\${unregisterExtension} \\\".mscx\\\" \\\"MuseScore File\\\"
61+
# \\\${unregisterExtension} \\\".mscz\\\" \\\"Compressed MuseScore File\\\"
62+
# ")
6363

6464
file(TO_CMAKE_PATH $ENV{PROGRAMFILES} PROGRAMFILES)
6565
SET(CPACK_WIX_ROOT "${PROGRAMFILES}/WiX Toolset v3.11")
6666
SET(CPACK_WIX_PRODUCT_GUID "00000000-0000-0000-0000-000000000000")
67-
SET(CPACK_WIX_UPGRADE_GUID "4975850F-912F-47AE-AF2C-65C592188FCE")
67+
SET(CPACK_WIX_UPGRADE_GUID "301B470A-5AC4-43B3-A71F-F8C68796096A")
6868
SET(CPACK_WIX_LICENSE_RTF "${PROJECT_SOURCE_DIR}/LICENSE.rtf")
6969
SET(CPACK_WIX_PRODUCT_ICON "${PROJECT_SOURCE_DIR}/mscore/data/mscore.ico")
7070
SET(CPACK_WIX_UI_BANNER "${PROJECT_SOURCE_DIR}/build/packaging/installer_banner_wix.png")

build/packaging/WIX.template.in

+6-4
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,15 @@
7474
<RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities" Name="ApplicationIcon" Value="[INSTALL_ROOT]bin\$(var.ExeName),0" Type="string" />
7575
<RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities" Name="ApplicationName" Value="$(var.ProdName)" Type="string" />
7676
<RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\DefaultIcon" Value="[INSTALL_ROOT]bin\$(var.ExeName),1" Type="string" />
77-
77+
<!--
7878
<RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\FileAssociations" Name=".mscz" Value="MuseScore.mscz" Type="string" />
7979
<RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\FileAssociations" Name=".mscx" Value="MuseScore.mscx" Type="string" />
80-
80+
-->
8181
<!-- TODO add more types?-->
82-
82+
<!--
8383
<RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\MIMEAssociations" Name="application/x-musescore" Value="MuseScore.mscz" Type="string" />
8484
<RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\MIMEAssociations" Name="application/x-musescore+xml" Value="MuseScore.mscx" Type="string" />
85+
-->
8586
<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" />
8687
<RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\RegisteredApplications" Name="$(var.ProdName)" Value="SOFTWARE\$(var.ShortProdName)\Capabilities" Type="string" />
8788

@@ -121,7 +122,7 @@
121122
<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" />
122123

123124
<!-- MyApp.Document ProgIDs -->
124-
<RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\MuseScore.mscz" Value="Compressed MuseScore File" Type="string"/>
125+
<!-- <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\MuseScore.mscz" Value="Compressed MuseScore File" Type="string"/>
125126
<ProgId Id="MuseScore.mscz" Description="Compressed MuseScore File" Advertise="no" Icon="$(var.ExeId)" IconIndex="1">
126127
<Extension Id="mscz" Advertise="no">
127128
<Verb Id="open" TargetFile="$(var.ExeId)" Command="Open" Argument="&quot;%1&quot;" />
@@ -136,6 +137,7 @@
136137
<MIME Advertise="no" ContentType="application/x-musescore+xml" Default="no" />
137138
</Extension>
138139
</ProgId>
140+
-->
139141
</Component>
140142

141143
<FeatureRef Id="ProductFeature">

0 commit comments

Comments
 (0)