Set up proper version number and fixed set build config

musescore · Oct 16, 2020 · 465e7b6 · 465e7b6
1 parent 257872d
commit 465e7b6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/config.cmake b/config.cmake
@@ -20,8 +20,8 @@
 # The MuseScore version number.
 SET(MUSESCORE_NAME "MuseScore")
 SET(MUSESCORE_VERSION_MAJOR  "3")
-SET(MUSESCORE_VERSION_MINOR  "6")
-SET(MUSESCORE_VERSION_PATCH  "0")
+SET(MUSESCORE_VERSION_MINOR  "5")
+SET(MUSESCORE_VERSION_PATCH  "2")
 SET(MUSESCORE_VERSION_LABEL  "")
 
 message(STATUS "MUSESCORE_BUILD_CONFIG ${MUSESCORE_BUILD_CONFIG}")

diff --git a/msvc_build.bat b/msvc_build.bat
@@ -190,9 +190,13 @@ IF NOT "%MSCORE_STABLE_BUILD%" == "" (
         )
     )
 
+IF "%MUSESCORE_BUILD_CONFIG%" == "" (
+    SET MUSESCORE_BUILD_CONFIG="dev"
+    )    
+
 SET "INSTALL_FOLDER=%INSTALL_FOLDER:\=/%"
 REM -DCMAKE_BUILD_NUMBER=%BUILD_NUMBER% -DCMAKE_BUILD_AUTOUPDATE=%BUILD_AUTOUPDATE% %CRASH_REPORT_URL_OPT% are used for CI only
-   cd "%BUILD_FOLDER%" & cmake -G "%GENERATOR_NAME%" -A "%PLATFORM_NAME%" -DCMAKE_INSTALL_PREFIX=../%INSTALL_FOLDER% -DCMAKE_BUILD_TYPE=%CONFIGURATION_STR% -DBUILD_FOR_WINSTORE=%BUILD_FOR_WINSTORE% -DBUILD_64=%BUILD_64% -DCMAKE_BUILD_NUMBER=%BUILD_NUMBER% -DBUILD_AUTOUPDATE=%BUILD_AUTOUPDATE% %CRASH_REPORT_URL_OPT% %TELEMETRY_TRACK_ID_OPT% %WIN_PORTABLE_OPT% ..
+   cd "%BUILD_FOLDER%" & cmake -G "%GENERATOR_NAME%" -A "%PLATFORM_NAME%" -DCMAKE_INSTALL_PREFIX=../%INSTALL_FOLDER% -DCMAKE_BUILD_TYPE=%CONFIGURATION_STR% -DMUSESCORE_BUILD_CONFIG=%MUSESCORE_BUILD_CONFIG% -DBUILD_FOR_WINSTORE=%BUILD_FOR_WINSTORE% -DBUILD_64=%BUILD_64% -DCMAKE_BUILD_NUMBER=%BUILD_NUMBER% -DBUILD_AUTOUPDATE=%BUILD_AUTOUPDATE% %CRASH_REPORT_URL_OPT% %TELEMETRY_TRACK_ID_OPT% %WIN_PORTABLE_OPT% ..
    echo Building MuseScore...
    cd "%BUILD_FOLDER%" & cmake --build . --config %CONFIGURATION_STR% --target mscore
    GOTO :END