From 9dc3cc2c68088ab468d78d9d9b89acd72ac75f80 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Fri, 9 Mar 2018 10:51:27 -0500 Subject: genappimage: Include update information for releases/nightlies This will allow users to use AppImageUpdate to update their AppImage. It requires publishing the created zsync file alongside the appimage file for the releases. --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e349cc4d0f..4a880d270a 100644 --- a/Makefile +++ b/Makefile @@ -141,6 +141,11 @@ check-single-includes: build/.ran-cmake appimage: bash scripts/genappimage.sh +# Build an appimage with embedded update information appimage-nightly for +# nightly builds or appimage-latest for a release +appimage-%: + bash scripts/genappimage.sh $* + lint: check-single-includes clint testlint lualint .PHONY: test testlint lualint functionaltest unittest lint clint clean distclean nvim libnvim cmake deps install appimage -- cgit From 968c7ab17eedd7f3c53f3860ff6fbcaddca417e0 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 9 Mar 2018 20:55:10 +0100 Subject: ci/travis: use ninja instead of make --- Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4a880d270a..0681eff7fa 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,6 @@ CMAKE_PRG ?= $(shell (command -v cmake3 || echo cmake)) CMAKE_BUILD_TYPE ?= Debug CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) -DOC_DOWNLOAD_URL_BASE := https://raw.githubusercontent.com/neovim/doc/gh-pages -CLINT_ERRORS_FILE_PATH := /reports/clint/errors.json BUILD_TYPE ?= $(shell (type ninja > /dev/null 2>&1 && echo "Ninja") || \ echo "Unix Makefiles") -- cgit From 9a0147754c4301a1f94fb339c44666edd22b3bbb Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sun, 11 Mar 2018 13:15:42 +0100 Subject: build: respect $DEPS_BUILD_DIR Without this, the CI_TARGET=lint travis job cant't find the cached deps (in $HOME/nvim-deps), nor can it update the cache. --- Makefile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0681eff7fa..72db67a0d9 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +THIS_DIR = $(shell pwd) filter-false = $(strip $(filter-out 0 off OFF false FALSE,$1)) filter-true = $(strip $(filter-out 1 on ON true TRUE,$1)) @@ -11,6 +12,11 @@ CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) BUILD_TYPE ?= $(shell (type ninja > /dev/null 2>&1 && echo "Ninja") || \ echo "Unix Makefiles") +DEPS_BUILD_DIR ?= .deps + +ifneq (1,$(words [$(DEPS_BUILD_DIR)])) + $(error DEPS_BUILD_DIR must not contain whitespace) +endif ifeq (,$(BUILD_TOOL)) ifeq (Ninja,$(BUILD_TYPE)) @@ -46,7 +52,7 @@ endif ifneq (,$(findstring functionaltest-lua,$(MAKECMDGOALS))) BUNDLED_LUA_CMAKE_FLAG := -DUSE_BUNDLED_LUA=ON - $(shell [ -x .deps/usr/bin/lua ] || rm build/.ran-*) + $(shell [ -x $(DEPS_BUILD_DIR)/usr/bin/lua ] || rm build/.ran-*) endif # For use where we want to make sure only a single job is run. This does issue @@ -66,20 +72,20 @@ cmake: $(MAKE) build/.ran-cmake build/.ran-cmake: | deps - cd build && $(CMAKE_PRG) -G '$(BUILD_TYPE)' $(CMAKE_FLAGS) $(CMAKE_EXTRA_FLAGS) .. + cd build && $(CMAKE_PRG) -G '$(BUILD_TYPE)' $(CMAKE_FLAGS) $(CMAKE_EXTRA_FLAGS) $(THIS_DIR) touch $@ deps: | build/.ran-third-party-cmake ifeq ($(call filter-true,$(USE_BUNDLED_DEPS)),) - +$(BUILD_CMD) -C .deps + +$(BUILD_CMD) -C $(DEPS_BUILD_DIR) endif build/.ran-third-party-cmake: ifeq ($(call filter-true,$(USE_BUNDLED_DEPS)),) - mkdir -p .deps - cd .deps && \ + mkdir -p $(DEPS_BUILD_DIR) + cd $(DEPS_BUILD_DIR) && \ $(CMAKE_PRG) -G '$(BUILD_TYPE)' $(BUNDLED_CMAKE_FLAG) $(BUNDLED_LUA_CMAKE_FLAG) \ - $(DEPS_CMAKE_FLAGS) ../third-party + $(DEPS_CMAKE_FLAGS) $(THIS_DIR)/third-party endif mkdir -p build touch $@ @@ -122,7 +128,7 @@ clean: $(MAKE) -C runtime/doc clean distclean: clean - rm -rf .deps build + rm -rf $(DEPS_BUILD_DIR) build install: | nvim +$(BUILD_CMD) -C build install -- cgit