Skip to content

Commit

Permalink
update version to 3.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
anatoly-os committed Dec 3, 2019
1 parent 431961b commit 5e9b1a6
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 13 deletions.
3 changes: 2 additions & 1 deletion .appveyor.yml
Expand Up @@ -9,6 +9,7 @@ image: Visual Studio 2017
branches:
only:
- master
- 3.3.4

# build cache to preserve files/folders between builds
cache:
Expand All @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Expand Up @@ -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
Expand Down Expand Up @@ -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}")
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions Makefile.mingw
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions Makefile.osx
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion build/package_mac
Expand Up @@ -11,7 +11,7 @@ then
else
LONG_NAME=MuseScore
LONGER_NAME="MuseScore 3"
VERSION=3.3.3
VERSION=3.3.4
fi


Expand Down
2 changes: 1 addition & 1 deletion msvc_build.bat
Expand Up @@ -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
Expand Down

0 comments on commit 5e9b1a6

Please sign in to comment.