From 42aa34d81c68f2634df05b29e3c19d75c4233ab3 Mon Sep 17 00:00:00 2001
From: Eric Van Albert <eric@van.al>
Date: Sat, 17 Jun 2017 20:40:21 -0400
Subject: [PATCH] put it all together into a JSON file

---
 Makefile          |  8 +++++---
 bin/json_merge.py | 12 ++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100755 bin/json_merge.py

diff --git a/Makefile b/Makefile
index 66e3753..8a2cdba 100644
--- a/Makefile
+++ b/Makefile
@@ -27,16 +27,18 @@ POLYFLAGS  =
 SCADFLAGS  = 
 
 # Targets
-all: stl
+all: stl $(JSON_DIR)/keys.json
 poly: $(POLY_OBJ)
 $(STL_DIR)/%.d: $(SCAD_DIR)/%.scad
 	bin/parse.py $< $(STL_DIR)/$*.d $(JSON_DIR)/$*.json
 $(JSON_DIR)/%.json: $(SCAD_DIR)/%.scad
 	bin/parse.py $< $(STL_DIR)/$*.d $(JSON_DIR)/$*.json
-clean:
-	-rm -f $(POLY_DIR)/*.gen.scad $(STL_DIR)/*.stl $(STL_DIR)/*.d $(JSON_DIR)/*.json
 $(POLY_DIR)/%.gen.scad: $(SVG_DIR)/%.svg
 	$(POLY) $(POLYFLAGS) --fname $@ $<
+$(JSON_DIR)/keys.json: $(JSON_OBJ)
+	bin/json_merge.py $^ >$(JSON_DIR)/keys.json
+clean:
+	-rm -f $(POLY_DIR)/*.gen.scad $(STL_DIR)/*.stl $(STL_DIR)/*.d $(JSON_DIR)/*.json
 
 include $(patsubst $(SCAD_DIR)/%.scad,$(STL_DIR)/%.d,$(SCAD_SRC))
 
diff --git a/bin/json_merge.py b/bin/json_merge.py
new file mode 100755
index 0000000..d0cd555
--- /dev/null
+++ b/bin/json_merge.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python3
+
+import sys
+import json
+
+def read_json_file(fn):
+    with open(fn) as f:
+        return json.load(f)
+
+combined = [read_json_file(fn) for fn in sys.argv[1:]]
+
+print(json.dumps(combined))