From e173d46bd0610aec9dad83d982c2e9c612897bea Mon Sep 17 00:00:00 2001 From: Igor Korsukov Date: Mon, 13 Feb 2023 14:37:26 +0200 Subject: [PATCH] renamed some cmake project options --- CMakeLists.txt | 28 +++++++----------- CMakeSettings.json | 8 ++--- SetupConfigure.cmake | 15 ++++++---- build.cmake | 4 +-- build/ci/backend/build.sh | 14 ++++----- build/ci/linux/build.sh | 18 ++++++------ build/ci/linux/build_utest.sh | 2 +- build/ci/macos/build.sh | 16 +++++----- build/ci/tools/make_release_channel_env.sh | 12 ++++---- build/ci/windows/build.bat | 16 +++++----- build/cmake/SetupBuildEnvironment.cmake | 6 ++-- build/cmake/SetupDependencies.cmake | 6 ++-- build/cmake/TryUseLocalRevision.cmake | 2 +- build/cmake_wrapper.bat | 2 +- build/config.h.in | 3 -- config.cmake | 8 ++--- msvc_build.bat | 15 ++++------ ninja_build.sh | 34 ++-------------------- sandbox/engraving/config.h | 4 --- src/main/CMakeLists.txt | 4 --- tools/check_build_without_qt/config.h | 4 --- 21 files changed, 84 insertions(+), 137 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2a5787bb2..65c4936419 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,24 +39,20 @@ set(CMAKE_MODULE_PATH ########################################### # Setup option and build settings ########################################### - -set(MUSESCORE_REVISION "" CACHE STRING "Build revision") -set(MUSESCORE_BUILD_CONFIG "dev" CACHE STRING "Build config") -# Possible MUSESCORE_BUILD_CONFIG values: -# - dev - for development/nightly builds -# - testing - for testing versions (alpha, beta, RC) -# - release - for stable release builds -set(MUE_BUILD_CONFIGURE "app" CACHE STRING "Build configure") -# Possible MUE_BUILD_CONFIGURE values: +set(MUSESCORE_BUILD_CONFIGURE "app" CACHE STRING "Build configure") +# Possible MUSESCORE_BUILD_CONFIGURE values: # - app - for desktop app # - app-portable - for desktop portable app (Windows build for PortableApps.com) -# - app-winstore - for desktop winstore app # - vtest - for visual tests # - utest - for unit tests -option(BUILD_MACOS_APPLE_SILICON "Build for Apple Silicon architecture. Only applicable on Macs with Apple Silicon, and requires suitable Qt version." OFF) -option(BUILD_64 "Build 64 bit version of editor" ON) -option(BUILD_AUTOUPDATE "Build with autoupdate support" OFF) +set(MUSESCORE_BUILD_MODE "dev" CACHE STRING "Build mode") +# Possible MUSESCORE_BUILD_MODE values: +# - dev - for development/nightly builds +# - testing - for testing versions (alpha, beta, RC) +# - release - for stable release builds + +set(MUSESCORE_REVISION "" CACHE STRING "Build revision") # Modules framework (alphabetical order please) option(MUE_BUILD_ACCESSIBILITY_MODULE "Build accessibility module" ON) # not impl @@ -107,6 +103,8 @@ option(MUE_CRASHPAD_HANDLER_PATH "Path to custom crashpad_handler executable (op option(MUE_ENABLE_CUSTOM_ALLOCATOR "Enable custom allocator (used for engraving)" OFF) # === Compile === +option(MUE_COMPILE_BUILD_64 "Build 64 bit version of editor" ON) +option(MUE_COMPILE_BUILD_MACOS_APPLE_SILICON "Build for Apple Silicon architecture. Only applicable on Macs with Apple Silicon, and requires suitable Qt version." OFF) option(MUE_COMPILE_USE_PCH "Use precompiled headers." ON) option(MUE_COMPILE_USE_UNITY "Use unity build." ON) option(MUE_COMPILE_USE_CCACHE "Try use ccache" ON) @@ -173,10 +171,6 @@ include(SetupFreetype) include(FindSndFile) -if (BUILD_AUTOUPDATE) - include(SetupSparkle) -endif(BUILD_AUTOUPDATE) - if (MUE_DOWNLOAD_SOUNDFONT) include(DownloadSoundFont) endif(MUE_DOWNLOAD_SOUNDFONT) diff --git a/CMakeSettings.json b/CMakeSettings.json index b43c2cad0f..ddb1eb9927 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -15,11 +15,7 @@ "value": "RELWITHDEBINFO" }, { - "name": "BUILD_FOR_WINSTORE", - "value": "OFF" - }, - { - "name": "BUILD_64", + "name": "MUE_COMPILE_BUILD_64", "value": "ON" }, { @@ -35,4 +31,4 @@ "ctestCommandArgs": "" } ] -} \ No newline at end of file +} diff --git a/SetupConfigure.cmake b/SetupConfigure.cmake index 313940d245..d94b0fb589 100644 --- a/SetupConfigure.cmake +++ b/SetupConfigure.cmake @@ -19,8 +19,10 @@ include(GetBuildType) -message(STATUS "Build configure: ${MUE_BUILD_CONFIGURE}") -string(TOUPPER ${MUE_BUILD_CONFIGURE} _MUE_BUILD_CONFIGURE) +message(STATUS "Build configure: ${MUSESCORE_BUILD_CONFIGURE}") +message(STATUS "Build mode: ${MUSESCORE_BUILD_MODE}") + +string(TOUPPER ${MUSESCORE_BUILD_CONFIGURE} BUILD_CONFIGURE) ########################################### # General @@ -49,11 +51,11 @@ endif() # Desktop App ########################################### set(MUE_GENERAL_APP OFF) -if(_MUE_BUILD_CONFIGURE MATCHES "APP") +if(BUILD_CONFIGURE MATCHES "APP") set(MUE_GENERAL_APP ON) endif() -if(_MUE_BUILD_CONFIGURE MATCHES "APP-PORTABLE") +if(BUILD_CONFIGURE MATCHES "APP-PORTABLE") set(MUE_GENERAL_APP ON) set(WIN_PORTABLE ON) endif() @@ -75,7 +77,7 @@ endif() ########################################### # VTest ########################################### -if(_MUE_BUILD_CONFIGURE MATCHES "VTEST") +if(BUILD_CONFIGURE MATCHES "VTEST") set(MUE_BUILD_AUDIO_MODULE OFF) set(MUE_BUILD_MUSESAMPLER_MODULE OFF) set(MUE_BUILD_NETWORK_MODULE OFF) @@ -102,7 +104,7 @@ endif() ########################################### # UTest ########################################### -if(_MUE_BUILD_CONFIGURE MATCHES "UTEST") +if(BUILD_CONFIGURE MATCHES "UTEST") set(MUE_BUILD_UNIT_TESTS ON) set(MUE_ENABLE_LOGGER_DEBUGLEVEL ON) endif() @@ -151,6 +153,7 @@ if (WIN_PORTABLE) add_definitions(-DWIN_PORTABLE) endif() +add_definitions(-DMUSESCORE_REVISION="${MUSESCORE_REVISION}") add_definitions(-DHAW_PROFILER_ENABLED) if (MUE_ENABLE_LOAD_QML_FROM_SOURCE) diff --git a/build.cmake b/build.cmake index 76a8b1f12d..e58e5af683 100755 --- a/build.cmake +++ b/build.cmake @@ -186,9 +186,9 @@ list(APPEND CONFIGURE_ARGS "-DCMAKE_INSTALL_PREFIX=${INSTALL_PATH}") list(APPEND CONFIGURE_ARGS "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}") if(QT_COMPILER MATCHES "_64$" OR QT_COMPILER MATCHES "mingw64") - list(APPEND CONFIGURE_ARGS "-DBUILD_64=ON") + list(APPEND CONFIGURE_ARGS "-DMUE_COMPILE_BUILD_64=ON") else() - list(APPEND CONFIGURE_ARGS "-DBUILD_64=OFF") + list(APPEND CONFIGURE_ARGS "-DMUE_COMPILE_BUILD_64=OFF") endif() #### ACTUAL BUILD STEPS START HERE #### diff --git a/build/ci/backend/build.sh b/build/ci/backend/build.sh index 50195998df..290286339d 100644 --- a/build/ci/backend/build.sh +++ b/build/ci/backend/build.sh @@ -43,15 +43,15 @@ done if [ -z "$BUILD_NUMBER" ]; then echo "error: not set BUILD_NUMBER"; exit 1; fi if [ -z "$BUILD_MODE" ]; then BUILD_MODE=$(cat $ARTIFACTS_DIR/env/build_mode.env); fi -MUSESCORE_BUILD_CONFIG=dev +MUSESCORE_BUILD_MODE=dev case "${BUILD_MODE}" in -"devel_build") MUSESCORE_BUILD_CONFIG=dev;; -"testing_build") MUSESCORE_BUILD_CONFIG=testing;; -"stable_build") MUSESCORE_BUILD_CONFIG=release;; +"devel_build") MUSESCORE_BUILD_MODE=dev;; +"testing_build") MUSESCORE_BUILD_MODE=testing;; +"stable_build") MUSESCORE_BUILD_MODE=release;; esac -echo "MUSESCORE_BUILD_CONFIG: $MUSESCORE_BUILD_CONFIG" +echo "MUSESCORE_BUILD_MODE: $MUSESCORE_BUILD_MODE" echo "BUILD_NUMBER: $BUILD_NUMBER" echo "BUILD_MODE: $BUILD_MODE" echo "BUILD_VIDEOEXPORT: $BUILD_VIDEOEXPORT" @@ -66,14 +66,14 @@ echo "=== BUILD ===" MUSESCORE_REVISION=$(git rev-parse --short=7 HEAD) # Build -MUSESCORE_BUILD_CONFIG=$MUSESCORE_BUILD_CONFIG \ +MUSESCORE_BUILD_MODE=$MUSESCORE_BUILD_MODE \ MUSESCORE_BUILD_NUMBER=$BUILD_NUMBER \ MUSESCORE_REVISION=$MUSESCORE_REVISION \ MUSESCORE_BUILD_VIDEOEXPORT_MODULE=$BUILD_VIDEOEXPORT \ bash ./ninja_build.sh -t appimage -bash ./build/ci/tools/make_release_channel_env.sh -c $MUSESCORE_BUILD_CONFIG +bash ./build/ci/tools/make_release_channel_env.sh -c $MUSESCORE_BUILD_MODE bash ./build/ci/tools/make_version_env.sh $BUILD_NUMBER bash ./build/ci/tools/make_revision_env.sh $MUSESCORE_REVISION bash ./build/ci/tools/make_branch_env.sh diff --git a/build/ci/linux/build.sh b/build/ci/linux/build.sh index 014e63f093..d82c11b450 100755 --- a/build/ci/linux/build.sh +++ b/build/ci/linux/build.sh @@ -48,17 +48,17 @@ if [ -z "$BUILD_NUMBER" ]; then echo "error: not set BUILD_NUMBER"; exit 1; fi if [ -z "$BUILD_MODE" ]; then BUILD_MODE=$(cat $ARTIFACTS_DIR/env/build_mode.env); fi if [ -z "$YOUTUBE_API_KEY" ]; then YOUTUBE_API_KEY=""; fi -MUSESCORE_BUILD_CONFIG=dev +MUSESCORE_BUILD_MODE=dev case "${BUILD_MODE}" in -"devel_build") MUSESCORE_BUILD_CONFIG=dev; SUFFIX=dev;; -"nightly_build") MUSESCORE_BUILD_CONFIG=dev; SUFFIX=nightly;; -"testing_build") MUSESCORE_BUILD_CONFIG=testing; SUFFIX=testing;; -"stable_build") MUSESCORE_BUILD_CONFIG=release; SUFFIX="";; -"mtests") MUSESCORE_BUILD_CONFIG=dev; BUILDTYPE=installdebug; OPTIONS="USE_SYSTEM_FREETYPE=ON UPDATE_CACHE=FALSE PREFIX=$ARTIFACTS_DIR/software";; +"devel_build") MUSESCORE_BUILD_MODE=dev; SUFFIX=dev;; +"nightly_build") MUSESCORE_BUILD_MODE=dev; SUFFIX=nightly;; +"testing_build") MUSESCORE_BUILD_MODE=testing; SUFFIX=testing;; +"stable_build") MUSESCORE_BUILD_MODE=release; SUFFIX="";; +"mtests") MUSESCORE_BUILD_MODE=dev; BUILDTYPE=installdebug; OPTIONS="USE_SYSTEM_FREETYPE=ON UPDATE_CACHE=FALSE PREFIX=$ARTIFACTS_DIR/software";; esac -echo "MUSESCORE_BUILD_CONFIG: $MUSESCORE_BUILD_CONFIG" +echo "MUSESCORE_BUILD_MODE: $MUSESCORE_BUILD_MODE" echo "BUILD_NUMBER: $BUILD_NUMBER" echo "CRASH_REPORT_URL: $CRASH_REPORT_URL" echo "BUILD_MODE: $BUILD_MODE" @@ -89,7 +89,7 @@ echo "=== BUILD ===" MUSESCORE_REVISION=$(git rev-parse --short=7 HEAD) # Build portable AppImage -MUSESCORE_BUILD_CONFIG=$MUSESCORE_BUILD_CONFIG \ +MUSESCORE_BUILD_MODE=$MUSESCORE_BUILD_MODE \ MUSESCORE_INSTALL_SUFFIX=$SUFFIX \ MUSESCORE_BUILD_NUMBER=$BUILD_NUMBER \ MUSESCORE_REVISION=$MUSESCORE_REVISION \ @@ -102,7 +102,7 @@ MUSESCORE_BUILD_UPDATE_MODULE=${MUSESCORE_BUILD_UPDATE_MODULE:-"ON"} \ bash ./ninja_build.sh -t appimage -bash ./build/ci/tools/make_release_channel_env.sh -c $MUSESCORE_BUILD_CONFIG +bash ./build/ci/tools/make_release_channel_env.sh -c $MUSESCORE_BUILD_MODE bash ./build/ci/tools/make_version_env.sh $BUILD_NUMBER bash ./build/ci/tools/make_revision_env.sh $MUSESCORE_REVISION bash ./build/ci/tools/make_branch_env.sh diff --git a/build/ci/linux/build_utest.sh b/build/ci/linux/build_utest.sh index 1153efda47..35d70f9b30 100644 --- a/build/ci/linux/build_utest.sh +++ b/build/ci/linux/build_utest.sh @@ -55,7 +55,7 @@ echo "=== BUILD ===" MUSESCORE_REVISION=$(git rev-parse --short=7 HEAD) -MUSESCORE_BUILD_CONFIG=dev \ +MUSESCORE_BUILD_MODE=dev \ MUSESCORE_BUILD_NUMBER=$BUILD_NUMBER \ MUSESCORE_REVISION=$MUSESCORE_REVISION \ MUSESCORE_BUILD_VST_MODULE=$BUILD_VST \ diff --git a/build/ci/macos/build.sh b/build/ci/macos/build.sh index d2a4a4dfe0..37b647dcc2 100644 --- a/build/ci/macos/build.sh +++ b/build/ci/macos/build.sh @@ -41,11 +41,11 @@ if [ -z "$BUILD_NUMBER" ]; then echo "error: not set BUILD_NUMBER"; exit 1; fi if [ -z "$YOUTUBE_API_KEY" ]; then YOUTUBE_API_KEY=""; fi BUILD_MODE=$(cat $ARTIFACTS_DIR/env/build_mode.env) -MUSESCORE_BUILD_CONFIG=dev -if [ "$BUILD_MODE" == "devel_build" ]; then MUSESCORE_BUILD_CONFIG=dev; fi -if [ "$BUILD_MODE" == "nightly_build" ]; then MUSESCORE_BUILD_CONFIG=dev; fi -if [ "$BUILD_MODE" == "testing_build" ]; then MUSESCORE_BUILD_CONFIG=testing; fi -if [ "$BUILD_MODE" == "stable_build" ]; then MUSESCORE_BUILD_CONFIG=release; fi +MUSESCORE_BUILD_MODE=dev +if [ "$BUILD_MODE" == "devel_build" ]; then MUSESCORE_BUILD_MODE=dev; fi +if [ "$BUILD_MODE" == "nightly_build" ]; then MUSESCORE_BUILD_MODE=dev; fi +if [ "$BUILD_MODE" == "testing_build" ]; then MUSESCORE_BUILD_MODE=testing; fi +if [ "$BUILD_MODE" == "stable_build" ]; then MUSESCORE_BUILD_MODE=release; fi if [ -z "$VST3_SDK_PATH" ]; then echo "warning: not set VST3_SDK_PATH, build VST module disabled" @@ -54,7 +54,7 @@ else BUILD_VST=ON fi -echo "MUSESCORE_BUILD_CONFIG: $MUSESCORE_BUILD_CONFIG" +echo "MUSESCORE_BUILD_MODE: $MUSESCORE_BUILD_MODE" echo "BUILD_NUMBER: $BUILD_NUMBER" echo "CRASH_REPORT_URL: $CRASH_REPORT_URL" echo "VST3_SDK_PATH: $VST3_SDK_PATH" @@ -63,7 +63,7 @@ echo "YOUTUBE_API_KEY: $YOUTUBE_API_KEY" MUSESCORE_REVISION=$(git rev-parse --short=7 HEAD) MUSESCORE_INSTALL_DIR="../applebuild" \ -MUSESCORE_BUILD_CONFIG=$MUSESCORE_BUILD_CONFIG \ +MUSESCORE_BUILD_MODE=$MUSESCORE_BUILD_MODE \ MUSESCORE_BUILD_NUMBER=$BUILD_NUMBER \ MUSESCORE_REVISION=$MUSESCORE_REVISION \ MUSESCORE_CRASHREPORT_URL=$CRASH_REPORT_URL \ @@ -72,7 +72,7 @@ MUSESCORE_VST3_SDK_PATH=$VST3_SDK_PATH \ MUSESCORE_YOUTUBE_API_KEY=$YOUTUBE_API_KEY \ bash ./ninja_build.sh -t install -bash ./build/ci/tools/make_release_channel_env.sh -c $MUSESCORE_BUILD_CONFIG +bash ./build/ci/tools/make_release_channel_env.sh -c $MUSESCORE_BUILD_MODE bash ./build/ci/tools/make_version_env.sh $BUILD_NUMBER bash ./build/ci/tools/make_revision_env.sh $MUSESCORE_REVISION bash ./build/ci/tools/make_branch_env.sh diff --git a/build/ci/tools/make_release_channel_env.sh b/build/ci/tools/make_release_channel_env.sh index 73f7184f81..87e932810c 100644 --- a/build/ci/tools/make_release_channel_env.sh +++ b/build/ci/tools/make_release_channel_env.sh @@ -19,21 +19,21 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ARTIFACTS_DIR=build.artifacts -MUSESCORE_BUILD_CONFIG=dev +MUSESCORE_BUILD_MODE=dev while [[ "$#" -gt 0 ]]; do case $1 in - -c|--build_config) MUSESCORE_BUILD_CONFIG="$2"; shift ;; + -c|--build-mode) MUSESCORE_BUILD_MODE="$2"; shift ;; *) echo "Unknown parameter passed: $1"; exit 1 ;; esac shift done -if [ -z "$MUSESCORE_BUILD_CONFIG" ]; then echo "error: not set MUSESCORE_BUILD_CONFIG"; exit 1; fi +if [ -z "$MUSESCORE_BUILD_MODE" ]; then echo "error: not set MUSESCORE_BUILD_MODE"; exit 1; fi -echo "MUSESCORE_BUILD_CONFIG: $MUSESCORE_BUILD_CONFIG" +echo "MUSESCORE_BUILD_MODE: $MUSESCORE_BUILD_MODE" -export MSCORE_RELEASE_CHANNEL=$(cmake -DMUSESCORE_BUILD_CONFIG=$MUSESCORE_BUILD_CONFIG -P config.cmake | sed -n -e 's/^.*MSCORE_RELEASE_CHANNEL *//p') +export MSCORE_RELEASE_CHANNEL=$(cmake -DMUSESCORE_BUILD_MODE=$MUSESCORE_BUILD_MODE -P config.cmake | sed -n -e 's/^.*MSCORE_RELEASE_CHANNEL *//p') echo ${MSCORE_RELEASE_CHANNEL} > $ARTIFACTS_DIR/env/release_channel.env -cat $ARTIFACTS_DIR/env/release_channel.env \ No newline at end of file +cat $ARTIFACTS_DIR/env/release_channel.env diff --git a/build/ci/windows/build.bat b/build/ci/windows/build.bat index ed5a26d953..44272fd8e3 100644 --- a/build/ci/windows/build.bat +++ b/build/ci/windows/build.bat @@ -27,16 +27,16 @@ IF NOT %TARGET_PROCESSOR_BITS% == 64 ( ) SET /p BUILD_MODE=<%ARTIFACTS_DIR%\env\build_mode.env -SET "MUSESCORE_BUILD_CONFIG=dev" -IF %BUILD_MODE% == devel_build ( SET "MUSESCORE_BUILD_CONFIG=dev" ) ELSE ( -IF %BUILD_MODE% == nightly_build ( SET "MUSESCORE_BUILD_CONFIG=dev" ) ELSE ( -IF %BUILD_MODE% == testing_build ( SET "MUSESCORE_BUILD_CONFIG=testing" ) ELSE ( -IF %BUILD_MODE% == stable_build ( SET "MUSESCORE_BUILD_CONFIG=release" ) ELSE ( +SET "MUSESCORE_BUILD_MODE=dev" +IF %BUILD_MODE% == devel_build ( SET "MUSESCORE_BUILD_MODE=dev" ) ELSE ( +IF %BUILD_MODE% == nightly_build ( SET "MUSESCORE_BUILD_MODE=dev" ) ELSE ( +IF %BUILD_MODE% == testing_build ( SET "MUSESCORE_BUILD_MODE=testing" ) ELSE ( +IF %BUILD_MODE% == stable_build ( SET "MUSESCORE_BUILD_MODE=release" ) ELSE ( ECHO "error: unknown BUILD_MODE: %BUILD_MODE%" EXIT /b 1 )))) -ECHO "MUSESCORE_BUILD_CONFIG: %MUSESCORE_BUILD_CONFIG%" +ECHO "MUSESCORE_BUILD_MODE: %MUSESCORE_BUILD_MODE%" ECHO "BUILD_NUMBER: %BUILD_NUMBER%" ECHO "TARGET_PROCESSOR_BITS: %TARGET_PROCESSOR_BITS%" ECHO "CRASH_LOG_SERVER_URL: %CRASH_LOG_SERVER_URL%" @@ -63,8 +63,8 @@ IF %BUILD_WIN_PORTABLE% == ON ( bash ./build/ci/tools/make_revision_env.sh SET /p MUSESCORE_REVISION=<%ARTIFACTS_DIR%\env\build_revision.env -SET MUSESCORE_BUILD_CONFIG=%MUSESCORE_BUILD_CONFIG% SET MUSESCORE_BUILD_CONFIGURE=%MUSESCORE_BUILD_CONFIGURE% +SET MUSESCORE_BUILD_MODE=%MUSESCORE_BUILD_MODE% SET MUSESCORE_BUILD_NUMBER=%BUILD_NUMBER% SET MUSESCORE_REVISION=%MUSESCORE_REVISION% SET MUSESCORE_INSTALL_DIR=%INSTALL_DIR% @@ -75,6 +75,6 @@ SET MUSESCORE_YOUTUBE_API_KEY=%YOUTUBE_API_KEY% CALL ninja_build.bat -t installrelwithdebinfo || exit \b 1 -bash ./build/ci/tools/make_release_channel_env.sh -c %MUSESCORE_BUILD_CONFIG% +bash ./build/ci/tools/make_release_channel_env.sh -c %MUSESCORE_BUILD_MODE% bash ./build/ci/tools/make_version_env.sh %BUILD_NUMBER% bash ./build/ci/tools/make_branch_env.sh diff --git a/build/cmake/SetupBuildEnvironment.cmake b/build/cmake/SetupBuildEnvironment.cmake index 9f54559fa9..0cd9cfd0dd 100644 --- a/build/cmake/SetupBuildEnvironment.cmake +++ b/build/cmake/SetupBuildEnvironment.cmake @@ -53,9 +53,9 @@ elseif(CC_IS_MINGW) # -mno-ms-bitfields see #22048 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields") - if (NOT BUILD_64) + if (NOT MUE_COMPILE_BUILD_64) set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware") - endif (NOT BUILD_64) + endif() add_definitions(-D_UNICODE) add_definitions(-DUNICODE) @@ -119,7 +119,7 @@ endif() # APPLE specific if (OS_IS_MAC) - if (BUILD_MACOS_APPLE_SILICON) + if (MUE_COMPILE_BUILD_MACOS_APPLE_SILICON) set(CMAKE_OSX_ARCHITECTURES ) # leave empty, use default else() set(CMAKE_OSX_ARCHITECTURES x86_64) diff --git a/build/cmake/SetupDependencies.cmake b/build/cmake/SetupDependencies.cmake index 241f321c00..91b7a9b946 100644 --- a/build/cmake/SetupDependencies.cmake +++ b/build/cmake/SetupDependencies.cmake @@ -3,11 +3,11 @@ include(${CMAKE_CURRENT_LIST_DIR}/GetPlatformInfo.cmake) if (OS_IS_WIN) - if (BUILD_64) + if (MUE_COMPILE_BUILD_64) set(DEPENDENCIES_DIR "${PROJECT_SOURCE_DIR}/dependencies/libx64") - else (BUILD_64) + else() set(DEPENDENCIES_DIR "${PROJECT_SOURCE_DIR}/dependencies/libx86") - endif (BUILD_64) + endif() link_directories(${DEPENDENCIES_DIR}) diff --git a/build/cmake/TryUseLocalRevision.cmake b/build/cmake/TryUseLocalRevision.cmake index b7e82f33b3..85d7d5f39b 100644 --- a/build/cmake/TryUseLocalRevision.cmake +++ b/build/cmake/TryUseLocalRevision.cmake @@ -4,4 +4,4 @@ if (MUSESCORE_REVISION STREQUAL "") file(READ "${PROJECT_SOURCE_DIR}/local_build_revision.env" MUSESCORE_REVISION) STRING(REGEX REPLACE "\n" "" MUSESCORE_REVISION "${MUSESCORE_REVISION}") endif() -endif(MUSESCORE_REVISION STREQUAL "") +endif() diff --git a/build/cmake_wrapper.bat b/build/cmake_wrapper.bat index 397251a594..f829109a75 100644 --- a/build/cmake_wrapper.bat +++ b/build/cmake_wrapper.bat @@ -9,7 +9,7 @@ set "TARGET_PROCESSOR_BITS=64" :loop rem CMD splits arguments on equals sign, so -DFOO=BAR is treated as -DFOO and BAR if "%~1%~2" == "" goto continue - if "%~1=%~2" == "-DBUILD_64=OFF" set "TARGET_PROCESSOR_BITS=32" + if "%~1=%~2" == "-DMUE_COMPILE_BUILD_64=OFF" set "TARGET_PROCESSOR_BITS=32" shift goto loop :continue diff --git a/build/config.h.in b/build/config.h.in index 299780bc60..9d44311ae0 100644 --- a/build/config.h.in +++ b/build/config.h.in @@ -26,7 +26,6 @@ #cmakedefine MSCORE_UNSTABLE #define MUSESCORE_NAME_VERSION "${MUSESCORE_NAME_VERSION}" -#define MUSESCORE_REVISION "${MUSESCORE_REVISION}" #define INSTALL_NAME "${Mscore_INSTALL_NAME}" #define INSTPREFIX "${CMAKE_INSTALL_PREFIX}" #define INSTSUFFIX "${MSCORE_INSTALL_SUFFIX}" @@ -40,7 +39,5 @@ #cmakedefine ENGRAVING_COMPAT_WRITEEXCERPTS_302 #cmakedefine APP_UPDATABLE -#cmakedefine SPARKLE_ENABLED -#cmakedefine FOR_WINSTORE #endif /* MUSESCORE_CONFIG_H */ diff --git a/config.cmake b/config.cmake index 453dcad704..7ac9274e98 100644 --- a/config.cmake +++ b/config.cmake @@ -24,12 +24,12 @@ SET(MUSESCORE_VERSION_MINOR "1") SET(MUSESCORE_VERSION_PATCH "0") SET(MUSESCORE_VERSION_LABEL "") -message(STATUS "MUSESCORE_BUILD_CONFIG ${MUSESCORE_BUILD_CONFIG}") -if (NOT MUSESCORE_BUILD_CONFIG) - SET(MUSESCORE_BUILD_CONFIG "dev") +message(STATUS "MUSESCORE_BUILD_MODE ${MUSESCORE_BUILD_MODE}") +if (NOT MUSESCORE_BUILD_MODE) + SET(MUSESCORE_BUILD_MODE "dev") endif() -include(${CMAKE_CURRENT_LIST_DIR}/build/cmake/config/${MUSESCORE_BUILD_CONFIG}.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/build/cmake/config/${MUSESCORE_BUILD_MODE}.cmake) SET(MUSESCORE_VERSION "${MUSESCORE_VERSION_MAJOR}.${MUSESCORE_VERSION_MINOR}") # Version schema x.x.x is hardcoded in source diff --git a/msvc_build.bat b/msvc_build.bat index ddd77ebfce..a33bb5138d 100644 --- a/msvc_build.bat +++ b/msvc_build.bat @@ -44,8 +44,7 @@ IF "%GENERATOR_NAME%"=="" ( GOTO :END ) -REM BUILD_64 and BUILD_FOR_WINSTORE are used in CMakeLists.txt -SET BUILD_FOR_WINSTORE=OFF +REM BUILD_64 used in CMakeLists.txt SET "BUILD_FOLDER=msvc.build" SET "INSTALL_FOLDER=msvc.install" @@ -79,7 +78,7 @@ ECHO "BUILD_WIN_PORTABLE: %BUILD_WIN_PORTABLE%" IF "%BUILD_WIN_PORTABLE%"=="ON" ( SET "INSTALL_FOLDER=MuseScorePortable\App\MuseScore" SET "BUILD_AUTOUPDATE=OFF" - SET "WIN_PORTABLE_OPT=-DMUE_BUILD_CONFIGURE="app-portable" + SET "WIN_PORTABLE_OPT=-DMUSESCORE_BUILD_CONFIGURE="app-portable" ) ECHO "INSTALL_FOLDER: %INSTALL_FOLDER%" @@ -181,9 +180,7 @@ IF /I "%1"=="clean" ( IF NOT "%MSCORE_STABLE_BUILD%" == "" ( IF NOT "%CRASH_LOG_SERVER_URL%" == "" ( - IF "%BUILD_FOR_WINSTORE%" == "OFF" ( - SET CRASH_REPORT_URL_OPT=-DMUE_CRASH_REPORT_URL=%CRASH_LOG_SERVER_URL% -DBUILD_CRASH_REPORTER=ON - ) + SET CRASH_REPORT_URL_OPT=-DMUE_CRASH_REPORT_URL=%CRASH_LOG_SERVER_URL% -DBUILD_CRASH_REPORTER=ON ) IF NOT "%YOUTUBE_API_KEY%" == "" ( @@ -191,8 +188,8 @@ IF NOT "%MSCORE_STABLE_BUILD%" == "" ( ) ) -IF "%MUSESCORE_BUILD_CONFIG%" == "" ( - SET MUSESCORE_BUILD_CONFIG="dev" +IF "%MUSESCORE_BUILD_MODE%" == "" ( + SET MUSESCORE_BUILD_MODE="dev" ) IF NOT "%BUILD_VST%" == "" ( @@ -211,7 +208,7 @@ REM -DCMAKE_BUILD_NUMBER=%BUILD_NUMBER% -DCMAKE_BUILD_AUTOUPDATE=%BUILD_AUTOUPDA REM and run CMake again automatically with the same options as before. ) ELSE ( echo Building CMake configuration... - cmake -G "%GENERATOR_NAME%" -A "%PLATFORM_NAME%" -DCMAKE_INSTALL_PREFIX=../%INSTALL_FOLDER% -DCMAKE_BUILD_TYPE=%CONFIGURATION_STR% -DMUSESCORE_BUILD_CONFIG=%MUSESCORE_BUILD_CONFIG% -DMUSESCORE_REVISION=%MUSESCORE_REVISION% -DBUILD_FOR_WINSTORE=%BUILD_FOR_WINSTORE% -DBUILD_64=%BUILD_64% -DCMAKE_BUILD_NUMBER=%BUILD_NUMBER% -DBUILD_AUTOUPDATE=%BUILD_AUTOUPDATE% %BUILD_VST_OPT% %VST3_SDK_PATH_OPT% %CRASH_REPORT_URL_OPT% %YOUTUBE_API_KEY_OPT% %WIN_PORTABLE_OPT% .. + cmake -G "%GENERATOR_NAME%" -A "%PLATFORM_NAME%" -DCMAKE_INSTALL_PREFIX=../%INSTALL_FOLDER% -DCMAKE_BUILD_TYPE=%CONFIGURATION_STR% -DMUSESCORE_BUILD_MODE=%MUSESCORE_BUILD_MODE% -DMUSESCORE_REVISION=%MUSESCORE_REVISION% -DMUE_COMPILE_BUILD_64=%BUILD_64% -DCMAKE_BUILD_NUMBER=%BUILD_NUMBER% -DBUILD_AUTOUPDATE=%BUILD_AUTOUPDATE% %BUILD_VST_OPT% %VST3_SDK_PATH_OPT% %CRASH_REPORT_URL_OPT% %YOUTUBE_API_KEY_OPT% %WIN_PORTABLE_OPT% .. IF !ERRORLEVEL! NEQ 0 ( set OLD_ERRORLEVEL=!ERRORLEVEL! del /f "CMakeCache.txt" diff --git a/ninja_build.sh b/ninja_build.sh index 7d032f3dd8..d856b22139 100755 --- a/ninja_build.sh +++ b/ninja_build.sh @@ -24,8 +24,8 @@ TARGET=release MUSESCORE_INSTALL_DIR=${MUSESCORE_INSTALL_DIR:-"../build.install"} MUSESCORE_INSTALL_SUFFIX=${MUSESCORE_INSTALL_SUFFIX:-""} MUSESCORE_LABEL=${MUSESCORE_LABEL:-""} -MUSESCORE_BUILD_CONFIG=${MUSESCORE_BUILD_CONFIG:-"dev"} MUSESCORE_BUILD_CONFIGURE=${DMUSESCORE_BUILD_CONFIGURE:-"app"} +MUSESCORE_BUILD_MODE=${MUSESCORE_BUILD_MODE:-"dev"} MUSESCORE_BUILD_NUMBER=${MUSESCORE_BUILD_NUMBER:-"12345678"} MUSESCORE_REVISION=${MUSESCORE_REVISION:-"abc123456"} MUSESCORE_RUN_LRELEASE=${MUSESCORE_RUN_LRELEASE:-"OFF"} @@ -38,22 +38,8 @@ MUSESCORE_BUILD_UNIT_TESTS=${MUSESCORE_BUILD_UNIT_TESTS:-"OFF"} MUSESCORE_NO_RPATH=${MUSESCORE_NO_RPATH:-"OFF"} MUSESCORE_YOUTUBE_API_KEY=${MUSESCORE_YOUTUBE_API_KEY:-""} MUSESCORE_BUILD_UPDATE_MODULE=${MUSESCORE_BUILD_UPDATE_MODULE:-"ON"} -MUSESCORE_BUILD_SHORTCUTS_MODULE=${MUSESCORE_BUILD_SHORTCUTS_MODULE:-"ON"} -MUSESCORE_BUILD_NETWORK_MODULE=${MUSESCORE_BUILD_NETWORK_MODULE:-"ON"} -MUSESCORE_BUILD_AUDIO_MODULE=${MUSESCORE_BUILD_AUDIO_MODULE:-"ON"} MUSESCORE_BUILD_VST_MODULE=${MUSESCORE_BUILD_VST_MODULE:-"OFF"} -MUSESCORE_BUILD_LEARN_MODULE=${MUSESCORE_BUILD_LEARN_MODULE:-"ON"} -MUSESCORE_BUILD_WORKSPACE_MODULE=${MUSESCORE_BUILD_WORKSPACE_MODULE:-"ON"} -MUSESCORE_BUILD_CLOUD_MODULE=${MUSESCORE_BUILD_CLOUD_MODULE:-"ON"} -MUSESCORE_BUILD_LANGUAGES_MODULE=${MUSESCORE_BUILD_LANGUAGES_MODULE:-"ON"} -MUSESCORE_BUILD_PLUGINS_MODULE=${MUSESCORE_BUILD_PLUGINS_MODULE:-"ON"} -MUSESCORE_BUILD_PLAYBACK_MODULE=${MUSESCORE_BUILD_PLAYBACK_MODULE:-"ON"} -MUSESCORE_BUILD_PALETTE_MODULE=${MUSESCORE_BUILD_PALETTE_MODULE:-"ON"} -MUSESCORE_BUILD_INSTRUMENTSSCENE_MODULE=${MUSESCORE_BUILD_INSTRUMENTSSCENE_MODULE:-"ON"} -MUSESCORE_BUILD_INSPECTOR_MODULE=${MUSESCORE_BUILD_INSPECTOR_MODULE:-"ON"} -MUSESCORE_BUILD_MULTIINSTANCES_MODULE=${MUSESCORE_BUILD_MULTIINSTANCES_MODULE:-"ON"} MUSESCORE_BUILD_VIDEOEXPORT_MODULE=${MUSESCORE_BUILD_VIDEOEXPORT_MODULE:-"OFF"} -MUSESCORE_BUILD_IMPORTEXPORT_MODULE=${MUSESCORE_BUILD_IMPORTEXPORT_MODULE:-"ON"} SHOW_HELP=0 while [[ "$#" -gt 0 ]]; do @@ -85,29 +71,15 @@ function do_build() { -DCMAKE_INSTALL_PREFIX="${MUSESCORE_INSTALL_DIR}" \ -DMSCORE_INSTALL_SUFFIX="${MUSESCORE_INSTALL_SUFFIX}" \ -DMUSESCORE_LABEL="${MUSESCORE_LABEL}" \ - -DMUSESCORE_BUILD_CONFIG="${MUSESCORE_BUILD_CONFIG}" \ - -DMUE_BUILD_CONFIGURE="${MUSESCORE_BUILD_CONFIGURE}" \ + -DMUSESCORE_BUILD_CONFIGURE="${MUSESCORE_BUILD_CONFIGURE}" \ + -DMUSESCORE_BUILD_MODE="${MUSESCORE_BUILD_MODE}" \ -DCMAKE_BUILD_NUMBER="${MUSESCORE_BUILD_NUMBER}" \ -DMUSESCORE_REVISION="${MUSESCORE_REVISION}" \ -DMUE_RUN_LRELEASE="${MUSESCORE_RUN_LRELEASE}" \ - -DMUE_BUILD_AUDIO_MODULE="${MUSESCORE_BUILD_AUDIO_MODULE}" \ - -DMUE_BUILD_NETWORK_MODULE="${MUSESCORE_BUILD_NETWORK_MODULE}" \ - -DMUE_BUILD_SHORTCUTS_MODULE="${MUSESCORE_BUILD_SHORTCUTS_MODULE}" \ -DMUE_BUILD_VST_MODULE="${MUSESCORE_BUILD_VST_MODULE}" \ - -DMUE_BUILD_CLOUD_MODULE="${MUSESCORE_BUILD_CLOUD_MODULE}" \ - -DMUE_BUILD_IMPORTEXPORT_MODULE="${MUSESCORE_BUILD_IMPORTEXPORT_MODULE}" \ -DMUE_BUILD_VIDEOEXPORT_MODULE="${MUSESCORE_BUILD_VIDEOEXPORT_MODULE}" \ - -DMUE_BUILD_INSPECTOR_MODULE="${MUSESCORE_BUILD_INSPECTOR_MODULE}" \ - -DMUE_BUILD_INSTRUMENTSSCENE_MODULE="${MUSESCORE_BUILD_INSTRUMENTSSCENE_MODULE}" \ - -DMUE_BUILD_LANGUAGES_MODULE="${MUSESCORE_BUILD_LANGUAGES_MODULE}" \ - -DMUE_BUILD_LEARN_MODULE="${MUSESCORE_BUILD_LEARN_MODULE}" \ -DMUE_LEARN_YOUTUBE_API_KEY="${MUSESCORE_YOUTUBE_API_KEY}" \ - -DMUE_BUILD_MULTIINSTANCES_MODULE="${MUSESCORE_BUILD_MULTIINSTANCES_MODULE}" \ - -DMUE_BUILD_PALETTE_MODULE="${MUSESCORE_BUILD_PALETTE_MODULE}" \ - -DMUE_BUILD_PLAYBACK_MODULE="${MUSESCORE_BUILD_PLAYBACK_MODULE}" \ - -DMUE_BUILD_PLUGINS_MODULE="${MUSESCORE_BUILD_PLUGINS_MODULE}" \ -DMUE_BUILD_UPDATE_MODULE="${MUSESCORE_BUILD_UPDATE_MODULE}" \ - -DMUE_BUILD_WORKSPACE_MODULE="${MUSESCORE_BUILD_WORKSPACE_MODULE}" \ -DMUE_DOWNLOAD_SOUNDFONT="${MUSESCORE_DOWNLOAD_SOUNDFONT}" \ -DMUE_BUILD_UNIT_TESTS="${MUSESCORE_BUILD_UNIT_TESTS}" \ -DMUE_BUILD_CRASHPAD_CLIENT="${MUSESCORE_BUILD_CRASHPAD_CLIENT}" \ diff --git a/sandbox/engraving/config.h b/sandbox/engraving/config.h index be12859512..02c22e7a16 100644 --- a/sandbox/engraving/config.h +++ b/sandbox/engraving/config.h @@ -20,15 +20,12 @@ #ifndef MUSESCORE_CONFIG_H #define MUSESCORE_CONFIG_H -/* #undef FOR_WINSTORE */ - #define MSCORE_UNSTABLE /* #undef HAS_MIDI */ /* #undef HAS_AUDIOFILE */ #define MUSESCORE_NAME_VERSION "MuseScore 4 (4.0.0 unstable)" -#define MUSESCORE_REVISION "" #define INSTALL_NAME "mscore-4.0/" #define INSTPREFIX "/home/igor/Dev/MuseScore/build.debug/install" #define VERSION "4.0.0" @@ -38,7 +35,6 @@ /* #undef ENGRAVING_BUILD_ACCESSIBLE_TREE */ -/* #undef SPARKLE_ENABLED */ /* #undef OPENGL */ diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index 9f17594c1f..d313b098c4 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -275,10 +275,6 @@ else() qt5_import_qml_plugins(mscore PATH_TO_SCAN ${CMAKE_SOURCE_DIR}) endif() -if (OS_IS_MAC AND SPARKLE_ENABLED) - target_link_libraries(mscore ${SPARKLE_LIBRARY}) -endif() - ########################################### # INSTALL diff --git a/tools/check_build_without_qt/config.h b/tools/check_build_without_qt/config.h index a501cb1b0b..925ee1a9a9 100644 --- a/tools/check_build_without_qt/config.h +++ b/tools/check_build_without_qt/config.h @@ -20,8 +20,6 @@ #ifndef MUSESCORE_CONFIG_H #define MUSESCORE_CONFIG_H -/* #undef FOR_WINSTORE */ - #define MSCORE_UNSTABLE /* #undef HAS_MIDI */ @@ -29,7 +27,6 @@ /* #undef HAS_AUDIOFILE */ #define MUSESCORE_NAME_VERSION "MuseScore 4 (4.0.0 unstable)" -#define MUSESCORE_REVISION "" #define INSTALL_NAME "mscore-4.0/" #define INSTPREFIX "/home/igor/Dev/MuseScore/build.debug/install" #define VERSION "4.0.0" @@ -40,7 +37,6 @@ /* #undef ENGRAVING_BUILD_ACCESSIBLE_TREE */ -/* #undef SPARKLE_ENABLED */ /* #undef OPENGL */