Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Include cpu architecture in macOS dmg filename

Browse Source
This commit is contained in:
Jonas Kvinge 2020-12-24 15:34:21 +01:00
parent b58a7c32c2
commit b6a9e1a996
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/ccpp.yml vendored
View File

@ -1076,7 +1076,7 @@ jobs:
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: upload-macos-catalina name: upload-macos-catalina
path: build/strawberry-*-catalina.dmg path: build/strawberry-*-catalina-*.dmg
build-macos-bigsur: build-macos-bigsur:
name: Build macOS Big Sur name: Build macOS Big Sur
@ -1150,7 +1150,7 @@ jobs:
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: upload-macos-bigsur name: upload-macos-bigsur
path: build/strawberry-*-bigsur.dmg path: build/strawberry-*-bigsur-*.dmg
build-windows: build-windows:
@ -1316,7 +1316,7 @@ jobs:
- name: rsync - name: rsync
run: | run: |
set -x set -x
for i in $(find uploads -type f -name 'strawberry-*-catalina.dmg'); do for i in $(find uploads -type f -name 'strawberry-*-catalina-*.dmg'); do
rsync -e "ssh -p 50220 -o StrictHostKeyChecking=no" -va $i travis@echoes.jkvinge.net:/home/travis/builds/macos/catalina/ rsync -e "ssh -p 50220 -o StrictHostKeyChecking=no" -va $i travis@echoes.jkvinge.net:/home/travis/builds/macos/catalina/
done done
@ -1339,6 +1339,6 @@ jobs:
- name: rsync - name: rsync
run: | run: |
set -x set -x
for i in $(find uploads -type f -name 'strawberry-*-bigsur.dmg'); do for i in $(find uploads -type f -name 'strawberry-*-bigsur-*.dmg'); do
rsync -e "ssh -p 50220 -o StrictHostKeyChecking=no" -va $i travis@echoes.jkvinge.net:/home/travis/builds/macos/bigsur/ rsync -e "ssh -p 50220 -o StrictHostKeyChecking=no" -va $i travis@echoes.jkvinge.net:/home/travis/builds/macos/bigsur/
done done

4
cmake/Dmg.cmake
View File

@ -20,13 +20,13 @@ if(MACDEPLOYQT_EXECUTABLE AND MACOS_VERSION_PACKAGE)
add_custom_target(dmg add_custom_target(dmg
COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app
COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macdeploy.py strawberry.app COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macdeploy.py strawberry.app
COMMAND create-dmg --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 strawberry-${STRAWBERRY_VERSION_PACKAGE}-${MACOS_VERSION_PACKAGE}.dmg strawberry.app COMMAND create-dmg --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 strawberry-${STRAWBERRY_VERSION_PACKAGE}-${MACOS_VERSION_PACKAGE}-${CMAKE_HOST_SYSTEM_PROCESSOR}.dmg strawberry.app
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
) )
add_custom_target(dmg2 add_custom_target(dmg2
COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app
COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macdeploy.py strawberry.app COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macdeploy.py strawberry.app
COMMAND create-dmg --skip-jenkins --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 strawberry-${STRAWBERRY_VERSION_PACKAGE}-${MACOS_VERSION_PACKAGE}.dmg strawberry.app COMMAND create-dmg --skip-jenkins --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 strawberry-${STRAWBERRY_VERSION_PACKAGE}-${MACOS_VERSION_PACKAGE}-${CMAKE_HOST_SYSTEM_PROCESSOR}.dmg strawberry.app
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
) )
endif() endif()