commit a5ee50786551a2206fca7ef63c605352b09f5c92
parent e09c4a40bfffe861d42022644c2cdb751152419c
Author: Pollux <pollux@pollux.codes>
Date: Fri, 11 Apr 2025 01:10:33 -0500
style: clean up directory structure
Signed-off-by: Pollux <pollux@pollux.codes>
Diffstat:
4 files changed, 5 insertions(+), 31 deletions(-)
diff --git a/Makefile b/Makefile
@@ -2,15 +2,16 @@ ZMK_DIRECTORY=$(HOME)/.local/opt/zmk
BOARDS=cradio_left cradio_right
CONFIG_DIR=$(shell pwd)/config
+BUILD_DIR=$(shell pwd)/build
%.uf2: $(wildcard $(CONFIG_DIR)/*)
. $(ZMK_DIRECTORY)/.venv/bin/activate; \
cd $(ZMK_DIRECTORY)/app; \
- west build -b nice_nano_v2 -d build/$* -- -DSHIELD=$* -DZMK_CONFIG="$(CONFIG_DIR)"
- cp $(ZMK_DIRECTORY)/app/build/$*/zephyr/zmk.uf2 $@
- rm -r $(ZMK_DIRECTORY)/app/build/$*
+ west build -b nice_nano_v2 -d $(BUILD_DIR)/$* -- -DSHIELD=$* -DZMK_CONFIG="$(CONFIG_DIR)"
+ cp $(BUILD_DIR)/$*/zephyr/zmk.uf2 $@
-all: $(patsubst %,%.uf2,$(BOARDS))
+all: $(BOARDS:%=%.uf2)
clean:
rm *.uf2
+ rm -r $(BOARDS:%=$(BUILD_DIR)/%)
diff --git a/build.yaml b/build.yaml
@@ -1,24 +0,0 @@
-# This file generates the GitHub Actions matrix.
-# For simple board + shield combinations, add them to the top level board and
-# shield arrays, for more control, add individual board + shield combinations
-# to the `include` property. You can also use the `cmake-args` property to
-# pass flags to the build command and `artifact-name` to assign a name to
-# distinguish build outputs from each other:
-#
-# board: [ "nice_nano_v2" ]
-# shield: [ "corne_left", "corne_right" ]
-# include:
-# - board: bdn9_rev2
-# - board: nice_nano_v2
-# shield: reviung41
-# - board: nice_nano_v2
-# shield: corne_left
-# cmake-args: -DCONFIG_ZMK_USB_LOGGING=y
-# artifact-name: corne_left_with_logging
-#
----
-include:
- - board: nice_nano_v2
- shield: cradio_left
- - board: nice_nano_v2
- shield: cradio_right
diff --git a/boards/shields/.gitkeep b/build/.gitkeep
diff --git a/zephyr/module.yml b/zephyr/module.yml
@@ -1,3 +0,0 @@
-build:
- settings:
- board_root: .