From b102e2bd4fe5286e41b1832ee806ca75c8ef43b0 Mon Sep 17 00:00:00 2001
From: Ben Blazak <benblazak.dev@gmail.com>
Date: Tue, 11 Dec 2012 16:39:27 -0800
Subject: [PATCH] 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.
---
 makefile                                        | 17 ++++++++++++++---
 .../ergodox/layout/colemak-symbol-mod.c         | 11 ++++++-----
 .../ergodox/layout/colemak-symbol-mod.h         |  2 ++
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/makefile b/makefile
index 24612e7..f001a14 100644
--- a/makefile
+++ b/makefile
@@ -21,6 +21,12 @@
 
 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
 UNAME := $(shell uname)
 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-)
 
 # 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
 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
 
@@ -63,7 +69,7 @@ build-dir:
 	-mkdir -p '$(BUILD)/$(TARGET)'
 
 firmware:
-	cd src; $(MAKE) all
+	cd src; $(MAKE) LAYOUT=$(LAYOUT) all
 
 $(ROOT)/firmware.%: firmware
 	cp 'src/firmware.$*' '$@'
@@ -105,3 +111,8 @@ zip: dist
 	      -r * .* \
 	      -x '..*' )
 
+zip-all:
+	for layout in $(LAYOUTS); do \
+		make LAYOUT=$$layout zip; \
+	done
+
diff --git a/src/keyboard/ergodox/layout/colemak-symbol-mod.c b/src/keyboard/ergodox/layout/colemak-symbol-mod.c
index a0aed3b..dda4e15 100755
--- a/src/keyboard/ergodox/layout/colemak-symbol-mod.c
+++ b/src/keyboard/ergodox/layout/colemak-symbol-mod.c
@@ -1,6 +1,7 @@
 /* ----------------------------------------------------------------------------
  * 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>
  * 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,     ktrans,
                 
-    ktrans,     kprrel,
+    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,
                             ktrans,     ktrans,     kprrel,     kprrel,     ktrans,
 
-    ktrans,     kprrel,
+    ktrans,     ktrans,
     ktrans,     ktrans,     ktrans,
-    ktrans,     ktrans,     ktrans ),
+    ktrans,     ktrans,     kprrel ),
 
 
     // RELEASE L3: nothing (just making sure unused
diff --git a/src/keyboard/ergodox/layout/colemak-symbol-mod.h b/src/keyboard/ergodox/layout/colemak-symbol-mod.h
index 4b7f858..2999601 100755
--- a/src/keyboard/ergodox/layout/colemak-symbol-mod.h
+++ b/src/keyboard/ergodox/layout/colemak-symbol-mod.h
@@ -1,5 +1,7 @@
 /* ----------------------------------------------------------------------------
  * ergoDOX : layout : COLEMAK : exports
+ * 
+ * Submitted by Jason Trill [jjt] (https://github.com/jjt)
  * ----------------------------------------------------------------------------
  * Copyright (c) 2012 Ben Blazak <benblazak.dev@gmail.com>
  * Released under The MIT License (MIT) (see "license.md")