updated toplevel build script :)
- also fixed a small error in the colmak layout, which was there because it had been in the qwerty and dvorak layouts until *very* recently.f13
parent
a6846f7e68
commit
b102e2bd4f
17
makefile
17
makefile
|
@ -21,6 +21,12 @@
|
||||||
|
|
||||||
include src/makefile-options
|
include src/makefile-options
|
||||||
|
|
||||||
|
# which layouts to compile (will override the variable in src/makefile-options)
|
||||||
|
# --- default
|
||||||
|
LAYOUT := qwerty-kinesis-mod
|
||||||
|
# --- all
|
||||||
|
LAYOUTS := qwerty-kinesis-mod dvorak-kinesis-mod colemak-symbol-mod
|
||||||
|
|
||||||
# system specific stuff
|
# system specific stuff
|
||||||
UNAME := $(shell uname)
|
UNAME := $(shell uname)
|
||||||
ifeq ($(UNAME),Darwin)
|
ifeq ($(UNAME),Darwin)
|
||||||
|
@ -37,7 +43,7 @@ GIT_COMMIT_DATE := $(shell git log -n 1 --pretty --date=iso | grep 'Date' | cut
|
||||||
GIT_COMMIT_ID := $(shell git log -n 1 | grep 'commit' | cut -c 8-)
|
GIT_COMMIT_ID := $(shell git log -n 1 | grep 'commit' | cut -c 8-)
|
||||||
|
|
||||||
# name to use for the final distribution file or package
|
# name to use for the final distribution file or package
|
||||||
TARGET := ergodox-firmware--$(GIT_BRANCH)--$(shell $(DATE_PROG) -d "$(GIT_COMMIT_DATE)" +'%Y%m%dT%H%M%S')--$(shell echo $(GIT_COMMIT_ID) | cut -c 1-7)
|
TARGET := ergodox-firmware--$(GIT_BRANCH)--$(shell $(DATE_PROG) -d "$(GIT_COMMIT_DATE)" +'%Y%m%dT%H%M%S')--$(shell echo $(GIT_COMMIT_ID) | cut -c 1-7)--$(LAYOUT)
|
||||||
|
|
||||||
# directories
|
# directories
|
||||||
BUILD := build
|
BUILD := build
|
||||||
|
@ -47,7 +53,7 @@ SCRIPTS := build-scripts
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
|
|
||||||
.PHONY: all clean checkin build-dir firmware dist zip
|
.PHONY: all clean checkin build-dir firmware dist zip zip-all
|
||||||
|
|
||||||
all: dist
|
all: dist
|
||||||
|
|
||||||
|
@ -63,7 +69,7 @@ build-dir:
|
||||||
-mkdir -p '$(BUILD)/$(TARGET)'
|
-mkdir -p '$(BUILD)/$(TARGET)'
|
||||||
|
|
||||||
firmware:
|
firmware:
|
||||||
cd src; $(MAKE) all
|
cd src; $(MAKE) LAYOUT=$(LAYOUT) all
|
||||||
|
|
||||||
$(ROOT)/firmware.%: firmware
|
$(ROOT)/firmware.%: firmware
|
||||||
cp 'src/firmware.$*' '$@'
|
cp 'src/firmware.$*' '$@'
|
||||||
|
@ -105,3 +111,8 @@ zip: dist
|
||||||
-r * .* \
|
-r * .* \
|
||||||
-x '..*' )
|
-x '..*' )
|
||||||
|
|
||||||
|
zip-all:
|
||||||
|
for layout in $(LAYOUTS); do \
|
||||||
|
make LAYOUT=$$layout zip; \
|
||||||
|
done
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
/* ----------------------------------------------------------------------------
|
/* ----------------------------------------------------------------------------
|
||||||
* ergoDOX layout : COLEMAK (modified from the Kinesis layout)
|
* ergoDOX layout : COLEMAK (modified from the Kinesis layout)
|
||||||
* TODO: rewrite for new kbfun's
|
*
|
||||||
|
* Submitted by Jason Trill [jjt] (https://github.com/jjt)
|
||||||
* ----------------------------------------------------------------------------
|
* ----------------------------------------------------------------------------
|
||||||
* Copyright (c) 2012 Ben Blazak <benblazak.dev@gmail.com>
|
* Copyright (c) 2012 Ben Blazak <benblazak.dev@gmail.com>
|
||||||
* Released under The MIT License (MIT) (see "license.md")
|
* Released under The MIT License (MIT) (see "license.md")
|
||||||
|
@ -256,9 +257,9 @@ const void_funptr_t PROGMEM _kb_layout_press[KB_LAYERS][KB_ROWS][KB_COLUMNS] = {
|
||||||
ktrans, ktrans, kprrel, kprrel, kprrel, kprrel, ktrans,
|
ktrans, ktrans, kprrel, kprrel, kprrel, kprrel, ktrans,
|
||||||
ktrans, ktrans, kprrel, kprrel, ktrans,
|
ktrans, ktrans, kprrel, kprrel, ktrans,
|
||||||
|
|
||||||
ktrans, kprrel,
|
ktrans, ktrans,
|
||||||
ktrans, ktrans, ktrans,
|
ktrans, ktrans, ktrans,
|
||||||
ktrans, ktrans, ktrans ),
|
ktrans, ktrans, kprrel ),
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -358,9 +359,9 @@ const void_funptr_t PROGMEM _kb_layout_release[KB_LAYERS][KB_ROWS][KB_COLUMNS] =
|
||||||
lpop3, ktrans, kprrel, kprrel, kprrel, kprrel, ktrans,
|
lpop3, ktrans, kprrel, kprrel, kprrel, kprrel, ktrans,
|
||||||
ktrans, ktrans, kprrel, kprrel, ktrans,
|
ktrans, ktrans, kprrel, kprrel, ktrans,
|
||||||
|
|
||||||
ktrans, kprrel,
|
ktrans, ktrans,
|
||||||
ktrans, ktrans, ktrans,
|
ktrans, ktrans, ktrans,
|
||||||
ktrans, ktrans, ktrans ),
|
ktrans, ktrans, kprrel ),
|
||||||
|
|
||||||
|
|
||||||
// RELEASE L3: nothing (just making sure unused
|
// RELEASE L3: nothing (just making sure unused
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
/* ----------------------------------------------------------------------------
|
/* ----------------------------------------------------------------------------
|
||||||
* ergoDOX : layout : COLEMAK : exports
|
* ergoDOX : layout : COLEMAK : exports
|
||||||
|
*
|
||||||
|
* Submitted by Jason Trill [jjt] (https://github.com/jjt)
|
||||||
* ----------------------------------------------------------------------------
|
* ----------------------------------------------------------------------------
|
||||||
* Copyright (c) 2012 Ben Blazak <benblazak.dev@gmail.com>
|
* Copyright (c) 2012 Ben Blazak <benblazak.dev@gmail.com>
|
||||||
* Released under The MIT License (MIT) (see "license.md")
|
* Released under The MIT License (MIT) (see "license.md")
|
||||||
|
|
Loading…
Reference in New Issue