[neovim] 05/05: d/rules: Switch to invoking cmake directly

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/experimental
in repository neovim.

commit bbdce5c7862c3f409da7bb0fa4de10f2640f53f1
Author: James McCoy <jamessan at debian.org>
Date:   Tue May 2 00:21:19 2017 -0400

    d/rules: Switch to invoking cmake directly
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog |  2 ++
 debian/compat    |  2 +-
 debian/control   |  2 +-
 debian/rules     | 20 ++++++++++++++++----
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 49a7f9a..e58ad50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ neovim (0.2.0-1) UNRELEASED; urgency=medium
     + debcontrol.vim: Add "rust" and "javascript" as known sections.  (Closes:
       #847541)
   * Skip known flaky tests by setting $TEST_SKIP_FRAGILE.
+  * Rewrite debian/rules to invoke cmake directly, instead of through
+    top-level Makefile.
 
  -- James McCoy <jamessan at debian.org>  Mon, 01 May 2017 22:50:45 -0400
 
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index dae21c4..c3e129a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
 Uploaders: James McCoy <jamessan at debian.org>
 Build-Depends:
  cmake,
- debhelper (>= 9),
+ debhelper (>= 10),
  gperf,
  libacl1-dev,
  libjemalloc-dev [!hurd-any],
diff --git a/debian/rules b/debian/rules
index 406370e..6adb4b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,19 +25,27 @@ export HOSTNAME = lists.alioth.debian.org
 
 ID = $(shell id -u)
 GID = $(shell id -g)
+BUILD = ninja -v -C build
 
 %:
-	dh $@ --parallel
+	dh $@ --buildsystem=cmake --builddirectory=build
+
+override_dh_auto_configure:
+	dh_auto_configure -- -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUSTED_OUTPUT_TYPE=nvim
 
 override_dh_auto_build:
-	dh_auto_build --parallel -- VERBOSE=1 USE_BUNDLED_DEPS=OFF CMAKE_BUILD_TYPE=None "CMAKE_EXTRA_FLAGS=-DCMAKE_INSTALL_PREFIX=/usr -DBUSTED_OUTPUT_TYPE=TAP"
+	$(BUILD)
 
 override_dh_auto_install:
-	dh_auto_install --parallel -- VERBOSE=1 USE_BUNDLED_DEPS=OFF
+	$(BUILD) install
 
 override_dh_install:
 	dh_install --fail-missing
 
+override_dh_auto_clean:
+	$(MAKE) clean
+	dh_auto_clean
+
 debian/passwd:
 	printf -- "$(USER):x:$(ID):$(GID):nvim test:$(CURDIR)/debian/fakehome:/bin/false\n" > debian/passwd
 	printf -- "users:x:$(GID):\n" > debian/group
@@ -48,4 +56,8 @@ debian/fakehome:
 override_dh_auto_test-indep:
 
 override_dh_auto_test-arch: debian/passwd debian/fakehome
-	env TEST_SKIP_FRAGILE=1 "HOME=$(CURDIR)/debian/fakehome" LD_PRELOAD=libnss_wrapper.so "NSS_WRAPPER_PASSWD=$(CURDIR)/debian/passwd" "NSS_WRAPPER_GROUP=$(CURDIR)/debian/group" make $(UNITTEST) $(FUNCTIONALTEST) oldtest VERBOSE=1 USE_BUNDLED_DEPS=OFF
+	env "HOME=$(CURDIR)/debian/fakehome" $(MAKE) -C src/nvim/testdir clean
+	env "HOME=$(CURDIR)/debian/fakehome" TERM=xterm $(MAKE) -C src/nvim/testdir "NVIM_PRG=$(CURDIR)/build/bin/nvim"
+ifneq (,$(UNITTEST)$(FUNCTIONALTEST))
+	env TEST_SKIP_FRAGILE=1 "HOME=$(CURDIR)/debian/fakehome" LD_PRELOAD=libnss_wrapper.so "NSS_WRAPPER_PASSWD=$(CURDIR)/debian/passwd" "NSS_WRAPPER_GROUP=$(CURDIR)/debian/group" $(BUILD) $(UNITTEST) $(FUNCTIONALTEST)
+endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/neovim.git