LoweBowe
/
MuseScore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake cleanup: clarify names of MUSESCORE_VERSION variables

This commit is contained in:
Casper Jeukendrup 2023-09-03 20:22:13 +02:00
parent dca368d856
commit cf17123bea
No known key found for this signature in database
GPG Key ID: 6C571BEF59E722DD
7 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SetupConfigure.cmake
View File

@ -64,7 +64,7 @@ if(BUILD_MODE MATCHES "RELEASE")
endif()
if (MUSESCORE_UNSTABLE)
set (MUSESCORE_NAME_VERSION "${MUSESCORE_NAME_VERSION} (${MUSESCORE_VERSION_FULL} unstable)")
set (MUSESCORE_NAME_VERSION "${MUSESCORE_NAME_VERSION} (${MUSESCORE_VERSION} unstable)")
endif()
###########################################
@ -77,7 +77,7 @@ elseif (OS_IS_WIN)
SET(Mscore_INSTALL_NAME "")
SET(Mscore_SHARE_NAME "./")
else()
SET(Mscore_INSTALL_NAME "mscore${MUSESCORE_INSTALL_SUFFIX}-${MUSESCORE_VERSION}/")
SET(Mscore_INSTALL_NAME "mscore${MUSESCORE_INSTALL_SUFFIX}-${MUSESCORE_VERSION_MAJ_MIN}/")
SET(Mscore_SHARE_NAME "share/")
endif()
@ -227,7 +227,7 @@ endif()
add_definitions(-DMUSESCORE_REVISION="${MUSESCORE_REVISION}")
add_definitions(-DMUSESCORE_BUILD_NUMBER="${CMAKE_BUILD_NUMBER}")
add_definitions(-DMUSESCORE_VERSION="${MUSESCORE_VERSION_FULL}")
add_definitions(-DMUSESCORE_VERSION="${MUSESCORE_VERSION}")
add_definitions(-DMUSESCORE_VERSION_LABEL="${MUSESCORE_VERSION_LABEL}")
add_definitions(-DMUSESCORE_INSTALL_SUFFIX="${MUSESCORE_INSTALL_SUFFIX}")
add_definitions(-DMUSESCORE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")

8
build/Linux+BSD/org.musescore.MuseScore.appdata.xml.in
View File

@ -101,10 +101,10 @@
<image>https://raw.githubusercontent.com/flathub/org.musescore.MuseScore/master/screenshots/07-new-score-wizard.png</image>
</screenshot>
</screenshots>
<translation type="qt">mscore@MUSESCORE_INSTALL_SUFFIX@-@MUSESCORE_VERSION@/locale/instruments</translation>
<translation type="qt">mscore@MUSESCORE_INSTALL_SUFFIX@-@MUSESCORE_VERSION@/locale/musescore</translation>
<translation type="qt">mscore@MUSESCORE_INSTALL_SUFFIX@-@MUSESCORE_VERSION@/locale/qt</translation>
<translation type="qt">mscore@MUSESCORE_INSTALL_SUFFIX@-@MUSESCORE_VERSION@/locale/qtbase</translation>
<translation type="qt">mscore@MUSESCORE_INSTALL_SUFFIX@-@MUSESCORE_VERSION_MAJ_MIN@/locale/instruments</translation>
<translation type="qt">mscore@MUSESCORE_INSTALL_SUFFIX@-@MUSESCORE_VERSION_MAJ_MIN@/locale/musescore</translation>
<translation type="qt">mscore@MUSESCORE_INSTALL_SUFFIX@-@MUSESCORE_VERSION_MAJ_MIN@/locale/qt</translation>
<translation type="qt">mscore@MUSESCORE_INSTALL_SUFFIX@-@MUSESCORE_VERSION_MAJ_MIN@/locale/qtbase</translation>
<content_rating type="oars-1.1"/>
<!-- GNOME extensions -->
<kudos>

4
build/PortableApps/appinfo.ini.in
View File

@ -19,8 +19,8 @@ Freeware=true
CommercialUse=true
[Version]
PackageVersion=@MUSESCORE_VERSION_FULL@.1
DisplayVersion=@MUSESCORE_VERSION_FULL@
PackageVersion=@MUSESCORE_VERSION@.1
DisplayVersion=@MUSESCORE_VERSION@
[Control]
Icons=1

3
build/ci/tools/make_version_env.sh
View File

@ -26,10 +26,9 @@ ARTIFACTS_DIR="build.artifacts" # default output dir
if [ -z "$2" ]; then OUT_DIR=${ARTIFACTS_DIR}/env; fi
export MUSESCORE_VERSION=$(cmake -P version.cmake | sed -n -e 's/^.*MUSESCORE_VERSION_FULL *//p')
export MUSESCORE_VERSION=$(cmake -P version.cmake | sed -n -e 's/^.*MUSESCORE_VERSION *//p')
MUSESCORE_VERSION_FULL=$MUSESCORE_VERSION.$BUILD_NUMBER
echo ${MUSESCORE_VERSION_FULL} > ${OUT_DIR}/build_version.env
cat ${OUT_DIR}/build_version.env

6
build/cmake/SetupAppImagePackaging.cmake
View File

@ -12,10 +12,10 @@ endif()
if(MUSESCORE_UNSTABLE)
# Use short name to avoid truncation by GNOME launcher. Save room for
# a suffix in case multiple dev/nightly builds are installed.
set(DESKTOP_LAUNCHER_NAME "MU ${MUSESCORE_VERSION}") # MU X.Y
set(DESKTOP_LAUNCHER_NAME "MU ${MUSESCORE_VERSION_MAJ_MIN}") # MU X.Y
else(MUSESCORE_UNSTABLE)
# Use full name for stable releases
set(DESKTOP_LAUNCHER_NAME "${MUSESCORE_NAME} ${MUSESCORE_VERSION}") # MuseScore X.Y
set(DESKTOP_LAUNCHER_NAME "${MUSESCORE_NAME} ${MUSESCORE_VERSION_MAJ_MIN}") # MuseScore X.Y
endif(MUSESCORE_UNSTABLE)
if(${MUSESCORE_INSTALL_SUFFIX} MATCHES "dev")
@ -40,7 +40,7 @@ if(${MUSESCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "portableanything" wo
get_filename_component(PORTABLE_INSTALL_NAME ${CMAKE_INSTALL_PREFIX} NAME) # Strip path (basename)
if(NOT MUSESCORE_UNSTABLE)
set(PORTABLE_INSTALL_NAME "${PORTABLE_INSTALL_NAME}-${MUSESCORE_VERSION_FULL}") # Append version info.
set(PORTABLE_INSTALL_NAME "${PORTABLE_INSTALL_NAME}-${MUSESCORE_VERSION}") # Append version info.
endif(NOT MUSESCORE_UNSTABLE)
set(PORTABLE_INSTALL_NAME "${PORTABLE_INSTALL_NAME}-${ARCH}") # Append system architecture.

4
src/app/CMakeLists.txt
View File

@ -68,8 +68,8 @@ elseif(OS_IS_MAC)
set(MACOSX_BUNDLE_ICON_FILE AppIcon.icns)
set(MACOSX_BUNDLE_GUI_IDENTIFIER org.musescore.${MUSESCORE_NAME})
set(MACOSX_BUNDLE_BUNDLE_NAME ${MUSESCORE_NAME})
set(MACOSX_BUNDLE_LONG_VERSION_STRING ${MUSESCORE_VERSION_FULL})
set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${MUSESCORE_VERSION_FULL})
set(MACOSX_BUNDLE_LONG_VERSION_STRING ${MUSESCORE_VERSION})
set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${MUSESCORE_VERSION})
set(MACOSX_BUNDLE_BUNDLE_VERSION ${CMAKE_BUILD_NUMBER})
set(MACOSX_BUNDLE_COPYRIGHT "Copyright © 1999-2023 MuseScore BVBA and others. Published under the GNU General Public License version 3.")

15
version.cmake
View File

@ -18,12 +18,12 @@
#=============================================================================
set(MUSESCORE_NAME "MuseScore")
set(MUSESCORE_VERSION_MAJOR "4")
set(MUSESCORE_VERSION_MINOR "2")
set(MUSESCORE_VERSION_PATCH "0")
set(MUSESCORE_VERSION "${MUSESCORE_VERSION_MAJOR}.${MUSESCORE_VERSION_MINOR}")
set(MUSESCORE_VERSION_FULL "${MUSESCORE_VERSION}.${MUSESCORE_VERSION_PATCH}")
set(MUSESCORE_VERSION_LABEL "")
set(MUSESCORE_VERSION_MAJOR "4")
set(MUSESCORE_VERSION_MINOR "2")
set(MUSESCORE_VERSION_PATCH "0")
set(MUSESCORE_VERSION_MAJ_MIN "${MUSESCORE_VERSION_MAJOR}.${MUSESCORE_VERSION_MINOR}")
set(MUSESCORE_VERSION "${MUSESCORE_VERSION_MAJ_MIN}.${MUSESCORE_VERSION_PATCH}")
set(MUSESCORE_VERSION_LABEL "")
if(MUSESCORE_BUILD_MODE MATCHES "dev")
set(MUSESCORE_RELEASE_CHANNEL "devel")
@ -39,5 +39,4 @@ endif()
# Print variables which are needed by CI build scripts.
message(STATUS "MUSESCORE_RELEASE_CHANNEL ${MUSESCORE_RELEASE_CHANNEL}")
message(STATUS "MUSESCORE_VERSION_FULL ${MUSESCORE_VERSION_FULL}")
message(STATUS "MUSESCORE_VERSION ${MUSESCORE_VERSION}")