diff --git a/.github/workflows/notes.md b/.github/workflows/notes.md
index 7181972696..3bd6c739a5 100644
--- a/.github/workflows/notes.md
+++ b/.github/workflows/notes.md
@@ -16,15 +16,6 @@ ${NVIM_VERSION}
1. Download **nvim-win64.msi**
2. Run the MSI
-3. Add the Neovim location to your path.
- - Default location is `C:\Program Files\Neovim`
-4. Search and run `nvim-qt.exe` or run `nvim.exe` on your CLI of choice.
-
-#### NSIS
-
-1. Download **nvim-win64.exe**
-2. Run the installer.
- - Ensure that the option to add the installation location to your path is checked if it's your first installation.
3. Search and run `nvim-qt.exe` or run `nvim.exe` on your CLI of choice.
### macOS
@@ -70,5 +61,4 @@ ${SHA_APP_IMAGE_ZSYNC}
${SHA_MACOS}
${SHA_WIN_64_ZIP}
${SHA_WIN_64_MSI}
-${SHA_WIN_64_EXE}
```
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8e0b13d59c..be93cd0245 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -146,11 +146,6 @@ jobs:
name: ${{ matrix.archive }}
path: build/${{ matrix.archive }}.msi
retention-days: 1
- - uses: actions/upload-artifact@v2
- with:
- name: ${{ matrix.archive }}
- path: build/${{ matrix.archive }}.exe
- retention-days: 1
publish:
needs: [linux, appimage, macOS, windows]
@@ -226,8 +221,6 @@ jobs:
echo "SHA_WIN_64_ZIP=$(cat nvim-win64.zip.sha256sum)" >> $GITHUB_ENV
sha256sum nvim-win64.msi > nvim-win64.msi.sha256sum
echo "SHA_WIN_64_MSI=$(cat nvim-win64.msi.sha256sum)" >> $GITHUB_ENV
- sha256sum nvim-win64.exe > nvim-win64.exe.sha256sum
- echo "SHA_WIN_64_EXE=$(cat nvim-win64.exe.sha256sum)" >> $GITHUB_ENV
- name: Publish release
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt
index 6ae744c2cd..8538075388 100644
--- a/packaging/CMakeLists.txt
+++ b/packaging/CMakeLists.txt
@@ -23,7 +23,7 @@ set(CPACK_RESOURCE_FILE_README ${PROJECT_SOURCE_DIR}/README.md)
if(WIN32)
set(CPACK_PACKAGE_FILE_NAME "nvim-win64")
- set(CPACK_GENERATOR ZIP WIX NSIS)
+ set(CPACK_GENERATOR ZIP WIX)
# WIX
# CPACK_WIX_UPGRADE_GUID should be set, but should never change.
@@ -32,31 +32,17 @@ if(WIN32)
# The following guid is just a randomly generated guid that's been pasted here.
# It has no special meaning other than to supply it to WIX.
set(CPACK_WIX_UPGRADE_GUID "207A1A70-7B0C-418A-A153-CA6883E38F4D")
- set(CPACK_WIX_PRODUCT_ICON ${CMAKE_CURRENT_LIST_DIR}/logo.ico)
+ set(CPACK_WIX_PRODUCT_ICON ${CMAKE_CURRENT_LIST_DIR}/neovim.ico)
- # NSIS
- # install icon
- set(CPACK_NSIS_MUI_ICON ${CMAKE_CURRENT_LIST_DIR}/logo.ico)
-
- # uninstall icon
- set(CPACK_NSIS_MUI_UNIICON ${CMAKE_CURRENT_LIST_DIR}/logo.ico)
-
- # icon that appears when you search in Add/Remove programs
- set(CPACK_NSIS_INSTALLED_ICON_NAME ${CMAKE_CURRENT_LIST_DIR}/logo.ico)
-
- # name that appears in the list in Add/Remove programs
- set(CPACK_NSIS_DISPLAY_NAME "Neovim")
-
- # name used in various installer UI locations, such as the title
- set(CPACK_NSIS_PACKAGE_NAME "Neovim")
-
- # Allow the user to modify their path to include neovim during
- # the installation process.
- set(CPACK_NSIS_MODIFY_PATH TRUE)
+ # 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.
+ # 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)
elseif(APPLE)
set(CPACK_PACKAGE_FILE_NAME "nvim-macos")
set(CPACK_GENERATOR TGZ)
- set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_LIST_DIR}/logo.icns)
+ set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_LIST_DIR}/neovim.icns)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(CPACK_PACKAGE_FILE_NAME "nvim-linux64")
set(CPACK_GENERATOR TGZ DEB)
diff --git a/packaging/WixPatch.xml b/packaging/WixPatch.xml
new file mode 100644
index 0000000000..728d43951e
--- /dev/null
+++ b/packaging/WixPatch.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/packaging/logo.icns b/packaging/logo.icns
deleted file mode 100644
index a6377d9cdb..0000000000
Binary files a/packaging/logo.icns and /dev/null differ
diff --git a/packaging/logo.ico b/packaging/logo.ico
deleted file mode 100644
index 117ca1633a..0000000000
Binary files a/packaging/logo.ico and /dev/null differ
diff --git a/packaging/logo.svg b/packaging/logo.svg
deleted file mode 100644
index e8aa8bd33e..0000000000
--- a/packaging/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/packaging/neovim.icns b/packaging/neovim.icns
new file mode 100644
index 0000000000..df0e982369
Binary files /dev/null and b/packaging/neovim.icns differ
diff --git a/packaging/neovim.ico b/packaging/neovim.ico
new file mode 100644
index 0000000000..e0c151c966
Binary files /dev/null and b/packaging/neovim.ico differ
diff --git a/packaging/neovim.png b/packaging/neovim.png
new file mode 100644
index 0000000000..a3960b41bd
Binary files /dev/null and b/packaging/neovim.png differ
diff --git a/packaging/neovim.svg b/packaging/neovim.svg
new file mode 100644
index 0000000000..d82ad667c1
--- /dev/null
+++ b/packaging/neovim.svg
@@ -0,0 +1,147 @@
+
+