mirror
/
SpaghettiKart
mirror of https://github.com/HarbourMasters/SpaghettiKart
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix appImage asset extraction (#563) 

* Update vcpkg.json

* fix appimage
This commit is contained in:
coco875 2025-11-14 21:37:04 +01:00 committed by GitHub
parent a9f69d86c8
commit c2755aee40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@ -352,8 +352,6 @@ jobs:
name: spaghetti-linux-x64 name: spaghetti-linux-x64
path: | path: |
spaghetti.appimage spaghetti.appimage
config.yml
yamls
gamecontrollerdb.txt gamecontrollerdb.txt
build-linux-docker: build-linux-docker:

8
cmake/configure-packaging.cmake
View File

@ -1,6 +1,6 @@
set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY 0) set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY 0)
set(CPACK_COMPONENTS_ALL "Starship") set(CPACK_COMPONENTS_ALL "SpaghettiKart")
if (CPACK_GENERATOR STREQUAL "External") if (CPACK_GENERATOR STREQUAL "External")
list(APPEND CPACK_COMPONENTS_ALL "extractor" "appimage") list(APPEND CPACK_COMPONENTS_ALL "extractor" "appimage")
@ -21,9 +21,9 @@ set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/bin")
endif() endif()
if (CPACK_GENERATOR MATCHES "Bundle") if (CPACK_GENERATOR MATCHES "Bundle")
set(CPACK_BUNDLE_NAME "Starship") set(CPACK_BUNDLE_NAME "SpaghettiKart")
set(CPACK_BUNDLE_PLIST "macosx/Info.plist") set(CPACK_BUNDLE_PLIST "macosx/Info.plist")
set(CPACK_BUNDLE_ICON "macosx/Starship.icns") set(CPACK_BUNDLE_ICON "macosx/SpaghettiKart.icns")
# set(CPACK_BUNDLE_STARTUP_COMMAND "macosx/Starship-macos.sh") # set(CPACK_BUNDLE_STARTUP_COMMAND "macosx/SpaghettiKart-macos.sh")
set(CPACK_BUNDLE_APPLE_CERT_APP "-") set(CPACK_BUNDLE_APPLE_CERT_APP "-")
endif() endif()

4
cmake/packaging.cmake
View File

@ -60,7 +60,7 @@ if (NOT LINUXDEPLOY_EXECUTABLE)
message(STATUS "Downloading linuxdeploy") message(STATUS "Downloading linuxdeploy")
set(LINUXDEPLOY_EXECUTABLE ${CPACK_PACKAGE_DIRECTORY}/linuxdeploy/linuxdeploy) set(LINUXDEPLOY_EXECUTABLE ${CPACK_PACKAGE_DIRECTORY}/linuxdeploy/linuxdeploy)
file(DOWNLOAD file(DOWNLOAD
https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20240109-1/linuxdeploy-x86_64.AppImage https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20251107-1/linuxdeploy-x86_64.AppImage
${LINUXDEPLOY_EXECUTABLE} ${LINUXDEPLOY_EXECUTABLE}
INACTIVITY_TIMEOUT 10 INACTIVITY_TIMEOUT 10
LOG ${CPACK_PACKAGE_DIRECTORY}/linuxdeploy/download.log LOG ${CPACK_PACKAGE_DIRECTORY}/linuxdeploy/download.log
@ -69,6 +69,8 @@ if (NOT LINUXDEPLOY_EXECUTABLE)
endif() endif()
execute_process( execute_process(
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CPACK_PACKAGE_DIRECTORY}/config.yml" "${CPACK_TEMPORARY_DIRECTORY}/usr/bin/config.yml"
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CPACK_PACKAGE_DIRECTORY}/yamls/" "${CPACK_TEMPORARY_DIRECTORY}/usr/bin/yamls/"
COMMAND COMMAND
${CMAKE_COMMAND} -E env ${CMAKE_COMMAND} -E env
OUTPUT=${CPACK_PACKAGE_FILE_NAME}.appimage OUTPUT=${CPACK_PACKAGE_FILE_NAME}.appimage