prepare 3.4 Beta release

musescore · Dec 26, 2019 · 684f74e · 684f74e
1 parent 4b55b7a
commit 684f74e
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 40 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -9,6 +9,7 @@ image: Visual Studio 2017
 branches:
   only:
   - master
+  - 3.4beta
 
 # build cache to preserve files/folders between builds
 cache:
@@ -22,7 +23,7 @@ cache:
 # build platform, i.e. x86, x64, Any CPU. This setting is optional.
 platform:
 #use for releases only
-#  - x86
+  - x86
   - x64
 
 #environment:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -94,9 +94,9 @@ include (CreatePrecompiledHeader)
 # set(CMAKE_VERBOSE_MAKEFILE ON)
 
 set(CMAKE_AUTOMOC     TRUE)
-set(MSCORE_UNSTABLE   TRUE)          # Mark as unstable
-set(MSCORE_RELEASE_CHANNEL "devel")
-#set(MSCORE_RELEASE_CHANNEL "testing")
+set(MSCORE_UNSTABLE   FALSE)          # Mark as unstable
+#set(MSCORE_RELEASE_CHANNEL "devel")
+set(MSCORE_RELEASE_CHANNEL "testing")
 #set(MSCORE_RELEASE_CHANNEL "stable")
 set(USE_SSE           TRUE)
 
@@ -298,9 +298,9 @@ SET(MUSESCORE_NAME "MuseScore")
 SET(MUSESCORE_VERSION_MAJOR  "3")
 SET(MUSESCORE_VERSION_MINOR  "4")
 SET(MUSESCORE_VERSION_PATCH  "0")
-SET(MUSESCORE_VERSION_LABEL  "")
+SET(MUSESCORE_VERSION_LABEL  "Beta")
 SET(MUSESCORE_VERSION       "${MUSESCORE_VERSION_MAJOR}.${MUSESCORE_VERSION_MINOR}")
-SET(MUSESCORE_NAME_VERSION "${MUSESCORE_NAME} ${MUSESCORE_VERSION_MAJOR}")
+SET(MUSESCORE_NAME_VERSION "${MUSESCORE_NAME} ${MUSESCORE_VERSION_MAJOR}.${MUSESCORE_VERSION_MINOR} ${MUSESCORE_VERSION_LABEL}")
 #
 # Version schema x.x.x is hardcoded in source
 #

diff --git a/Makefile b/Makefile
@@ -21,8 +21,8 @@ REVISION  := `cat mscore/revision.h`
 CPUS      := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1)
 
 PREFIX    = "/usr/local"
-VERSION   = "3.4b-${REVISION}"
-#VERSION = 3.3.3
+#VERSION   = "3.4b-${REVISION}"
+VERSION = 3.4.0
 BUILD_NUMBER=""
 
 TELEMETRY_TRACK_ID=""

diff --git a/Makefile.mingw b/Makefile.mingw
@@ -19,8 +19,8 @@
 
 
 REVISION  = $(shell type mscore\revision.h)
-VERSION   = 3.4b-${REVISION}
-#VERSION = 3.3.3
+#VERSION   = 3.4b-${REVISION}
+VERSION = 3.4.0
 BUILD_NUMBER=""
 CPUS = %NUMBER_OF_PROCESSORS%
 BUILD_FOR_WINSTORE="OFF"     # Override with "ON" to enable.

diff --git a/Makefile.osx b/Makefile.osx
@@ -18,8 +18,8 @@
 #=============================================================================
 
 REVISION  = `cat mscore/revision.h`
-VERSION   = "3.4b-${REVISION}"
-#VERSION = 3.3.3
+#VERSION   = "3.4b-${REVISION}"
+VERSION = 3.4.0
 BUILD_NUMBER = ""
 PREFIX=../applebuild
 TELEMETRY_TRACK_ID=""

diff --git a/build/Packaging.cmake b/build/Packaging.cmake
@@ -50,21 +50,21 @@ IF(MINGW OR MSVC)
     SET(CPACK_STRIP_FILES "${MSCORE_EXECUTABLE_NAME}.exe")
 
     # File types association:
