From 6e5c6bcf804750bbcc43d3bec971c9137fb4e263 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 10 Nov 2024 20:10:19 -0500 Subject: [PATCH] refactor: mv res/dist/arch => deploy/dist/arch --- cmake/Packaging.cmake | 4 ---- deploy/CMakeLists.txt | 7 +++++++ {res => deploy}/dist/arch/PKGBUILD.in | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) rename {res => deploy}/dist/arch/PKGBUILD.in (92%) diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake index ce0a7d327..a2229443f 100644 --- a/cmake/Packaging.cmake +++ b/cmake/Packaging.cmake @@ -188,10 +188,6 @@ macro(configure_linux_packaging) # 12), so we must add it manually. set(CPACK_DEBIAN_PACKAGE_DEPENDS "qt6-qpa-plugins") - # Prepare PKGBUILD for Arch Linux - configure_file(${DESKFLOW_PROJECT_RES_DIR}/dist/arch/PKGBUILD.in - ${CMAKE_BINARY_DIR}/PKGBUILD @ONLY) - endmacro() # diff --git a/deploy/CMakeLists.txt b/deploy/CMakeLists.txt index 2155e434e..fcda7c293 100644 --- a/deploy/CMakeLists.txt +++ b/deploy/CMakeLists.txt @@ -25,4 +25,11 @@ elseif(NOT APPLE) RENAME org.deskflow.deskflow.png ) + # Prepare PKGBUILD for Arch Linux + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/dist/arch/PKGBUILD.in + ${CMAKE_BINARY_DIR}/PKGBUILD + @ONLY + ) + endif() diff --git a/res/dist/arch/PKGBUILD.in b/deploy/dist/arch/PKGBUILD.in similarity index 92% rename from res/dist/arch/PKGBUILD.in rename to deploy/dist/arch/PKGBUILD.in index 63221172d..3343bdb01 100644 --- a/res/dist/arch/PKGBUILD.in +++ b/deploy/dist/arch/PKGBUILD.in @@ -1,6 +1,6 @@ -# Maintainer: @DESKFLOW_MAINTAINER@ +# Maintainer: Deskflow Developers -pkgname=@DESKFLOW_APP_ID@ +pkgname=deskflow pkgver=@DESKFLOW_VERSION@ pkgrel=1 pkgdesc="Mouse and keyboard sharing utility"