Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

cmake_minimum_required(VERSION 3.28)

project(MuseScore LANGUAGES C CXX)
project(MuseScoreStudio LANGUAGES C CXX)

set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ MuseScore Studio is an open source and free music notation software. For support

## More info

- [MuseScore Homepage](https://musescore.org)
- [MuseScore Git workflow instructions](https://musescore.org/en/developers-handbook/git-workflow)
- [How to compile MuseScore?](https://github.com/musescore/MuseScore/wiki/Set-up-developer-environment)
- [MuseScore Studio Homepage](https://musescore.org)
- [MuseScore Studio Git workflow instructions](https://musescore.org/en/developers-handbook/git-workflow)
- [How to compile MuseScore Studio?](https://github.com/musescore/MuseScore/wiki/Set-up-developer-environment)

## License

Expand Down Expand Up @@ -81,7 +81,7 @@ used by default, as it provides a useful compromise between Release and Debug.

### Testing

See the [Unit tests section](https://github.com/musescore/MuseScore/wiki/Unit-tests) of the [MuseScore Wiki](https://github.com/musescore/MuseScore/wiki) for instructions on how to run the test suite.
See the [Unit tests section](https://github.com/musescore/MuseScore/wiki/Unit-tests) of the [MuseScore Studio Wiki](https://github.com/musescore/MuseScore/wiki) for instructions on how to run the test suite.

### Code Formatting

Expand Down
4 changes: 0 additions & 4 deletions SetupConfigure.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,13 @@ string(TOUPPER ${MUSE_APP_BUILD_MODE} BUILD_MODE)
if(BUILD_MODE STREQUAL "DEV")
set(MUSE_APP_UNSTABLE ON)
set(MUSE_APP_RELEASE_CHANNEL "dev")
set(MUSE_APP_NAME_VERSION "${MUSE_APP_NAME_VERSION} ${MUSE_APP_RELEASE_CHANNEL}")
set(MUSE_APP_TITLE_VERSION "${MUSE_APP_TITLE_VERSION} ${MUSE_APP_RELEASE_CHANNEL}")
set(MUSE_APP_IS_PRERELEASE ON)
set(MUSESCORE_ALLOW_UPDATE_ON_PRERELEASE OFF)
endif()

if(BUILD_MODE STREQUAL "TESTING")
set(MUSE_APP_UNSTABLE OFF)
set(MUSE_APP_RELEASE_CHANNEL "Testing")
set(MUSE_APP_NAME_VERSION "${MUSE_APP_NAME_VERSION} ${MUSE_APP_RELEASE_CHANNEL}")
set(MUSE_APP_TITLE_VERSION "${MUSE_APP_TITLE_VERSION} ${MUSE_APP_RELEASE_CHANNEL}")
set(MUSE_APP_IS_PRERELEASE ON)
set(MUSESCORE_ALLOW_UPDATE_ON_PRERELEASE ON)
endif()
Expand Down
6 changes: 3 additions & 3 deletions buildscripts/packaging/Linux+BSD/SetupAppImagePackaging.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if(MUSE_APP_UNSTABLE)
set(DESKTOP_LAUNCHER_NAME "MU ${MUSE_APP_VERSION_MAJ_MIN}") # Muse X.Y
else(MUSE_APP_UNSTABLE)
# Use full name for stable releases
set(DESKTOP_LAUNCHER_NAME "${MUSE_APP_TITLE} ${MUSE_APP_VERSION_MAJ_MIN}") # Muse X.Y
set(DESKTOP_LAUNCHER_NAME "${MUSE_APP_NAME_HUMAN_READABLE} ${MUSE_APP_VERSION_MAJ_MIN}") # Muse X.Y
endif(MUSE_APP_UNSTABLE)

if(${MUSE_APP_INSTALL_SUFFIX} MATCHES "dev")
Expand Down Expand Up @@ -62,9 +62,9 @@ endif(${MUSE_APP_INSTALL_SUFFIX} MATCHES "portable")
# and icon in the OS dock / taskbar. Run `xprop WM_CLASS` and click on
# App's main window to find out what string to use here.
if(MUSE_APP_UNSTABLE)
set(WINDOW_MANAGER_CLASS "${MUSE_APP_NAME_MACHINE_READABLE_COMPAT}${MUSE_APP_VERSION_MAJOR}Development")
set(WINDOW_MANAGER_CLASS "${MUSE_APP_NAME_MACHINE_READABLE}${MUSE_APP_VERSION_MAJOR}Development")
else()
set(WINDOW_MANAGER_CLASS "${MUSE_APP_NAME_MACHINE_READABLE_COMPAT}${MUSE_APP_VERSION_MAJOR}")
set(WINDOW_MANAGER_CLASS "${MUSE_APP_NAME_MACHINE_READABLE}${MUSE_APP_VERSION_MAJOR}")
endif()

# Install desktop file (perform variable substitution first)
Expand Down
2 changes: 1 addition & 1 deletion buildscripts/packaging/Windows/PortableApps/appinfo.ini.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Publisher=MuseScore Limited and Others
Homepage=PortableApps.com/MuseScorePortable
Donate=musescore.org/donate
Category=Music & Video
Description=MuseScore Portable is the free MuseScore music composition & notation program packaged with a PortableApps.com Launcher as a portable app.
Description=MuseScore Portable is the free MuseScore Studio music composition & notation program packaged with a PortableApps.com Launcher as a portable app.
Language=Multilingual

[License]
Expand Down
19 changes: 10 additions & 9 deletions buildscripts/packaging/Windows/SetupWindowsPackaging.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ endif()

include(InstallRequiredSystemLibraries)

set(CPACK_PACKAGE_NAME ${MUSE_APP_NAME})
set(CPACK_PACKAGE_NAME ${MUSE_APP_NAME_MACHINE_READABLE})
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MuseScore is a full featured WYSIWYG score editor")
set(CPACK_PACKAGE_VENDOR "MuseScore Limited")
set(CPACK_PACKAGE_CONTACT "https://musescore.org")
Expand Down Expand Up @@ -38,12 +38,13 @@ if(MUSE_APP_UNSTABLE)
endif()
endif(MUSE_APP_UNSTABLE)

set(CPACK_PACKAGE_FILE_NAME "${MUSE_APP_NAME}-${MUSE_APP_VERSION}${git_date_string}")
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${MUSE_APP_NAME_VERSION})
set(MUSESCORE_EXECUTABLE_NAME ${MUSE_APP_NAME_MACHINE_READABLE}${MUSE_APP_VERSION_MAJOR})

set(MUSESCORE_EXECUTABLE_NAME ${MUSE_APP_NAME}${MUSE_APP_VERSION_MAJOR})
set(CPACK_PACKAGE_EXECUTABLES "${MUSESCORE_EXECUTABLE_NAME}" "${MUSE_APP_TITLE_VERSION}") # exe name, label
set(CPACK_CREATE_DESKTOP_LINKS "${MUSESCORE_EXECUTABLE_NAME}" "${MUSE_APP_TITLE_VERSION}") # exe name, label
set(CPACK_PACKAGE_FILE_NAME "${MUSE_APP_NAME_MACHINE_READABLE}-${MUSE_APP_VERSION}${git_date_string}")
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${MUSESCORE_EXECUTABLE_NAME})

set(CPACK_PACKAGE_EXECUTABLES "${MUSESCORE_EXECUTABLE_NAME}" "${MUSE_APP_NAME_HUMAN_READABLE} ${MUSE_APP_VERSION_MAJOR}") # exe name, label
set(CPACK_CREATE_DESKTOP_LINKS "${MUSESCORE_EXECUTABLE_NAME}" "${MUSE_APP_NAME_HUMAN_READABLE} ${MUSE_APP_VERSION_MAJOR}") # exe name, label

# Wix-specific options
set(CPACK_GENERATOR "WIX")
Expand All @@ -70,13 +71,13 @@ set(CPACK_WIX_LICENSE_RTF "${PROJECT_SOURCE_DIR}/buildscripts/packaging/Windows/
set(CPACK_WIX_PRODUCT_ICON "${PROJECT_SOURCE_DIR}/share/icons/AppIcon/MS4_AppIcon.ico")
set(CPACK_WIX_UI_BANNER "${PROJECT_SOURCE_DIR}/buildscripts/packaging/Windows/Installer/installer_banner_wix.png")
set(CPACK_WIX_UI_DIALOG "${PROJECT_SOURCE_DIR}/buildscripts/packaging/Windows/Installer/installer_background_wix.png")
set(CPACK_WIX_PROGRAM_MENU_FOLDER "${MUSE_APP_TITLE_VERSION}")
set(CPACK_WIX_PROGRAM_MENU_FOLDER "${MUSE_APP_NAME_HUMAN_READABLE} ${MUSE_APP_VERSION_MAJOR}")
set(CPACK_WIX_EXTENSIONS "WixUtilExtension")

# Extra CPack variables
list(APPEND CPACK_WIX_CANDLE_EXTRA_FLAGS
"-dMUSE_APP_TITLE_VERSION=${MUSE_APP_TITLE_VERSION}"
"-dMUSE_APP_TITLE=${MUSE_APP_TITLE}"
"-dMUSE_APP_TITLE_VERSION=${MUSE_APP_NAME_HUMAN_READABLE} ${MUSE_APP_VERSION_MAJOR}"
"-dMUSE_APP_TITLE=${MUSE_APP_NAME_HUMAN_READABLE}"
"-dMUSESCORE_EXECUTABLE_NAME=${MUSESCORE_EXECUTABLE_NAME}"
"-dMUSE_APP_RELEASE_CHANNEL=${MUSE_APP_RELEASE_CHANNEL}"
"-dCPACK_PACKAGE_VERSION_MAJOR=${CPACK_PACKAGE_VERSION_MAJOR}"
Expand Down
2 changes: 1 addition & 1 deletion muse
Submodule muse updated 1616 files
2 changes: 1 addition & 1 deletion share/plugins/note_names/notenames.qml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// MuseScore
// MuseScore Studio
// Music Composition & Notation
//
// Note Names Plugin
Expand Down
6 changes: 3 additions & 3 deletions src/app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ set(EXECUTABLE_NAME mscore)
###########################################
include(GetPlatformInfo)
if (OS_IS_WIN)
set(EXECUTABLE_NAME ${MUSE_APP_NAME}${MUSE_APP_VERSION_MAJOR})
set(EXECUTABLE_NAME ${MUSE_APP_NAME_MACHINE_READABLE}${MUSE_APP_VERSION_MAJOR})

include(GetCompilerInfo)

Expand Down Expand Up @@ -64,11 +64,11 @@ elseif(OS_IS_LIN)
elseif(OS_IS_MAC)

set(MACOSX_BUNDLE_GUI_IDENTIFIER ${MUSE_APP_GUI_IDENTIFIER})
set(MACOSX_BUNDLE_BUNDLE_NAME ${MUSE_APP_TITLE})
set(MACOSX_BUNDLE_BUNDLE_NAME ${MUSE_APP_NAME_HUMAN_READABLE})
set(MACOSX_BUNDLE_LONG_VERSION_STRING ${MUSE_APP_VERSION})
set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${MUSE_APP_VERSION})
set(MACOSX_BUNDLE_BUNDLE_VERSION ${CMAKE_BUILD_NUMBER})
set(MACOSX_BUNDLE_COPYRIGHT "Copyright © 1999-2026 MuseScore Limited. Published under the GNU General Public License version 3.")
set(MACOSX_BUNDLE_COPYRIGHT "Copyright © 1999-2026 MuseScore Limited and others. Published under the GNU General Public License version 3.")

set(CMAKE_INSTALL_RPATH ${QT_INSTALL_LIBS})
if (MUE_COMPILE_MACOS_PRECOMPILED_DEPS_PATH)
Expand Down
2 changes: 1 addition & 1 deletion src/engraving/api/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-3.0-only
# MuseScore-CLA-applies
#
# MuseScore
# MuseScore Studio
# Music Composition & Notation
#
# Copyright (C) 2025 MuseScore Limited and others
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2025 MuseScore Limited and others
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2025 MuseScore Limited and others
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2023 MuseScore Limited and others
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2021 MuseScore Limited and others
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2025 MuseScore Limited and others
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2021 MuseScore Limited and others
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2021 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/engraving/rendering/score/accidentalslayout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2023 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/engraving/rendering/score/accidentalslayout.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2023 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/engraving/tests/automation/automation_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2025 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/engraving/tests/bsptree_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2024 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/importexport/midi/tests/utils/smfyamlserializer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2025 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/importexport/midi/tests/utils/smfyamlserializer.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2025 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/macos_integration/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ set_target_properties(MuseScoreQuickLookPreviewExtension PROPERTIES
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist"
MACOSX_BUNDLE_BUNDLE_NAME "MuseScoreQuickLookPreviewExtension"
MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_BUILD_NUMBER}"
MACOSX_BUNDLE_COPYRIGHT "Copyright © 1999-2026 MuseScore Limited. Published under the GNU General Public License version 3."
MACOSX_BUNDLE_COPYRIGHT "Copyright © 1999-2026 MuseScore Limited and others. Published under the GNU General Public License version 3."
MACOSX_BUNDLE_GUI_IDENTIFIER "org.musescore.MuseScore.QuickLookPreviewExtension"
MACOSX_BUNDLE_LONG_VERSION_STRING "${MUSE_APP_VERSION}"
MACOSX_BUNDLE_SHORT_VERSION_STRING "${MUSE_APP_VERSION}"
Expand Down
2 changes: 1 addition & 1 deletion src/musesounds/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-3.0-only
# MuseScore-CLA-applies
#
# MuseScore
# MuseScore Studio
# Music Composition & Notation
#
# Copyright (C) 2024 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/musesounds/imusesamplercheckupdatescenario.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2025 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/musesounds/imusesamplercheckupdateservice.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2025 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/musesounds/imusesoundscheckupdatescenario.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2025 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/musesounds/imusesoundscheckupdateservice.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2025 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/musesounds/imusesoundsconfiguration.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2024 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/musesounds/imusesoundsrepository.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2024 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/musesounds/internal/musesamplercheckupdatescenario.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2025 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/musesounds/internal/musesamplercheckupdatescenario.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2025 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/musesounds/internal/musesamplercheckupdateservice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2025 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/musesounds/internal/musesamplercheckupdateservice.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2025 MuseScore Limited and others
Expand Down
2 changes: 1 addition & 1 deletion src/musesounds/internal/musesoundscheckupdatescenario.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* MuseScore Studio
* Music Composition & Notation
*
* Copyright (C) 2025 MuseScore Limited and others
Expand Down
Loading
Loading