From 072e48e5034909cb7bf556469a5e0f3b413a9324 Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Fri, 17 Mar 2023 21:24:26 -0700 Subject: [PATCH] Housekeeping --- cli/checksum/build.sh | 3 --- cli/checksum/checksum.tal | 2 +- cli/format-c/build.sh | 3 --- cli/format-c/format-c.tal | 2 +- cli/hx/build.sh | 10 ---------- cli/hx/hx.tal | 2 +- cli/opctest/build.sh | 10 ---------- {misc => gui/misc}/ray/build.sh | 0 {misc => gui/misc}/ray/etc/map.chr | Bin {misc => gui/misc}/ray/etc/map.chr.nmt | Bin {misc => gui/misc}/ray/src/ray.tal | 0 {misc => gui/misc}/tcc/day1.tal | 0 {misc => gui/misc}/tcc/day2.tal | 0 {misc => gui/misc}/tcc/day3.tal | 0 {misc => gui/misc}/tcc/day4.tal | 0 {misc => gui/misc}/tcc/day5.tal | 0 {misc => gui/misc}/tcc/day6.tal | 0 {misc => gui/misc}/tcc/day8.tal | 0 {misc => gui/misc}/tcc/day9.tal | 0 {misc => gui/misc}/tcc/lut5.tal | 0 20 files changed, 3 insertions(+), 29 deletions(-) rename {misc => gui/misc}/ray/build.sh (100%) rename {misc => gui/misc}/ray/etc/map.chr (100%) rename {misc => gui/misc}/ray/etc/map.chr.nmt (100%) rename {misc => gui/misc}/ray/src/ray.tal (100%) rename {misc => gui/misc}/tcc/day1.tal (100%) rename {misc => gui/misc}/tcc/day2.tal (100%) rename {misc => gui/misc}/tcc/day3.tal (100%) rename {misc => gui/misc}/tcc/day4.tal (100%) rename {misc => gui/misc}/tcc/day5.tal (100%) rename {misc => gui/misc}/tcc/day6.tal (100%) rename {misc => gui/misc}/tcc/day8.tal (100%) rename {misc => gui/misc}/tcc/day9.tal (100%) rename {misc => gui/misc}/tcc/lut5.tal (100%) diff --git a/cli/checksum/build.sh b/cli/checksum/build.sh index c51971c..3c74857 100755 --- a/cli/checksum/build.sh +++ b/cli/checksum/build.sh @@ -3,7 +3,6 @@ ASM="uxncli $HOME/roms/drifblim.rom" EMU="uxncli" LIN="uxncli $HOME/roms/uxnlin.rom" -APP="$HOME/bin/butler push" SRC="checksum.tal" DST="checksum.rom" @@ -12,8 +11,6 @@ CPY="$HOME/roms" ARG="test.txt" echo ">> Cleaning" -rm -rf bin -mkdir bin if [[ "$*" == *"--lint"* ]] then diff --git a/cli/checksum/checksum.tal b/cli/checksum/checksum.tal index c03897f..c454427 100644 --- a/cli/checksum/checksum.tal +++ b/cli/checksum/checksum.tal @@ -1,4 +1,4 @@ -( usage: uxncli checksum.rom file.bin ) +( uxncli checksum.rom file.bin ) |10 @Console &vector $2 &read $1 &pad $5 &write $1 &error $1 |a0 @File &vector $2 &success $2 &stat $2 &delete $1 &append $1 &name $2 &length $2 &read $2 &write $2 diff --git a/cli/format-c/build.sh b/cli/format-c/build.sh index 7db5711..894de53 100755 --- a/cli/format-c/build.sh +++ b/cli/format-c/build.sh @@ -3,7 +3,6 @@ ASM="uxncli $HOME/roms/drifblim.rom" EMU="uxncli" LIN="uxncli $HOME/roms/uxnlin.rom" -APP="$HOME/bin/butler push" SRC="format-c.tal" DST="format-c.rom" @@ -12,8 +11,6 @@ CPY="$HOME/roms" ARG="test.txt" echo ">> Cleaning" -rm -rf bin -mkdir bin if [[ "$*" == *"--lint"* ]] then diff --git a/cli/format-c/format-c.tal b/cli/format-c/format-c.tal index 5d1ad12..a5ad360 100644 --- a/cli/format-c/format-c.tal +++ b/cli/format-c/format-c.tal @@ -1,4 +1,4 @@ -( usage: uxncli format-js.rom file.bin ) +( uxncli format-c.rom file.bin ) |10 @Console &vector $2 &read $1 &pad $5 &write $1 &error $1 |a0 @File &vector $2 &success $2 &stat $2 &delete $1 &append $1 &name $2 &length $2 &read $2 &write $2 diff --git a/cli/hx/build.sh b/cli/hx/build.sh index ad6c847..4562e87 100755 --- a/cli/hx/build.sh +++ b/cli/hx/build.sh @@ -3,33 +3,23 @@ ASM="uxncli $HOME/roms/drifblim.rom" EMU="uxncli" LIN="uxncli $HOME/roms/uxnlin.rom" -APP="$HOME/bin/butler push" SRC="hx.tal" DST="hx.rom" - CPY="$HOME/roms" ARG="test.txt" -echo ">> Cleaning" -rm -rf bin -mkdir bin - if [[ "$*" == *"--lint"* ]] then - echo ">> Linting $SRC" $LIN $SRC fi -echo ">> Assembling $SRC" $ASM $SRC $DST if [[ "$*" == *"--save"* ]] then - echo ">> Saving $DST" cp $DST $CPY fi -echo ">> Running $DST" $EMU $DST $ARG diff --git a/cli/hx/hx.tal b/cli/hx/hx.tal index c507b39..e0ca039 100644 --- a/cli/hx/hx.tal +++ b/cli/hx/hx.tal @@ -1,4 +1,4 @@ -( Usage: uxncli hx.rom file.bin ) +( uxncli hx.rom file.bin ) |10 @Console &vector $2 &read $1 &pad $5 &write $1 &error $1 |a0 @File &vector $2 &success $2 &stat $2 &delete $1 &append $1 &name $2 &length $2 &read $2 &write $2 diff --git a/cli/opctest/build.sh b/cli/opctest/build.sh index b55d84f..60e4caf 100755 --- a/cli/opctest/build.sh +++ b/cli/opctest/build.sh @@ -3,33 +3,23 @@ ASM="uxncli $HOME/roms/drifblim.rom" EMU="uxncli" LIN="uxncli $HOME/roms/uxnlin.rom" -APP="$HOME/bin/butler push" SRC="opctest.tal" DST="opctest.rom" - CPY="$HOME/roms" ARG="" -echo ">> Cleaning" -rm -rf bin -mkdir bin - if [[ "$*" == *"--lint"* ]] then - echo ">> Linting $SRC" $LIN $SRC fi -echo ">> Assembling $SRC" $ASM $SRC $DST if [[ "$*" == *"--save"* ]] then - echo ">> Saving $DST" cp $DST $CPY fi -echo ">> Running $DST" $EMU $DST $ARG diff --git a/misc/ray/build.sh b/gui/misc/ray/build.sh similarity index 100% rename from misc/ray/build.sh rename to gui/misc/ray/build.sh diff --git a/misc/ray/etc/map.chr b/gui/misc/ray/etc/map.chr similarity index 100% rename from misc/ray/etc/map.chr rename to gui/misc/ray/etc/map.chr diff --git a/misc/ray/etc/map.chr.nmt b/gui/misc/ray/etc/map.chr.nmt similarity index 100% rename from misc/ray/etc/map.chr.nmt rename to gui/misc/ray/etc/map.chr.nmt diff --git a/misc/ray/src/ray.tal b/gui/misc/ray/src/ray.tal similarity index 100% rename from misc/ray/src/ray.tal rename to gui/misc/ray/src/ray.tal diff --git a/misc/tcc/day1.tal b/gui/misc/tcc/day1.tal similarity index 100% rename from misc/tcc/day1.tal rename to gui/misc/tcc/day1.tal diff --git a/misc/tcc/day2.tal b/gui/misc/tcc/day2.tal similarity index 100% rename from misc/tcc/day2.tal rename to gui/misc/tcc/day2.tal diff --git a/misc/tcc/day3.tal b/gui/misc/tcc/day3.tal similarity index 100% rename from misc/tcc/day3.tal rename to gui/misc/tcc/day3.tal diff --git a/misc/tcc/day4.tal b/gui/misc/tcc/day4.tal similarity index 100% rename from misc/tcc/day4.tal rename to gui/misc/tcc/day4.tal diff --git a/misc/tcc/day5.tal b/gui/misc/tcc/day5.tal similarity index 100% rename from misc/tcc/day5.tal rename to gui/misc/tcc/day5.tal diff --git a/misc/tcc/day6.tal b/gui/misc/tcc/day6.tal similarity index 100% rename from misc/tcc/day6.tal rename to gui/misc/tcc/day6.tal diff --git a/misc/tcc/day8.tal b/gui/misc/tcc/day8.tal similarity index 100% rename from misc/tcc/day8.tal rename to gui/misc/tcc/day8.tal diff --git a/misc/tcc/day9.tal b/gui/misc/tcc/day9.tal similarity index 100% rename from misc/tcc/day9.tal rename to gui/misc/tcc/day9.tal diff --git a/misc/tcc/lut5.tal b/gui/misc/tcc/lut5.tal similarity index 100% rename from misc/tcc/lut5.tal rename to gui/misc/tcc/lut5.tal