From 9b6c7f805f44314099489df2d9f2a7a8bbe31fd5 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 10 Nov 2024 20:25:05 -0500 Subject: [PATCH] refactor: mv res/dist/mac => deploy/dist/mac --- cmake/Packaging.cmake | 2 +- .../dist/mac/bundle/Contents/Info.plist.in | 0 {res => deploy}/dist/mac/bundle/Contents/PkgInfo.in | 0 .../dist/mac/bundle/Contents/Resources/App.icns | Bin .../mac/bundle/Contents/Resources/Background.tiff | Bin .../dist/mac/bundle/Contents/Resources/Volume.icns | Bin {res => deploy}/dist/mac/dmgbuild/settings.py | 0 scripts/lib/mac.py | 2 +- 8 files changed, 2 insertions(+), 2 deletions(-) rename {res => deploy}/dist/mac/bundle/Contents/Info.plist.in (100%) rename {res => deploy}/dist/mac/bundle/Contents/PkgInfo.in (100%) rename {res => deploy}/dist/mac/bundle/Contents/Resources/App.icns (100%) rename {res => deploy}/dist/mac/bundle/Contents/Resources/Background.tiff (100%) rename {res => deploy}/dist/mac/bundle/Contents/Resources/Volume.icns (100%) rename {res => deploy}/dist/mac/dmgbuild/settings.py (100%) diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake index a2229443f..a408cd732 100644 --- a/cmake/Packaging.cmake +++ b/cmake/Packaging.cmake @@ -83,7 +83,7 @@ macro(configure_mac_packaging) set(CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks") set(DESKFLOW_BUNDLE_SOURCE_DIR - ${PROJECT_SOURCE_DIR}/res/dist/mac/bundle + ${PROJECT_SOURCE_DIR}/deploy/dist/mac/bundle CACHE PATH "Path to the macOS app bundle") set(DESKFLOW_BUNDLE_DIR ${PROJECT_BINARY_DIR}/bundle/${DESKFLOW_APP_NAME}.app) set(DESKFLOW_BUNDLE_BINARY_DIR ${DESKFLOW_BUNDLE_DIR}/Contents/MacOS) diff --git a/res/dist/mac/bundle/Contents/Info.plist.in b/deploy/dist/mac/bundle/Contents/Info.plist.in similarity index 100% rename from res/dist/mac/bundle/Contents/Info.plist.in rename to deploy/dist/mac/bundle/Contents/Info.plist.in diff --git a/res/dist/mac/bundle/Contents/PkgInfo.in b/deploy/dist/mac/bundle/Contents/PkgInfo.in similarity index 100% rename from res/dist/mac/bundle/Contents/PkgInfo.in rename to deploy/dist/mac/bundle/Contents/PkgInfo.in diff --git a/res/dist/mac/bundle/Contents/Resources/App.icns b/deploy/dist/mac/bundle/Contents/Resources/App.icns similarity index 100% rename from res/dist/mac/bundle/Contents/Resources/App.icns rename to deploy/dist/mac/bundle/Contents/Resources/App.icns diff --git a/res/dist/mac/bundle/Contents/Resources/Background.tiff b/deploy/dist/mac/bundle/Contents/Resources/Background.tiff similarity index 100% rename from res/dist/mac/bundle/Contents/Resources/Background.tiff rename to deploy/dist/mac/bundle/Contents/Resources/Background.tiff diff --git a/res/dist/mac/bundle/Contents/Resources/Volume.icns b/deploy/dist/mac/bundle/Contents/Resources/Volume.icns similarity index 100% rename from res/dist/mac/bundle/Contents/Resources/Volume.icns rename to deploy/dist/mac/bundle/Contents/Resources/Volume.icns diff --git a/res/dist/mac/dmgbuild/settings.py b/deploy/dist/mac/dmgbuild/settings.py similarity index 100% rename from res/dist/mac/dmgbuild/settings.py rename to deploy/dist/mac/dmgbuild/settings.py diff --git a/scripts/lib/mac.py b/scripts/lib/mac.py index 7e26c1e4a..81ef8545f 100644 --- a/scripts/lib/mac.py +++ b/scripts/lib/mac.py @@ -23,7 +23,7 @@ CERT_P12_ENV = "APPLE_P12_CERTIFICATE" NOTARY_USER_ENV = "APPLE_NOTARY_USER" CODESIGN_ENV = "APPLE_CODESIGN_ID" SHELL_RC = "~/.zshrc" -SETTINGS_FILE = "res/dist/mac/dmgbuild/settings.py" +SETTINGS_FILE = "deploy/dist/mac/dmgbuild/settings.py" SECURITY_PATH = "/usr/bin/security" SUDO_PATH = "/usr/bin/sudo" NOTARYTOOL_PATH = "/usr/bin/notarytool"