From f05a2891d3da9f9fcd9c7457ca0c2a54ff65078b Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 27 Jun 2022 03:08:59 -0700 Subject: build: rename build-related dirs Problem: Dirs "config", "packaging", and "third-party" are all closely related but this is not obvious from the layout. This adds friction for new contributors. Solution: - rename config/ to cmake.config/ - rename test/config/ to test/cmakeconfig/ because it is used in Lua tests: require('test.cmakeconfig.paths'). - rename packaging/ to cmake.packaging/ - rename third-party/ to cmake.deps/ (parallel with .deps/) --- packaging/CMakeLists.txt | 64 --------------------- packaging/WixPatch.xml | 14 ----- packaging/neovim.icns | Bin 86517 -> 0 bytes packaging/neovim.ico | Bin 122355 -> 0 bytes packaging/neovim.png | Bin 6758 -> 0 bytes packaging/neovim.svg | 147 ----------------------------------------------- 6 files changed, 225 deletions(-) delete mode 100644 packaging/CMakeLists.txt delete mode 100644 packaging/WixPatch.xml delete mode 100644 packaging/neovim.icns delete mode 100644 packaging/neovim.ico delete mode 100644 packaging/neovim.png delete mode 100644 packaging/neovim.svg (limited to 'packaging') diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt deleted file mode 100644 index 8538075388..0000000000 --- a/packaging/CMakeLists.txt +++ /dev/null @@ -1,64 +0,0 @@ -set(CPACK_PACKAGE_NAME "Neovim") -set(CPACK_PACKAGE_VENDOR "neovim.io") -set(CPACK_PACKAGE_FILE_NAME "nvim") - -# From the GitHub About section -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Vim-fork focused on extensibility and usability.") - -set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME}) - -# Pull the versions defined with the top level CMakeLists.txt -set(CPACK_PACKAGE_VERSION_MAJOR ${NVIM_VERSION_MAJOR}) -set(CPACK_PACKAGE_VERSION_MINOR ${NVIM_VERSION_MINOR}) -set(CPACK_PACKAGE_VERSION_PATCH ${NVIM_VERSION_PATCH}) - -# CPACK_VERBATIM_VARIABLES ensures that the variables prefixed with *CPACK_* -# are correctly passed to the cpack program. -# This should always be set to true. -set(CPACK_VERBATIM_VARIABLES TRUE) - -set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt") -set(CPACK_RESOURCE_FILE_README ${PROJECT_SOURCE_DIR}/README.md) - - -if(WIN32) - set(CPACK_PACKAGE_FILE_NAME "nvim-win64") - set(CPACK_GENERATOR ZIP WIX) - - # WIX - # CPACK_WIX_UPGRADE_GUID should be set, but should never change. - # CPACK_WIX_PRODUCT_GUID should not be set (leave as default to auto-generate). - - # 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}/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. - # 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}/neovim.icns) -elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(CPACK_PACKAGE_FILE_NAME "nvim-linux64") - set(CPACK_GENERATOR TGZ DEB) - set(CPACK_DEBIAN_PACKAGE_NAME "Neovim") # required - set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Neovim.io") # required - - # Automatically compute required shared lib dependencies. - # Unfortunately, you "just need to know" that this has a hidden - # dependency on dpkg-shlibdeps whilst using a debian based host. - set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS TRUE) -else() - set(CPACK_GENERATOR TGZ) -endif() - -# CPack variables are loaded in on the call to include(CPack). If you set -# variables *after* the inclusion, they don't get updated within the CPack -# config. Note that some CPack commands should still be run after it, such -# as cpack_add_component(). -include(CPack) diff --git a/packaging/WixPatch.xml b/packaging/WixPatch.xml deleted file mode 100644 index 3cbbb04850..0000000000 --- a/packaging/WixPatch.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/packaging/neovim.icns b/packaging/neovim.icns deleted file mode 100644 index df0e982369..0000000000 Binary files a/packaging/neovim.icns and /dev/null differ diff --git a/packaging/neovim.ico b/packaging/neovim.ico deleted file mode 100644 index e0c151c966..0000000000 Binary files a/packaging/neovim.ico and /dev/null differ diff --git a/packaging/neovim.png b/packaging/neovim.png deleted file mode 100644 index a3960b41bd..0000000000 Binary files a/packaging/neovim.png and /dev/null differ diff --git a/packaging/neovim.svg b/packaging/neovim.svg deleted file mode 100644 index d82ad667c1..0000000000 --- a/packaging/neovim.svg +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - image/svg+xml - - neovim-mark@2x - - - - - neovim-mark@2x - Created with Sketch (http://www.bohemiancoding.com/sketch) - - - - - - - - - - - - - - - - - - - - - - - -- cgit