From a5aa42f02b3ad71926e720b69433fbabf1750b62 Mon Sep 17 00:00:00 2001 From: Jonathan Rascher Date: Thu, 15 Aug 2024 00:33:14 -0500 Subject: [PATCH] Migrate from compile.sh to qmk userspace-compile Now that https://github.com/qmk/qmk_firmware/pull/22887 is merged, I can use the standard qmk commands. Yay! :D --- README.md | 4 --- qmk.json | 62 ++++++++++++++++++++++++++++++++++++++++--- users/bcat/compile.sh | 52 ------------------------------------ 3 files changed, 59 insertions(+), 59 deletions(-) delete mode 100755 users/bcat/compile.sh diff --git a/README.md b/README.md index 9727b252ca5..343ff6fc050 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,6 @@ I use community layouts wherever possible, only writing keyboard-specific keymaps for boards without standard layout support. I derive my keymaps from two canonical ones (preferred for typing and gaming, respectively). -You can build all keymaps I maintain at once using the -[`users/bcat/compile.sh`](users/bcat/compile.sh) script. (The `qmk -userspace-compile` command is not yet supported in my setup.) - ## Canonical keymaps * [3x6+3 split layout](layouts/split_3x6_3/bcat) diff --git a/qmk.json b/qmk.json index 3afc389f424..da05dc5a98e 100644 --- a/qmk.json +++ b/qmk.json @@ -1,4 +1,60 @@ { - "userspace_version": "1.0", - "build_targets": [] -} \ No newline at end of file + "userspace_version": "1.1", + "build_targets": [ + ["9key", "bcat"], + [ + "ai03/polaris", + "bcat", + { + "FORCE_LAYOUT": "60_tsangan_hhkb" + } + ], + [ + "cannonkeys/an_c", + "bcat", + { + "FORCE_LAYOUT": "60_tsangan_hhkb" + } + ], + [ + "cannonkeys/instant60", + "bcat", + { + "FORCE_LAYOUT": "60_tsangan_hhkb" + } + ], + [ + "crkbd/rev1", + "bcat", + { + "FORCE_LAYOUT": "split_3x6_3" + } + ], + [ + "dz60", + "bcat", + { + "FORCE_LAYOUT": "60_ansi_split_bs_rshift" + } + ], + [ + "dz60", + "bcat", + { + "FORCE_LAYOUT": "60_tsangan_hhkb" + } + ], + ["eco/rev2", "bcat"], + [ + "kbdfans/kbd67/hotswap", + "bcat", + { + "FORCE_LAYOUT": "65_ansi_blocker_split_bs" + } + ], + ["keebio/bdn9/rev1", "bcat"], + ["keebio/quefrency/rev1", "bcat"], + ["lily58/rev1", "bcat"], + ["yanghu/unicorne/f411", "bcat"] + ] +} diff --git a/users/bcat/compile.sh b/users/bcat/compile.sh deleted file mode 100755 index 9d5e58b1a15..00000000000 --- a/users/bcat/compile.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -set -o errexit -o nounset - -usage () { - printf "\ -usage: ./users/bcat/compile.sh [-c] [-j N] - -Compiles all keyboards for which bcat maintains keymaps. - -optional arguments: - -c performs a clean build - -j N runs N make tasks in parallel - -v shows verbose output -" -} - -compile () { - local keyboard=$1 layout=${2:-} - FORCE_LAYOUT="$layout" SILENT="$opt_silent" make -j "$opt_parallel" "$keyboard":bcat -} - -opt_parallel=1 -opt_silent=true - -while getopts :chj:v opt; do - case $opt in - c) opt_clean=1 ;; - j) opt_parallel=$OPTARG ;; - v) opt_silent=false ;; - h) usage; exit 0 ;; - \?) usage >&2; exit 2 ;; - esac -done - -if [[ -n ${opt_clean:-} ]]; then - SILENT="$opt_silent" make clean -fi - -compile 9key -compile ai03/polaris 60_tsangan_hhkb -compile cannonkeys/an_c 60_tsangan_hhkb -compile cannonkeys/instant60 60_tsangan_hhkb -compile crkbd/rev1 split_3x6_3 -compile dz60 60_ansi_split_bs_rshift -compile dz60 60_tsangan_hhkb -compile eco/rev2 -compile kbdfans/kbd67/hotswap 65_ansi_blocker_split_bs -compile keebio/bdn9/rev1 -compile keebio/quefrency/rev1 -compile lily58/rev1 -compile yanghu/unicorne/f411