diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2021-12-28 19:53:54 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2021-12-28 19:53:54 +0100 |
commit | bbd1056afbf2f9e61fe2e8d7fe86ff6fe6b5cee0 (patch) | |
tree | 4fa19ce78e5702cdb35c281d35f7d654abcd347a /utils/cmake/deploy.cmake | |
parent | 3d983ad3a1e931678b5ba512a153c3460a88d246 (diff) | |
download | rockbox-bbd1056afbf2f9e61fe2e8d7fe86ff6fe6b5cee0.tar.gz rockbox-bbd1056afbf2f9e61fe2e8d7fe86ff6fe6b5cee0.zip |
themeeditor: Fix dmg deploy steps.
- Fix binary name in Info.plist.
- Run dmgbuild as Python module, in some cases it isn't available directly.
- Add missing dmgbuild configuration for themeeditor.
Change-Id: I2db50959b88283f43e2203cf71b130cdb33103dd
Diffstat (limited to 'utils/cmake/deploy.cmake')
-rw-r--r-- | utils/cmake/deploy.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/utils/cmake/deploy.cmake b/utils/cmake/deploy.cmake index 34e937f5d5..4a43c033fa 100644 --- a/utils/cmake/deploy.cmake +++ b/utils/cmake/deploy.cmake | |||
@@ -73,12 +73,13 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") | |||
73 | if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") | 73 | if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") |
74 | message(WARNING "Deploying a Debug build.") | 74 | message(WARNING "Deploying a Debug build.") |
75 | endif() | 75 | endif() |
76 | set(DMGBUILD ${CMAKE_BINARY_DIR}/venv/bin/dmgbuild) | 76 | set(DMGBUILD ${CMAKE_BINARY_DIR}/venv/bin/python3 -m dmgbuild) |
77 | set(DMGBUILD_STAMP ${CMAKE_BINARY_DIR}/dmgbuild.stamp) | ||
77 | find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${qtbindir}") | 78 | find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${qtbindir}") |
78 | 79 | ||
79 | add_custom_command( | 80 | add_custom_command( |
80 | COMMENT "Setting up dmgbuild virtualenv" | 81 | COMMENT "Setting up dmgbuild virtualenv" |
81 | OUTPUT ${DMGBUILD} | 82 | OUTPUT ${DMGBUILD_STAMP} |
82 | COMMAND python3 -m venv ${CMAKE_BINARY_DIR}/venv | 83 | COMMAND python3 -m venv ${CMAKE_BINARY_DIR}/venv |
83 | COMMAND ${CMAKE_BINARY_DIR}/venv/bin/python -m pip install -q dmgbuild | 84 | COMMAND ${CMAKE_BINARY_DIR}/venv/bin/python -m pip install -q dmgbuild |
84 | ) | 85 | ) |
@@ -92,7 +93,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") | |||
92 | -Dappbundle=${target}.app | 93 | -Dappbundle=${target}.app |
93 | ${target} ${CMAKE_BINARY_DIR}/${target}.dmg | 94 | ${target} ${CMAKE_BINARY_DIR}/${target}.dmg |
94 | DEPENDS ${target} | 95 | DEPENDS ${target} |
95 | ${DMGBUILD} | 96 | ${DMGBUILD_STAMP} |
96 | ) | 97 | ) |
97 | add_custom_target(deploy_${target} | 98 | add_custom_target(deploy_${target} |
98 | DEPENDS ${CMAKE_BINARY_DIR}/${target}.dmg) | 99 | DEPENDS ${CMAKE_BINARY_DIR}/${target}.dmg) |