From 2cf26915e3ed737ae83cf7b54f7e84fc2f0d3b40 Mon Sep 17 00:00:00 2001 From: Christopher Browne Date: Thu, 16 Jun 2016 17:16:51 -0400 Subject: Sample of using build info to generate keystrokes (#412) * More documentation * Saving crontab for user on host * Restructuring in keeping with recent changes to conventions * Simplify submitting my fave cbbrowne keystroke by using SEND_STRING() * Local change, not apropos to have in this repo * Simplify logic; no need to return so much * Add in a version key * Add docs * Split build date into a separate DEFINE * Ensure there is a value even if not working within a git repo * Should not include the compiled code in the repo * compiled.hex files should not be included in the repo; they represent generated compiled code * Fix spelling in comment * Remove more generated files * Add rule to ignore contents of .build directories; their contents are generated * Revert removals of compiled files --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e93528600d..47fc785a6e 100644 --- a/Makefile +++ b/Makefile @@ -114,7 +114,7 @@ include $(TMK_PATH)/protocol/lufa.mk include $(TMK_PATH)/common.mk include $(TMK_PATH)/rules.mk -GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null || date +"%Y-%m-%d") - +GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null || date +"%Y-%m-%d-%H:%M:%S") +BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S") OPT_DEFS += -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" -OPT_DEFS += -DQMK_VERSION=\"$(GIT_VERSION)\" +OPT_DEFS += -DQMK_VERSION=\"$(GIT_VERSION)\" -DQMK_BUILDDATE=\"$(BUILD_DATE)\" -- cgit v1.2.3 From c4ea06d2557ad0611af691fc5082a9ce134f5821 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Fri, 17 Jun 2016 21:10:17 -0400 Subject: fix for parent folders with spaces (#403) --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 47fc785a6e..b1e77102e0 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,9 @@ ifndef VERBOSE .SILENT: endif -starting_makefile := $(abspath $(firstword $(MAKEFILE_LIST))) -mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) +space := $(subst ,, ) +starting_makefile := $(subst $(space),_SPACE_,$(abspath $(firstword $(MAKEFILE_LIST)))) +mkfile_path := $(subst $(space),_SPACE_,$(abspath $(lastword $(MAKEFILE_LIST)))) abs_tmk_root := $(patsubst %/,%,$(dir $(mkfile_path))) ifneq (,$(findstring /keyboard/,$(starting_makefile))) -- cgit v1.2.3 From 1923cffd41d9d71cd9f434092654dba05513137b Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Fri, 17 Jun 2016 22:50:41 -0400 Subject: allow overriding of TARGET --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b1e77102e0..6e23f77ec2 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ else $(error "$(KEYMAP_PATH)/keymap.c" does not exist) endif -TARGET = $(KEYBOARD)_$(KEYMAP) +TARGET ?= $(KEYBOARD)_$(KEYMAP) ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","") CONFIG_H = $(KEYMAP_PATH)/config.h -- cgit v1.2.3 From db32864ce7029d758f57729cc2f75e051a28d0a2 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sat, 18 Jun 2016 14:30:24 -0400 Subject: Cleans up quantum/keymap situation, removes extra lufa folders (#416) * sorts out keycodes * move midi around * remove mbed * replaces keymap with qmk/keymap_common * fixes keymap.h * keymap, config, quantum rearrange * removes unneeded lufa stuff --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6e23f77ec2..607636035b 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,8 @@ endif SRC += $(KEYBOARD_FILE) \ $(KEYMAP_FILE) \ $(QUANTUM_DIR)/quantum.c \ - $(QUANTUM_DIR)/keymap_common.c \ + $(QUANTUM_DIR)/keymap.c \ + $(QUANTUM_DIR)/keycode_config.c \ $(QUANTUM_DIR)/led.c ifndef CUSTOM_MATRIX -- cgit v1.2.3