-    SET(CPACK_NSIS_DEFINES "!include ${PROJECT_SOURCE_DIR}/build/packaging\\\\FileAssociation.nsh")
+    # 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_EXECUTABLE_NAME}.exe\\\"
-        \\\${registerExtension} \\\"Compressed MuseScore File\\\" \\\".mscz\\\" \\\"\\\$INSTDIR\\\\bin\\\\${MSCORE_EXECUTABLE_NAME}.exe\\\"
-    ")
-    SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
-        \\\${unregisterExtension} \\\".mscx\\\" \\\"MuseScore File\\\"
-        \\\${unregisterExtension} \\\".mscz\\\" \\\"Compressed MuseScore File\\\"
-    ")
+    # SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
+    #     \\\${registerExtension} \\\"MuseScore File\\\" \\\".mscx\\\" \\\"\\\$INSTDIR\\\\bin\\\\${MSCORE_EXECUTABLE_NAME}.exe\\\"
+    #     \\\${registerExtension} \\\"Compressed MuseScore File\\\" \\\".mscz\\\" \\\"\\\$INSTDIR\\\\bin\\\\${MSCORE_EXECUTABLE_NAME}.exe\\\"
+    # ")
+    # SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
+    #     \\\${unregisterExtension} \\\".mscx\\\" \\\"MuseScore File\\\"
+    #     \\\${unregisterExtension} \\\".mscz\\\" \\\"Compressed MuseScore File\\\"
+    # ")
 
     file(TO_CMAKE_PATH $ENV{PROGRAMFILES} PROGRAMFILES)
     SET(CPACK_WIX_ROOT "${PROGRAMFILES}/WiX Toolset v3.11")
     SET(CPACK_WIX_PRODUCT_GUID "00000000-0000-0000-0000-000000000000")
-    SET(CPACK_WIX_UPGRADE_GUID "4975850F-912F-47AE-AF2C-65C592188FCE")
+    SET(CPACK_WIX_UPGRADE_GUID "301B470A-5AC4-43B3-A71F-F8C68796096A")
     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.png")

diff --git a/build/package_mac b/build/package_mac
@@ -10,7 +10,7 @@ then
     VERSION=$1
 else
     LONG_NAME=MuseScore
-    LONGER_NAME="MuseScore 3"
+    LONGER_NAME="MuseScore 3.4 Beta"
     VERSION=3.4.0
 fi
 

diff --git a/build/packaging/WIX.template.in b/build/packaging/WIX.template.in
@@ -74,14 +74,15 @@
             <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\$(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" />
-
+            -->
             <!-- TODO add more types?-->
-
+            <!--
             <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\$(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" />
 
@@ -118,7 +119,7 @@
             <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"/>
+            <!-- <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\MuseScore.mscz" Value="Compressed MuseScore File" Type="string"/>
             <ProgId Id="MuseScore.mscz" Description="Compressed MuseScore File" Advertise="no" Icon="$(var.ExeId)" IconIndex="1">
                 <Extension Id="mscz" Advertise="no">
                     <Verb Id="open" TargetFile="$(var.ExeId)" Command="Open" Argument="&quot;%1&quot;" />
@@ -133,6 +134,7 @@
                     <MIME Advertise="no" ContentType="application/x-musescore+xml" Default="no" />
                 </Extension>
             </ProgId>
+            -->
         </Component>
 
         <FeatureRef Id="ProductFeature">

diff --git a/build/travis/job_macos_lupdate/script.sh b/build/travis/job_macos_lupdate/script.sh
@@ -23,15 +23,15 @@ rm mscore.pro
 rm instruments.pro
 rm tours.pro
 
-sudo pip install transifex-client
-
-cat > ~/.transifexrc <<EOL
-[https://www.transifex.com]
-hostname = https://www.transifex.com
-password = $TRANSIFEX_PASSWORD
-token =
-username = $TRANSIFEX_USER
-EOL
-
-cp share/locale/mscore_en_US.ts share/locale/mscore_en.ts
-tx push -s
+#sudo pip install transifex-client
+
+#cat > ~/.transifexrc <<EOL
+#[https://www.transifex.com]
+#hostname = https://www.transifex.com
+#password = $TRANSIFEX_PASSWORD
+#token =
+#username = $TRANSIFEX_USER
+#EOL
+
+#cp share/locale/mscore_en_US.ts share/locale/mscore_en.ts
+#tx push -s
diff --git a/msvc_build.bat b/msvc_build.bat
@@ -125,7 +125,7 @@ IF /I "%1"=="clean" (
 
 IF NOT "%CRASH_LOG_SERVER_URL%" == "" (
     IF "%BUILD_FOR_WINSTORE%" == "OFF" (
-        SET CRASH_REPORT_URL_OPT=-DCRASH_REPORT_URL=%CRASH_LOG_SERVER_URL%
+        SET CRASH_REPORT_URL_OPT=-DCRASH_REPORT_URL=%CRASH_LOG_SERVER_URL% -DBUILD_CRASH_REPORTER=ON
         )
     )