put it all together into a JSON file

This commit is contained in:
Eric Van Albert
2017-06-17 20:40:21 -04:00
parent a5a7976a0e
commit 42aa34d81c
2 changed files with 17 additions and 3 deletions

View File

@@ -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))

12
bin/json_merge.py Executable file
View File

@@ -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))