From db05f65e0d0c9de85e8f737bc331eea6de491137 Mon Sep 17 00:00:00 2001 From: Michael Schuster Date: Tue, 18 Aug 2020 21:42:31 +0200 Subject: [PATCH] Windows shell extensions: Add WiX (MSI) fragment Use CMake to generate a WXI fragment to handle the DLL registration and file deployment for the shellext components. Signed-off-by: Michael Schuster --- shell_integration/windows/CMakeLists.txt | 2 +- shell_integration/windows/WinShellExt.wxs.in | 93 +++++++++++++++++++ .../windows/WinShellExtConstants.h.in | 2 +- .../windows/WinShellExtConstants.wxi.in | 50 ---------- 4 files changed, 95 insertions(+), 52 deletions(-) create mode 100644 shell_integration/windows/WinShellExt.wxs.in delete mode 100644 shell_integration/windows/WinShellExtConstants.wxi.in diff --git a/shell_integration/windows/CMakeLists.txt b/shell_integration/windows/CMakeLists.txt index a350b09d6..d75d2574d 100644 --- a/shell_integration/windows/CMakeLists.txt +++ b/shell_integration/windows/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) configure_file(WinShellExtConstants.h.in ${CMAKE_CURRENT_BINARY_DIR}/WinShellExtConstants.h) -configure_file(WinShellExtConstants.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/WinShellExtConstants.wxi) +configure_file(WinShellExt.wxs.in ${CMAKE_CURRENT_BINARY_DIR}/WinShellExt.wxs) add_subdirectory(NCContextMenu) add_subdirectory(NCOverlays) diff --git a/shell_integration/windows/WinShellExt.wxs.in b/shell_integration/windows/WinShellExt.wxs.in new file mode 100644 index 000000000..6ac42dca4 --- /dev/null +++ b/shell_integration/windows/WinShellExt.wxs.in @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shell_integration/windows/WinShellExtConstants.h.in b/shell_integration/windows/WinShellExtConstants.h.in index 0303ac174..cad7539d2 100644 --- a/shell_integration/windows/WinShellExtConstants.h.in +++ b/shell_integration/windows/WinShellExtConstants.h.in @@ -14,7 +14,7 @@ #pragma once -// IMPORTANT: Keep this file in sync with WinShellExtConstants.wxi.in +// IMPORTANT: Keep these constants in sync with WinShellExtConstants.wxi.in // Context Menu #define CONTEXT_MENU_GUID L"@WIN_SHELLEXT_CONTEXT_MENU_GUID@" diff --git a/shell_integration/windows/WinShellExtConstants.wxi.in b/shell_integration/windows/WinShellExtConstants.wxi.in deleted file mode 100644 index 9e65fd0e7..000000000 --- a/shell_integration/windows/WinShellExtConstants.wxi.in +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 2.30.2