Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MU3] Fix macOS dmg name, fix macOS dmg window height, update version number #7360

Merged
merged 3 commits into from
Jan 29, 2021
Merged

[MU3] Fix macOS dmg name, fix macOS dmg window height, update version number #7360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2299540
Fix name of macOS dmg
cbjeukendrup Jan 28, 2021
07781de
Fix height of macOS dmg window
cbjeukendrup Jan 28, 2021
28fb14a
Update version number
cbjeukendrup Jan 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 24 additions & 7 deletions build/ci/macos/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,32 @@ fi

BUILD_MODE=$(cat $ARTIFACTS_DIR/env/build_mode.env)
BUILD_VERSION=$(cat $ARTIFACTS_DIR/env/build_version.env)
BUILD_REVISION=$(cat $ARTIFACTS_DIR/env/build_revision.env)

APP_LONGER_NAME="MuseScore 3"
if [ "$BUILD_MODE" == "devel_build" ]; then APP_LONGER_NAME="MuseScore $BUILD_VERSION Devel"; fi
if [ "$BUILD_MODE" == "nightly_build" ]; then APP_LONGER_NAME="MuseScore $BUILD_VERSION Nightly"; fi
if [ "$BUILD_MODE" == "testing_build" ]; then APP_LONGER_NAME="MuseScore $BUILD_VERSION Testing"; fi
if [ "$BUILD_MODE" == "stable_build" ]; then APP_LONGER_NAME="MuseScore 3"; fi
VERSION_MAJOR="$(cut -d'.' -f1 <<<"$BUILD_VERSION")"
VERSION_MINOR="$(cut -d'.' -f2 <<<"$BUILD_VERSION")"
VERSION_PATCH="$(cut -d'.' -f3 <<<"$BUILD_VERSION")"

build/package_mac --longer_name "$APP_LONGER_NAME"
APP_LONGER_NAME="MuseScore $VERSION_MAJOR"
PACKAGE_VERSION="$BUILD_VERSION"
if [ "$BUILD_MODE" == "devel_build" ]; then
APP_LONGER_NAME="MuseScore $BUILD_VERSION Devel"
PACKAGE_VERSION="${VERSION_MAJOR}.${VERSION_MINOR}b-${BUILD_REVISION}"
fi
if [ "$BUILD_MODE" == "nightly_build" ]; then
APP_LONGER_NAME="MuseScore $BUILD_VERSION Nightly";
PACKAGE_VERSION="${VERSION_MAJOR}.${VERSION_MINOR}b-${BUILD_REVISION}"
fi
if [ "$BUILD_MODE" == "testing_build" ]; then
APP_LONGER_NAME="MuseScore $BUILD_VERSION Testing";
PACKAGE_VERSION="${VERSION_MAJOR}.${VERSION_MINOR}b-${BUILD_REVISION}"
fi
if [ "$BUILD_MODE" == "stable_build" ]; then
APP_LONGER_NAME="MuseScore $VERSION_MAJOR";
PACKAGE_VERSION="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}"
fi

build/package_mac --longer_name "$APP_LONGER_NAME" --version "$PACKAGE_VERSION"

DMGFILE="$(ls applebuild/*.dmg)"
echo "DMGFILE: $DMGFILE"
Expand All @@ -66,7 +84,6 @@ if [ "$BUILD_MODE" == "nightly_build" ]; then

BUILD_DATETIME=$(cat $ARTIFACTS_DIR/env/build_datetime.env)
BUILD_BRANCH=$(cat $ARTIFACTS_DIR/env/build_branch.env)
BUILD_REVISION=$(cat $ARTIFACTS_DIR/env/build_revision.env)
ARTIFACT_NAME=MuseScoreNightly-${BUILD_DATETIME}-${BUILD_BRANCH}-${BUILD_REVISION}.dmg

else
Expand Down
4 changes: 2 additions & 2 deletions build/package_mac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function set_bundle_display_options() {
set statusbar visible to false
set current view to icon view
delay 1 -- sync
set the bounds to {0, 0, 540, 300}
set the bounds to {0, 0, 540, 345}
end tell
delay 1 -- sync
set icon size of the icon view options of container window to 128
Expand All @@ -54,7 +54,7 @@ function set_bundle_display_options() {
set position of item "Applications" to {150,110}
open
set background picture of the icon view options of container window to file "background.tiff" of folder "Pictures"
set the bounds of the container window to {0, 0, 540, 300}
set the bounds of the container window to {0, 0, 540, 345}
update without registering applications
delay 5 -- sync
close
Expand Down
2 changes: 1 addition & 1 deletion config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
SET(MUSESCORE_NAME "MuseScore")
SET(MUSESCORE_VERSION_MAJOR "3")
SET(MUSESCORE_VERSION_MINOR "6")
SET(MUSESCORE_VERSION_PATCH "0")
SET(MUSESCORE_VERSION_PATCH "2")
SET(MUSESCORE_VERSION_LABEL "")

message(STATUS "MUSESCORE_BUILD_CONFIG ${MUSESCORE_BUILD_CONFIG}")
Expand Down