From 59b533a83d6c14916b63c9a9142fa058c8b17788 Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Sun, 11 Aug 2024 20:58:21 +0200 Subject: [PATCH] make: move emulator specific rules to a dedicated file --- Makefile | 33 ++++++--------------------------- make/emulator.mk | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 27 deletions(-) create mode 100644 make/emulator.mk diff --git a/Makefile b/Makefile index a25acb9c5..74a125d91 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PHONY = all android-ndk android-sdk base clean coverage distclean doc fetchthirdparty po pot re static-check test testbase testfront +PHONY = all android-ndk android-sdk base clean distclean doc fetchthirdparty po pot re static-check SOUND = $(INSTALL_DIR)/% # koreader-base directory @@ -119,32 +119,6 @@ endif base: base-all -$(INSTALL_DIR)/koreader/.busted: .busted - $(SYMLINK) .busted $@ - -$(INSTALL_DIR)/koreader/.luacov: - $(SYMLINK) .luacov $@ - -testbase: base-test - -testfront: all test-data $(INSTALL_DIR)/koreader/.busted - # sdr files may have unexpected impact on unit testing - -rm -rf spec/unit/data/*.sdr - cd $(INSTALL_DIR)/koreader && $(BUSTED_LUAJIT) $(BUSTED_OVERRIDES) $(BUSTED_SPEC_FILE) - -test: testbase testfront - -coverage: $(INSTALL_DIR)/koreader/.luacov - -rm -rf $(INSTALL_DIR)/koreader/luacov.*.out - cd $(INSTALL_DIR)/koreader && \ - ./luajit $(shell which busted) --output=gtest \ - --sort-files \ - --coverage --exclude-tags=nocov - # coverage report summary - cd $(INSTALL_DIR)/koreader && tail -n \ - +$$(($$(grep -nm1 -e "^Summary$$" luacov.report.out|cut -d: -f1)-1)) \ - luacov.report.out - ifeq (,$(wildcard $(KOR_BASE)/Makefile $(KOR_BASE)/Makefile.defs)) $(KOR_BASE)/Makefile $(KOR_BASE)/Makefile.defs: fetchthirdparty # Need a recipe, even if empty, or make won't know how to remake `base-all`. @@ -174,6 +148,11 @@ distclean: clean base-distclean re: clean $(MAKE) all +# Include emulator specific rules. +ifneq (,$(EMULATE_READER)) + include make/emulator.mk +endif + # Include target specific rules. ifneq (,$(wildcard make/$(TARGET).mk)) include make/$(TARGET).mk diff --git a/make/emulator.mk b/make/emulator.mk new file mode 100644 index 000000000..41141ea5d --- /dev/null +++ b/make/emulator.mk @@ -0,0 +1,33 @@ +# Testing & coverage. {{{ + +PHONY += coverage test testbase testfront + +$(INSTALL_DIR)/koreader/.busted: .busted + $(SYMLINK) .busted $@ + +$(INSTALL_DIR)/koreader/.luacov: + $(SYMLINK) .luacov $@ + +testbase: base-test + +testfront: all test-data $(INSTALL_DIR)/koreader/.busted + # sdr files may have unexpected impact on unit testing + -rm -rf spec/unit/data/*.sdr + cd $(INSTALL_DIR)/koreader && $(BUSTED_LUAJIT) $(BUSTED_OVERRIDES) $(BUSTED_SPEC_FILE) + +test: testbase testfront + +coverage: $(INSTALL_DIR)/koreader/.luacov + -rm -rf $(INSTALL_DIR)/koreader/luacov.*.out + cd $(INSTALL_DIR)/koreader && \ + ./luajit $(shell which busted) --output=gtest \ + --sort-files \ + --coverage --exclude-tags=nocov + # coverage report summary + cd $(INSTALL_DIR)/koreader && tail -n \ + +$$(($$(grep -nm1 -e "^Summary$$" luacov.report.out|cut -d: -f1)-1)) \ + luacov.report.out + +# }}} + +# vim: foldmethod=marker foldlevel=0