Skip to content

Commit 684f74e

Browse files
anatoly-osanatoly-os
committed
prepare 3.4 Beta release
1 parent 4b55b7a commit 684f74e

10 files changed

+43
-40
lines changed

‎.appveyor.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ image: Visual Studio 2017
99
branches:
1010
only:
1111
- master
12+
- 3.4beta
1213

1314
# build cache to preserve files/folders between builds
1415
cache:
@@ -22,7 +23,7 @@ cache:
2223
# build platform, i.e. x86, x64, Any CPU. This setting is optional.
2324
platform:
2425
#use for releases only
25-
# - x86
26+
- x86
2627
- x64
2728

2829
#environment:

‎CMakeLists.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ include (CreatePrecompiledHeader)
9494
# set(CMAKE_VERBOSE_MAKEFILE ON)
9595

9696
set(CMAKE_AUTOMOC TRUE)
97-
set(MSCORE_UNSTABLE TRUE) # Mark as unstable
98-
set(MSCORE_RELEASE_CHANNEL "devel")
99-
#set(MSCORE_RELEASE_CHANNEL "testing")
97+
set(MSCORE_UNSTABLE FALSE) # Mark as unstable
98+
#set(MSCORE_RELEASE_CHANNEL "devel")
99+
set(MSCORE_RELEASE_CHANNEL "testing")
100100
#set(MSCORE_RELEASE_CHANNEL "stable")
101101
set(USE_SSE TRUE)
102102

@@ -298,9 +298,9 @@ SET(MUSESCORE_NAME "MuseScore")
298298
SET(MUSESCORE_VERSION_MAJOR "3")
299299
SET(MUSESCORE_VERSION_MINOR "4")
300300
SET(MUSESCORE_VERSION_PATCH "0")
301-
SET(MUSESCORE_VERSION_LABEL "")
301+
SET(MUSESCORE_VERSION_LABEL "Beta")
302302
SET(MUSESCORE_VERSION "${MUSESCORE_VERSION_MAJOR}.${MUSESCORE_VERSION_MINOR}")
303-
SET(MUSESCORE_NAME_VERSION "${MUSESCORE_NAME} ${MUSESCORE_VERSION_MAJOR}")
303+
SET(MUSESCORE_NAME_VERSION "${MUSESCORE_NAME} ${MUSESCORE_VERSION_MAJOR}.${MUSESCORE_VERSION_MINOR} ${MUSESCORE_VERSION_LABEL}")
304304
#
305305
# Version schema x.x.x is hardcoded in source
306306
#

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ REVISION := `cat mscore/revision.h`
2121
CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1)
2222

2323
PREFIX = "/usr/local"
24-
VERSION = "3.4b-${REVISION}"
25-
#VERSION = 3.3.3
24+
#VERSION = "3.4b-${REVISION}"
25+
VERSION = 3.4.0
2626
BUILD_NUMBER=""
2727

2828
TELEMETRY_TRACK_ID=""

‎Makefile.mingw

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020

2121
REVISION = $(shell type mscore\revision.h)
22-
VERSION = 3.4b-${REVISION}
23-
#VERSION = 3.3.3
22+
#VERSION = 3.4b-${REVISION}
23+
VERSION = 3.4.0
2424
BUILD_NUMBER=""
2525
CPUS = %NUMBER_OF_PROCESSORS%
2626
BUILD_FOR_WINSTORE="OFF" # Override with "ON" to enable.

‎Makefile.osx

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#=============================================================================
1919

2020
REVISION = `cat mscore/revision.h`
21-
VERSION = "3.4b-${REVISION}"
22-
#VERSION = 3.3.3
21+
#VERSION = "3.4b-${REVISION}"
22+
VERSION = 3.4.0
2323
BUILD_NUMBER = ""
2424
PREFIX=../applebuild
2525
TELEMETRY_TRACK_ID=""

‎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/package_mac

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ then
1010
VERSION=$1
1111
else
1212
LONG_NAME=MuseScore
13-
LONGER_NAME="MuseScore 3"
13+
LONGER_NAME="MuseScore 3.4 Beta"
1414
VERSION=3.4.0
1515
fi
1616

‎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

@@ -118,7 +119,7 @@
118119
<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" />
119120

120121
<!-- MyApp.Document ProgIDs -->
121-
<RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\MuseScore.mscz" Value="Compressed MuseScore File" Type="string"/>
122+
<!-- <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\MuseScore.mscz" Value="Compressed MuseScore File" Type="string"/>
122123
<ProgId Id="MuseScore.mscz" Description="Compressed MuseScore File" Advertise="no" Icon="$(var.ExeId)" IconIndex="1">
123124
<Extension Id="mscz" Advertise="no">
124125
<Verb Id="open" TargetFile="$(var.ExeId)" Command="Open" Argument="&quot;%1&quot;" />
@@ -133,6 +134,7 @@
133134
<MIME Advertise="no" ContentType="application/x-musescore+xml" Default="no" />
134135
</Extension>
135136
</ProgId>
137+
-->
136138
</Component>
137139

138140
<FeatureRef Id="ProductFeature">

‎build/travis/job_macos_lupdate/script.sh

+12-12
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ rm mscore.pro
2323
rm instruments.pro
2424
rm tours.pro
2525

26-
sudo pip install transifex-client
27-
28-
cat > ~/.transifexrc <<EOL
29-
[https://www.transifex.com]
30-
hostname = https://www.transifex.com
31-
password = $TRANSIFEX_PASSWORD
32-
token =
33-
username = $TRANSIFEX_USER
34-
EOL
35-
36-
cp share/locale/mscore_en_US.ts share/locale/mscore_en.ts
37-
tx push -s
26+
#sudo pip install transifex-client
27+
28+
#cat > ~/.transifexrc <<EOL
29+
#[https://www.transifex.com]
30+
#hostname = https://www.transifex.com
31+
#password = $TRANSIFEX_PASSWORD
32+
#token =
33+
#username = $TRANSIFEX_USER
34+
#EOL
35+
36+
#cp share/locale/mscore_en_US.ts share/locale/mscore_en.ts
37+
#tx push -s

‎msvc_build.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ IF /I "%1"=="clean" (
125125

126126
IF NOT "%CRASH_LOG_SERVER_URL%" == "" (
127127
IF "%BUILD_FOR_WINSTORE%" == "OFF" (
128-
SET CRASH_REPORT_URL_OPT=-DCRASH_REPORT_URL=%CRASH_LOG_SERVER_URL%
128+
SET CRASH_REPORT_URL_OPT=-DCRASH_REPORT_URL=%CRASH_LOG_SERVER_URL% -DBUILD_CRASH_REPORTER=ON
129129
)
130130
)
131131

0 commit comments

Comments
 (0)