From 48d245051454bc353f963cddbbb85359986ab3b3 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 5 Jan 2024 09:02:53 -0700 Subject: [PATCH] make dist --- .gitea/build.sh | 46 ---------------------------------------------- .gitea/publish.sh | 9 +++++---- Makefile | 7 +++++-- 3 files changed, 10 insertions(+), 52 deletions(-) delete mode 100755 .gitea/build.sh diff --git a/.gitea/build.sh b/.gitea/build.sh deleted file mode 100755 index 35786a8..0000000 --- a/.gitea/build.sh +++ /dev/null @@ -1,46 +0,0 @@ -#! /bin/sh - -set -e - -log () { - echo "=== $*" -} - -# Make sure we're in the project directory -cd $(dirname $0)/.. - -mkdir -p out/ - -while read variant vid pid flags; do - log - log "Building $variant ($vid:$pid)" - log - - # We can overload build.extra_flags from boards.txt, - # so just specify the -D flags to gcc - flags="$flags -DUSB_VID=$vid -DUSB_PID=$pid" - flags="$flags -DUSB_MANUFACTURER=\"woozle.org\"" - flags="$flags \"-DUSB_PRODUCT=\"Mockband $variant\"\"" # wtf quoting - flags="$flags -DCDC_DISABLED" - - # Arduino gets cranky when it tries to use its own cache - rm -rf build/ - mkdir -p build/cache/ - - arduino-builder \ - -build-path $(pwd)/build/ \ - -build-cache $(pwd)/build/cache/ \ - -fqbn arduino:avr:leonardo \ - -hardware /usr/share/arduino/hardware \ - -tools /usr/share/arduino/tools \ - -prefs="build.extra_flags=$flags" \ - -compile MockBand.ino - - mv build/MockBand.ino.hex out/MockBand.$variant.hex -done << EOD -guitar 0x1bad 0x0004 -guitar-wammy 0x1bad 0x0004 -DWAMMY -drums 0x1bad 0x3110 -EOD - -ls -l out/ diff --git a/.gitea/publish.sh b/.gitea/publish.sh index efcbbc3..27067aa 100755 --- a/.gitea/publish.sh +++ b/.gitea/publish.sh @@ -7,13 +7,14 @@ VERSION=$GITHUB_REF_NAME BASE=$GITHUB_SERVER_URL/api/packages/$GITHUB_ACTOR/generic/$PACKAGE/$VERSION +curl \ + --user "$GITHUB_ACTOR:$PACKAGE_API_TOKEN" \ + --request DELETE \ + $BASE + for path in "$@"; do fn=$(basename "$path") echo "=== Upload $VERSION/$fn" - curl \ - --user "$GITHUB_ACTOR:$PACKAGE_API_TOKEN" \ - --request DELETE \ - $BASE/$fn curl \ --fail \ diff --git a/Makefile b/Makefile index 38d0541..ddb5979 100644 --- a/Makefile +++ b/Makefile @@ -35,8 +35,11 @@ flash-%: build/MockBand.%.hex while [ ! -e $(DEVICE) ]; do echo Waiting for $(DEVICE)...; sleep 1; done avrdude -v -patmega32u4 -cavr109 -P$(DEVICE) -b57600 -D -Uflash:w:$<:i -publish: $(firmwares) - .gitea/publish.sh $^ +dist: build/MockBand.zip + +build/MockBand.zip: $(firmwares) + rm -f $@ + zip -r $@ README.md $^ docs/ clean: rm -rf build