mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed MacOS versioning as well.

Browse source 
Signed-off-by: Michael Keller <github@ike.ch>
This commit is contained in:
Michael Keller 2024-07-31 09:44:51 +12:00
parent df4358d252
commit 6c4bb6ddeb
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/mac.yml vendored
View file

@ -41,6 +41,8 @@ jobs:
- name: build Subsurface - name: build Subsurface
id: build id: build
env:
CANONICALVERSION: ${{ steps.version_number.outputs.version }}
run: | run: |
cd ${GITHUB_WORKSPACE}/.. cd ${GITHUB_WORKSPACE}/..
export QT_ROOT=${GITHUB_WORKSPACE}/qt-mac/Qt5.15.13 export QT_ROOT=${GITHUB_WORKSPACE}/qt-mac/Qt5.15.13

14
packaging/macosx/make-package.sh
View file

@ -11,7 +11,9 @@ DMGCREATE=create-dmg
# same git version magic as in the Makefile # same git version magic as in the Makefile
# for the naming of volume and dmg we want the 3 digits of the full version number # for the naming of volume and dmg we want the 3 digits of the full version number
VERSION=$(cd ${DIR}/subsurface; ./scripts/get-version.sh) if [ -z "${CANONICALVERSION+X}" ] ; then
CANONICALVERSION=$(cd ${DIR}/subsurface; ./scripts/get-version.sh)
fi
# first build and install Subsurface and then clean up the staging area # first build and install Subsurface and then clean up the staging area
# make sure we didn't lose the minimum OS version # make sure we didn't lose the minimum OS version
@ -104,13 +106,13 @@ if [ "$SIGN" = "1" ] ; then
sh ${DIR}/subsurface/packaging/macosx/sign sh ${DIR}/subsurface/packaging/macosx/sign
fi fi
if [ -f ./Subsurface-$VERSION.dmg ]; then if [ -f ./Subsurface-$CANONICALVERSION.dmg ]; then
rm ./Subsurface-$VERSION.dmg.bak rm ./Subsurface-$CANONICALVERSION.dmg.bak
mv ./Subsurface-$VERSION.dmg ./Subsurface-$VERSION.dmg.bak mv ./Subsurface-$CANONICALVERSION.dmg ./Subsurface-$CANONICALVERSION.dmg.bak
fi fi
$DMGCREATE --background ${DIR}/subsurface/packaging/macosx/DMG-Background.png \ $DMGCREATE --background ${DIR}/subsurface/packaging/macosx/DMG-Background.png \
--window-size 500 300 --icon-size 96 --volname Subsurface-$VERSION \ --window-size 500 300 --icon-size 96 --volname Subsurface-$CANONICALVERSION \
--app-drop-link 380 205 \ --app-drop-link 380 205 \
--volicon ${DIR}/subsurface/packaging/macosx/Subsurface.icns \ --volicon ${DIR}/subsurface/packaging/macosx/Subsurface.icns \
--icon "Subsurface" 110 205 ./Subsurface-$VERSION.dmg ./staging --icon "Subsurface" 110 205 ./Subsurface-$CANONICALVERSION.dmg ./staging