From ee35f8d87df66197cfa66ba9b4098228684eb84c Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 10 Nov 2024 20:29:04 -0500 Subject: [PATCH] refactor: mv res/dist/wix => deploy/dist/wix --- cmake/Definitions.cmake | 9 ++++----- cmake/Packaging.cmake | 2 +- {res => deploy}/dist/wix/AppBrowseDlg.wxs | 0 {res => deploy}/dist/wix/AppDlgSequence.wxs | 0 {res => deploy}/dist/wix/AppInstallDirDlg.wxs | 0 {res => deploy}/dist/wix/AppMaintenanceTypeDlg.wxs | 0 {res => deploy}/dist/wix/AppVerifyReadyDlg.wxs | 0 {res => deploy}/dist/wix/AppWelcome.wxs | 2 +- {res => deploy}/dist/wix/DeskflowDlgSequence.wxs | 0 {res => deploy}/dist/wix/Include.wxi.in | 3 +-- {res => deploy}/dist/wix/Installer.sln | 0 {res => deploy}/dist/wix/Installer.wixproj | 0 {res => deploy}/dist/wix/Product.wxs | 10 +++++----- {res => deploy}/dist/wix/images/banner.png | Bin .../dist/wix/images/common_background.png | Bin {res => deploy}/dist/wix/images/dialog.png | Bin .../dist/wix/images/welcome_background.png | Bin .../dist/wix/msm/Microsoft_VC142_CRT_x64.msm | Bin .../dist/wix/msm/Microsoft_VC142_CRT_x86.msm | Bin 19 files changed, 12 insertions(+), 14 deletions(-) rename {res => deploy}/dist/wix/AppBrowseDlg.wxs (100%) rename {res => deploy}/dist/wix/AppDlgSequence.wxs (100%) rename {res => deploy}/dist/wix/AppInstallDirDlg.wxs (100%) rename {res => deploy}/dist/wix/AppMaintenanceTypeDlg.wxs (100%) rename {res => deploy}/dist/wix/AppVerifyReadyDlg.wxs (100%) rename {res => deploy}/dist/wix/AppWelcome.wxs (93%) rename {res => deploy}/dist/wix/DeskflowDlgSequence.wxs (100%) rename {res => deploy}/dist/wix/Include.wxi.in (92%) rename {res => deploy}/dist/wix/Installer.sln (100%) rename {res => deploy}/dist/wix/Installer.wixproj (100%) rename {res => deploy}/dist/wix/Product.wxs (93%) rename {res => deploy}/dist/wix/images/banner.png (100%) rename {res => deploy}/dist/wix/images/common_background.png (100%) rename {res => deploy}/dist/wix/images/dialog.png (100%) rename {res => deploy}/dist/wix/images/welcome_background.png (100%) rename {res => deploy}/dist/wix/msm/Microsoft_VC142_CRT_x64.msm (100%) rename {res => deploy}/dist/wix/msm/Microsoft_VC142_CRT_x86.msm (100%) diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake index 8cc5880d5..dee47b28d 100644 --- a/cmake/Definitions.cmake +++ b/cmake/Definitions.cmake @@ -86,9 +86,9 @@ macro(configure_meta) "Report a bug" CACHE STRING "Text label for the help menu item") - set(DESKFLOW_RES_DIR - "${PROJECT_SOURCE_DIR}/res" - CACHE STRING "Resource directory for images, etc") + set(DESKFLOW_DEPLOY_RES_DIR + "${PROJECT_SOURCE_DIR}/deploy" + CACHE STRING "Deploy resource directory for images, etc") set(DESKFLOW_MAC_BUNDLE_CODE "DFLW" @@ -106,7 +106,7 @@ macro(configure_meta) message(VERBOSE "Website URL: ${DESKFLOW_WEBSITE_URL}") message(VERBOSE "Version URL: ${DESKFLOW_VERSION_URL}") message(VERBOSE "Help text: ${DESKFLOW_HELP_TEXT}") - message(VERBOSE "Res dir: ${DESKFLOW_RES_DIR}") + message(VERBOSE "Res dir: ${DESKFLOW_DEPLOY_RES_DIR}") message(VERBOSE "Mac bundle code: ${DESKFLOW_MAC_BUNDLE_CODE}") message(VERBOSE "Show dev thanks: ${DESKFLOW_SHOW_DEV_THANKS}") @@ -119,7 +119,6 @@ macro(configure_meta) add_definitions(-DDESKFLOW_WEBSITE_URL="${DESKFLOW_WEBSITE_URL}") add_definitions(-DDESKFLOW_VERSION_URL="${DESKFLOW_VERSION_URL}") add_definitions(-DDESKFLOW_HELP_TEXT="${DESKFLOW_HELP_TEXT}") - add_definitions(-DDESKFLOW_RES_DIR="${DESKFLOW_RES_DIR}") if(DESKFLOW_SHOW_DEV_THANKS) message(VERBOSE "Showing developer thanks message") diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake index a408cd732..12e3f3936 100644 --- a/cmake/Packaging.cmake +++ b/cmake/Packaging.cmake @@ -62,7 +62,7 @@ macro(configure_windows_packaging) "8F57C657-BC87-45E6-840E-41242A93511C" CACHE STRING "GUID for 32-bit MSI installer") - configure_files(${PROJECT_SOURCE_DIR}/res/dist/wix + configure_files(${PROJECT_SOURCE_DIR}/deploy/dist/wix ${PROJECT_BINARY_DIR}/installer) if(CMAKE_SYSTEM_PROCESSOR MATCHES AMD64) diff --git a/res/dist/wix/AppBrowseDlg.wxs b/deploy/dist/wix/AppBrowseDlg.wxs similarity index 100% rename from res/dist/wix/AppBrowseDlg.wxs rename to deploy/dist/wix/AppBrowseDlg.wxs diff --git a/res/dist/wix/AppDlgSequence.wxs b/deploy/dist/wix/AppDlgSequence.wxs similarity index 100% rename from res/dist/wix/AppDlgSequence.wxs rename to deploy/dist/wix/AppDlgSequence.wxs diff --git a/res/dist/wix/AppInstallDirDlg.wxs b/deploy/dist/wix/AppInstallDirDlg.wxs similarity index 100% rename from res/dist/wix/AppInstallDirDlg.wxs rename to deploy/dist/wix/AppInstallDirDlg.wxs diff --git a/res/dist/wix/AppMaintenanceTypeDlg.wxs b/deploy/dist/wix/AppMaintenanceTypeDlg.wxs similarity index 100% rename from res/dist/wix/AppMaintenanceTypeDlg.wxs rename to deploy/dist/wix/AppMaintenanceTypeDlg.wxs diff --git a/res/dist/wix/AppVerifyReadyDlg.wxs b/deploy/dist/wix/AppVerifyReadyDlg.wxs similarity index 100% rename from res/dist/wix/AppVerifyReadyDlg.wxs rename to deploy/dist/wix/AppVerifyReadyDlg.wxs diff --git a/res/dist/wix/AppWelcome.wxs b/deploy/dist/wix/AppWelcome.wxs similarity index 93% rename from res/dist/wix/AppWelcome.wxs rename to deploy/dist/wix/AppWelcome.wxs index 77d2b2645..6e63f352a 100644 --- a/res/dist/wix/AppWelcome.wxs +++ b/deploy/dist/wix/AppWelcome.wxs @@ -7,7 +7,7 @@ welcome_background - + diff --git a/res/dist/wix/DeskflowDlgSequence.wxs b/deploy/dist/wix/DeskflowDlgSequence.wxs similarity index 100% rename from res/dist/wix/DeskflowDlgSequence.wxs rename to deploy/dist/wix/DeskflowDlgSequence.wxs diff --git a/res/dist/wix/Include.wxi.in b/deploy/dist/wix/Include.wxi.in similarity index 92% rename from res/dist/wix/Include.wxi.in rename to deploy/dist/wix/Include.wxi.in index f649f0b7d..2d3d17de2 100644 --- a/res/dist/wix/Include.wxi.in +++ b/deploy/dist/wix/Include.wxi.in @@ -5,9 +5,8 @@ - - + diff --git a/res/dist/wix/Installer.sln b/deploy/dist/wix/Installer.sln similarity index 100% rename from res/dist/wix/Installer.sln rename to deploy/dist/wix/Installer.sln diff --git a/res/dist/wix/Installer.wixproj b/deploy/dist/wix/Installer.wixproj similarity index 100% rename from res/dist/wix/Installer.wixproj rename to deploy/dist/wix/Installer.wixproj diff --git a/res/dist/wix/Product.wxs b/deploy/dist/wix/Product.wxs similarity index 93% rename from res/dist/wix/Product.wxs rename to deploy/dist/wix/Product.wxs index 308bee0e5..cb519898f 100644 --- a/res/dist/wix/Product.wxs +++ b/deploy/dist/wix/Product.wxs @@ -38,16 +38,16 @@ = 602)]]> - + - + CommonBackground - + - - + + diff --git a/res/dist/wix/images/banner.png b/deploy/dist/wix/images/banner.png similarity index 100% rename from res/dist/wix/images/banner.png rename to deploy/dist/wix/images/banner.png diff --git a/res/dist/wix/images/common_background.png b/deploy/dist/wix/images/common_background.png similarity index 100% rename from res/dist/wix/images/common_background.png rename to deploy/dist/wix/images/common_background.png diff --git a/res/dist/wix/images/dialog.png b/deploy/dist/wix/images/dialog.png similarity index 100% rename from res/dist/wix/images/dialog.png rename to deploy/dist/wix/images/dialog.png diff --git a/res/dist/wix/images/welcome_background.png b/deploy/dist/wix/images/welcome_background.png similarity index 100% rename from res/dist/wix/images/welcome_background.png rename to deploy/dist/wix/images/welcome_background.png diff --git a/res/dist/wix/msm/Microsoft_VC142_CRT_x64.msm b/deploy/dist/wix/msm/Microsoft_VC142_CRT_x64.msm similarity index 100% rename from res/dist/wix/msm/Microsoft_VC142_CRT_x64.msm rename to deploy/dist/wix/msm/Microsoft_VC142_CRT_x64.msm diff --git a/res/dist/wix/msm/Microsoft_VC142_CRT_x86.msm b/deploy/dist/wix/msm/Microsoft_VC142_CRT_x86.msm similarity index 100% rename from res/dist/wix/msm/Microsoft_VC142_CRT_x86.msm rename to deploy/dist/wix/msm/Microsoft_VC142_CRT_x86.msm