From 5e9b1a6514e1546ec695ae1d673ae68f992a2382 Mon Sep 17 00:00:00 2001
From: anatoly-os <osokingauss@gmail.com>
Date: Tue, 3 Dec 2019 14:59:51 +0200
Subject: [PATCH] update version to 3.3.4

---
 .appveyor.yml     | 3 ++-
 CMakeLists.txt    | 8 ++++----
 Makefile          | 4 ++--
 Makefile.mingw    | 4 ++--
 Makefile.osx      | 4 ++--
 build/package_mac | 2 +-
 msvc_build.bat    | 2 +-
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index b2d01cec1e75..d24de071bf72 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -9,6 +9,7 @@ image: Visual Studio 2017
 branches:
   only:
   - master
+  - 3.3.4
 
 # 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
index 6a0661985644..07b8b5e40729 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,10 +94,10 @@ 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_UNSTABLE   FALSE)          # Mark as unstable
+#set(MSCORE_RELEASE_CHANNEL "devel")
 #set(MSCORE_RELEASE_CHANNEL "testing")
-#set(MSCORE_RELEASE_CHANNEL "stable")
+set(MSCORE_RELEASE_CHANNEL "stable")
 set(USE_SSE           TRUE)
 
 # Disable components not supported on Windows
@@ -282,7 +282,7 @@ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
 SET(MUSESCORE_NAME "MuseScore")
 SET(MUSESCORE_VERSION_MAJOR  "3")
 SET(MUSESCORE_VERSION_MINOR  "3")
-SET(MUSESCORE_VERSION_PATCH  "3")
+SET(MUSESCORE_VERSION_PATCH  "4")
 SET(MUSESCORE_VERSION_LABEL  "")
 SET(MUSESCORE_VERSION       "${MUSESCORE_VERSION_MAJOR}.${MUSESCORE_VERSION_MINOR}")
 SET(MUSESCORE_NAME_VERSION "${MUSESCORE_NAME} ${MUSESCORE_VERSION_MAJOR}")
diff --git a/Makefile b/Makefile
index 6c458322cb3a..c800a27a9e4f 100644
--- 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.3b-${REVISION}"
-#VERSION = 3.3.3
+#VERSION   = "3.3b-${REVISION}"
+VERSION = 3.3.4
 BUILD_NUMBER=""
 
 # Override SUFFIX and LABEL when multiple versions are installed to avoid conflicts.
diff --git a/Makefile.mingw b/Makefile.mingw
index 41ef44f8301e..91a7a52dcab3 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -19,8 +19,8 @@
 
 
 REVISION  = $(shell type mscore\revision.h)
-VERSION   = 3.3b-${REVISION}
-#VERSION = 3.3.3
+#VERSION   = 3.3b-${REVISION}
+VERSION = 3.3.4
 BUILD_NUMBER=""
 CPUS = %NUMBER_OF_PROCESSORS%
 BUILD_FOR_WINSTORE="OFF"     # Override with "ON" to enable.
diff --git a/Makefile.osx b/Makefile.osx
index 5eea6cffca08..9d896cd3e893 100644
--- a/Makefile.osx
+++ b/Makefile.osx
@@ -18,8 +18,8 @@
 #=============================================================================
 
 REVISION  = `cat mscore/revision.h`
-VERSION   = "3.3b-${REVISION}"
-#VERSION = 3.3.3
+#VERSION   = "3.3b-${REVISION}"
+VERSION = 3.3.4
 BUILD_NUMBER = ""
 PREFIX=../applebuild
 
diff --git a/build/package_mac b/build/package_mac
index d450b04a71cd..c4aca1a20a03 100755
--- a/build/package_mac
+++ b/build/package_mac
@@ -11,7 +11,7 @@ then
 else
     LONG_NAME=MuseScore
     LONGER_NAME="MuseScore 3"
-    VERSION=3.3.3
+    VERSION=3.3.4
 fi
 
 
diff --git a/msvc_build.bat b/msvc_build.bat
index a498dc6d1f61..1cfd92185b21 100644
--- a/msvc_build.bat
+++ b/msvc_build.bat
@@ -124,7 +124,7 @@ IF /I "%1"=="clean" (
    echo Building CMake configuration...
 
 IF NOT "%CRASH_LOG_SERVER_URL%" == "" (
-    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
     )
 
 REM -DCMAKE_BUILD_NUMBER=%BUILD_NUMBER% -DCMAKE_BUILD_AUTOUPDATE=%BUILD_AUTOUPDATE% %CRASH_REPORT_URL_OPT% are used for CI only