From 53f36806f1b5107c0570ffbf57180a8e08f45b2e Mon Sep 17 00:00:00 2001 From: Alexandre Teoi Date: Sun, 2 Apr 2023 13:36:35 -0300 Subject: feat(packaging): add start menu and desktop shortcuts on Windows - Create start menu and desktop shortcuts - Set installation context to per-user, allowing non-administrative users to install the MSI package - - Resolves #18119 --- cmake.packaging/CMakeLists.txt | 9 +++++++-- cmake.packaging/WixPatch.xml | 31 +++++++++++++++++++------------ 2 files changed, 26 insertions(+), 14 deletions(-) (limited to 'cmake.packaging') diff --git a/cmake.packaging/CMakeLists.txt b/cmake.packaging/CMakeLists.txt index df43f2806a..b5c91ac457 100644 --- a/cmake.packaging/CMakeLists.txt +++ b/cmake.packaging/CMakeLists.txt @@ -34,8 +34,13 @@ if(WIN32) set(CPACK_WIX_UPGRADE_GUID "207A1A70-7B0C-418A-A153-CA6883E38F4D") set(CPACK_WIX_PRODUCT_ICON ${PROJECT_SOURCE_DIR}/runtime/neovim.ico) - # We use a wix patch to add further options to the installer. At present, it's just to add neovim to the path - # on installation, however, it can be extended. + # Create start menu and desktop shortcuts + set(CPACK_WIX_PROGRAM_MENU_FOLDER "${CPACK_PACKAGE_NAME}") + set(CPACK_PACKAGE_EXECUTABLES "nvim" "Neovim" "nvim-qt" "Neovim Qt") + set(CPACK_CREATE_DESKTOP_LINKS "nvim-qt") + + # We use a wix patch to add further options to the installer. At present, it just adds neovim to the path + # on installation and defines per-user installation, however, it can be extended. # See: https://cmake.org/cmake/help/v3.7/module/CPackWIX.html#variable:CPACK_WIX_PATCH_FILE list(APPEND CPACK_WIX_EXTENSIONS WixUtilExtension) list(APPEND CPACK_WIX_PATCH_FILE ${CMAKE_CURRENT_LIST_DIR}/WixPatch.xml) diff --git a/cmake.packaging/WixPatch.xml b/cmake.packaging/WixPatch.xml index 3cbbb04850..1179292636 100644 --- a/cmake.packaging/WixPatch.xml +++ b/cmake.packaging/WixPatch.xml @@ -1,14 +1,21 @@ - - - - + + + + + + + + + + + -- cgit From 95fe166d13fe51d1656c659dbb78b258a6f5dcd8 Mon Sep 17 00:00:00 2001 From: sitiom Date: Sat, 8 Apr 2023 17:02:13 +0800 Subject: revert(packaging): installation context to per-machine on Windows Revert this change until a proper solution is implemented, such as allowing the user to select whether to install per-user or per-machine. Fixes https://github.com/neovim/neovim/issues/22933. --- cmake.packaging/WixPatch.xml | 7 ------- 1 file changed, 7 deletions(-) (limited to 'cmake.packaging') diff --git a/cmake.packaging/WixPatch.xml b/cmake.packaging/WixPatch.xml index 1179292636..1196f4f335 100644 --- a/cmake.packaging/WixPatch.xml +++ b/cmake.packaging/WixPatch.xml @@ -11,11 +11,4 @@ Value='[INSTALL_ROOT]bin' /> - - - - - - - -- cgit From 8994389845ae4ca5e6a797b8f957dea76320ff94 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Sat, 22 Apr 2023 22:58:14 +0200 Subject: ci: make all linux releases work with same glibc version --- cmake.packaging/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'cmake.packaging') diff --git a/cmake.packaging/CMakeLists.txt b/cmake.packaging/CMakeLists.txt index b5c91ac457..c693e2f9ac 100644 --- a/cmake.packaging/CMakeLists.txt +++ b/cmake.packaging/CMakeLists.txt @@ -1,6 +1,7 @@ set(CPACK_PACKAGE_NAME "Neovim") set(CPACK_PACKAGE_VENDOR "neovim.io") set(CPACK_PACKAGE_FILE_NAME "nvim") +set(CPACK_PACKAGE_DIRECTORY ${PROJECT_BINARY_DIR}) # From the GitHub About section set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Vim-fork focused on extensibility and usability.") -- cgit From 08991b078267e5de0a19a136d00d4f71ad651a32 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Sat, 13 May 2023 21:33:22 +0200 Subject: docs: small fixes Co-authored-by: Christian Clason Co-authored-by: Gregory Anders Co-authored-by: HiPhish Co-authored-by: Julio B Co-authored-by: T727 <74924917+T-727@users.noreply.github.com> Co-authored-by: camoz Co-authored-by: champignoom <66909116+champignoom@users.noreply.github.com> --- cmake.packaging/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'cmake.packaging') diff --git a/cmake.packaging/CMakeLists.txt b/cmake.packaging/CMakeLists.txt index c693e2f9ac..cf7196fd6e 100644 --- a/cmake.packaging/CMakeLists.txt +++ b/cmake.packaging/CMakeLists.txt @@ -40,8 +40,7 @@ if(WIN32) set(CPACK_PACKAGE_EXECUTABLES "nvim" "Neovim" "nvim-qt" "Neovim Qt") set(CPACK_CREATE_DESKTOP_LINKS "nvim-qt") - # We use a wix patch to add further options to the installer. At present, it just adds neovim to the path - # on installation and defines per-user installation, however, it can be extended. + # We use a wix patch to add further options to the installer. # See: https://cmake.org/cmake/help/v3.7/module/CPackWIX.html#variable:CPACK_WIX_PATCH_FILE list(APPEND CPACK_WIX_EXTENSIONS WixUtilExtension) list(APPEND CPACK_WIX_PATCH_FILE ${CMAKE_CURRENT_LIST_DIR}/WixPatch.xml) -- cgit From 0370e4def0c0328f8cd09f02c1ca82ed491ecb9a Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Tue, 6 Jun 2023 19:19:00 +0200 Subject: build!: remove neovim qt Neovim QT was originally bundled on Windows as a response to the then lackluster terminal options. The situation has dramatically changed, with viable options such as Windows terminal, Alacritty and Wezterm to name a few. The Windows build no longer needs this special treatment for neovim to be usable. Pros: - Release builds will be smaller. - Less maintenance burden. - Clearer separation of responsibility (neovim issues go to the neovim repo and neovim-qt issues to the neovim-qt repo). - More consistent treatment between platforms. Cons: - Users who've come to expect neovim-qt to be bundled with nvim will need to adjust and download neovim-qt from https://github.com/equalsraf/neovim-qt instead. - Similarly, build scripts will need to be adjusted to reflect this change. Closes https://github.com/neovim/neovim/issues/21209. --- cmake.packaging/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'cmake.packaging') diff --git a/cmake.packaging/CMakeLists.txt b/cmake.packaging/CMakeLists.txt index cf7196fd6e..fa815da7f9 100644 --- a/cmake.packaging/CMakeLists.txt +++ b/cmake.packaging/CMakeLists.txt @@ -37,8 +37,7 @@ if(WIN32) # Create start menu and desktop shortcuts set(CPACK_WIX_PROGRAM_MENU_FOLDER "${CPACK_PACKAGE_NAME}") - set(CPACK_PACKAGE_EXECUTABLES "nvim" "Neovim" "nvim-qt" "Neovim Qt") - set(CPACK_CREATE_DESKTOP_LINKS "nvim-qt") + set(CPACK_PACKAGE_EXECUTABLES "nvim" "Neovim") # We use a wix patch to add further options to the installer. # See: https://cmake.org/cmake/help/v3.7/module/CPackWIX.html#variable:CPACK_WIX_PATCH_FILE -- cgit