summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--Makefile9
-rw-r--r--things/.gitkeep0
3 files changed, 8 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 969b9fe..6cc67ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,6 @@
debug_*
*/__pycache__/*
*~$*
-things/ \ No newline at end of file
+things/*.scad
+things/*.step
+things/*.stl \ No newline at end of file
diff --git a/Makefile b/Makefile
index 87e124b..453ed5b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ current_dir := $(dir $(mkfile_path))
source_dir := ${current_dir}"src"
artifact_dir := ${current_dir}"things"
+config_dir := ${current_dir}"configs"
DOCKER_CMD := "docker"
.DEFAULT_GOAL := help
@@ -34,27 +35,27 @@ build-container: check-requirements ## Build docker container.
config: check-requirements ## Generate configuration.
@echo "\nGenerate configuration..\n" && \
- ${DOCKER_CMD} run --rm --name DM-config -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things dactyl-keyboard python3 -i generate_configuration.py && \
+ ${DOCKER_CMD} run --rm --name DM-config -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things -v ${config_dir}:/app/configs dactyl-keyboard python3 -i generate_configuration.py && \
echo "Done"
.PHONY: config
build-models: check-requirements ## Build models.
@echo "\nGenerate configured model..\n" && \
cd ${current_dir} && \
- ${DOCKER_CMD} run --rm --name DM-run -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things dactyl-keyboard python3 -i dactyl_manuform.py && \
+ ${DOCKER_CMD} run --rm --name DM-run -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things -v ${config_dir}:/app/configs dactyl-keyboard python3 -i dactyl_manuform.py && \
echo "Done"
.PHONY: config
build-models: check-requirements ## Build models.
@echo "\nGenerate release models..\n" && \
cd ${current_dir} && \
- ${DOCKER_CMD} run --rm --name DM-release-build -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things dactyl-keyboard python3 -i model_builder.py && \
+ ${DOCKER_CMD} run --rm --name DM-release-build -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things -v ${config_dir}:/app/configs dactyl-keyboard python3 -i model_builder.py && \
echo "Done"
.PHONY: config
shell: check-requirements ## Open an interactive shell inside a container.
- @${DOCKER_CMD} run --rm -it --name DM-shell -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things dactyl-keyboard bash && \
+ @${DOCKER_CMD} run --rm -it --name DM-shell -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things -v ${config_dir}:/app/configs dactyl-keyboard bash && \
echo "\nBye!"
.PHONY: shell
diff --git a/things/.gitkeep b/things/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/things/.gitkeep