refactor: mv res/dist/wix => deploy/dist/wix

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")

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)

deploy/dist/wix/AppWelcome.wxs

@@ -7,7 +7,7 @@
    <Fragment>
       <UI Id="AppWelcome">
          <Property Id="AppWelcomeBackground">welcome_background</Property>
-         <Binary Id="welcome_background" SourceFile="$(var.ResDir)\dist\wix\images\welcome_background.png"/>
+         <Binary Id="welcome_background" SourceFile="$(var.DeployResDir)\dist\wix\images\welcome_background.png"/>
 
          <Dialog Id="AppWelcome" Width="370" Height="270" Title="!(loc.WelcomeDlg_Title)">
             <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">

deploy/dist/wix/Include.wxi.in

@@ -5,9 +5,8 @@
     <?define Version="@DESKFLOW_VERSION@"?>
     <?define Author="@DESKFLOW_AUTHOR_NAME@"?>
     <?define BinDir="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"?>
-    <?define ProjectResDir="@DESKFLOW_PROJECT_RES_DIR@"?>
     <?define ProjectIcon="@CMAKE_SOURCE_DIR@/src/gui/src/app.ico"?>
-    <?define ResDir="@DESKFLOW_RES_DIR@"?>
+    <?define DeployResDir="@DESKFLOW_DEPLOY_RES_DIR@"?>
     <?define QtDir="@QT_PATH@"?>
     <?define QtBinDir="$(var.QtDir)\bin"?>
     <?if $(var.Platform) = "x64"?>

deploy/dist/wix/Product.wxs

@@ -38,16 +38,16 @@
 				<Condition><![CDATA[Installed OR (VersionNT >= 602)]]></Condition>
 			</Component>
 			<?if $(var.Platform) = x64 ?>
-				<Merge Id="VC_Redist" SourceFile="$(var.ProjectResDir)\dist\wix\msm\Microsoft_VC142_CRT_x64.msm" DiskId="1" Language="0"/>
+				<Merge Id="VC_Redist" SourceFile="$(var.DeployResDir)\dist\wix\msm\Microsoft_VC142_CRT_x64.msm" DiskId="1" Language="0"/>
 			<?else ?>
-				<Merge Id="VC_Redist" SourceFile="$(var.ProjectResDir)\dist\wix\msm\Microsoft_VC142_CRT_x86.msm" DiskId="1" Language="0"/>
+				<Merge Id="VC_Redist" SourceFile="$(var.DeployResDir)\dist\wix\msm\Microsoft_VC142_CRT_x86.msm" DiskId="1" Language="0"/>
 			<?endif ?>
 		</DirectoryRef>
 		<Property Id="CommonBackground">CommonBackground</Property>
-		<Binary Id="CommonBackground" SourceFile="$(var.ResDir)\dist\wix\images\common_background.png"/>
+		<Binary Id="CommonBackground" SourceFile="$(var.DeployResDir)\dist\wix\images\common_background.png"/>
 		<Icon Id="AppIcon" SourceFile="$(var.ProjectIcon)"/>
-		<WixVariable Id="WixUIBannerBmp" Value="$(var.ResDir)\dist\wix\images\banner.png"/>
-		<WixVariable Id="WixUIDialogBmp" Value="$(var.ResDir)\dist\wix\images\dialog.png"/>
+		<WixVariable Id="WixUIBannerBmp" Value="$(var.DeployResDir)\dist\wix\images\banner.png"/>
+		<WixVariable Id="WixUIDialogBmp" Value="$(var.DeployResDir)\dist\wix\images\dialog.png"/>
 		<Property Id="ARPPRODUCTICON" Value="AppIcon"/>
 		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
 		<Property Id="LEGACY_UNINSTALL_EXISTS">