public / applesoft_basic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: eed0bc2)
Move tone.obj and bootable.dsk generation into /util instead of duplicating
authorNick Downing <nick@ndcode.org>
Thu, 26 May 2022 04:50:12 +0000 (14:50 +1000)
committerNick Downing <nick@ndcode.org>
Thu, 26 May 2022 04:52:49 +0000 (14:52 +1000)
13 files changed:
Makefile patch | blob | history
lemonade/Makefile patch | blob | history
lemonade/bootable.txt [deleted file] patch | blob | history
lemonade/tone.asm [deleted file] patch | blob | history
lemonade/tone_asm.txt [deleted file] patch | blob | history
little_brick_out/Makefile patch | blob | history
little_brick_out/bootable.txt [deleted file] patch | blob | history
little_brick_out/tone.asm [deleted file] patch | blob | history
little_brick_out/tone_asm.txt [deleted file] patch | blob | history
ribbit/Makefile patch | blob | history
ribbit/bootable.txt [deleted file] patch | blob | history
ribbit/tone.asm [deleted file] patch | blob | history
ribbit/tone_asm.txt [deleted file] patch | blob | history

diff --git a/Makefile b/Makefile
index b02b4c9..c40703a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ little_brick_out \
 orig \
 ribbit \
 terminal \
+util \
 element.py \
 lex_yy.py \
 t_def.py \
@@ -29,6 +30,7 @@ lemonade: \
 dos33fsprogs \
 linapple-pie \
 orig \
+util \
 tok_to_bin.py \
 bin_to_tok.py \
 tok_to_bas.py \
@@ -44,6 +46,7 @@ little_brick_out: \
 dos33fsprogs \
 linapple-pie \
 orig \
+util \
 tok_to_bin.py \
 bin_to_tok.py \
 tok_to_bas.py \
@@ -59,6 +62,7 @@ ribbit: \
 dos33fsprogs \
 linapple-pie \
 orig \
+util \
 tok_to_bin.py \
 bin_to_tok.py \
 tok_to_bas.py \
@@ -69,9 +73,14 @@ bas_to_tok.py
 terminal: \
 dos33fsprogs \
 linapple-pie \
-orig
+orig \
+util
        ${MAKE} ${MAKEFLAGS} -C terminal
 
+.PHONY: util
+util:
+       ${MAKE} ${MAKEFLAGS} -C util
+
 element.py:
        pitree --install-element
 
@@ -95,6 +104,7 @@ clean:
        ${MAKE} ${MAKEFLAGS} -C orig clean
        ${MAKE} ${MAKEFLAGS} -C ribbit clean
        ${MAKE} ${MAKEFLAGS} -C terminal clean
+       ${MAKE} ${MAKEFLAGS} -C util clean
        rm -f \
 element.py \
 lex_yy.py \
diff --git a/lemonade/Makefile b/lemonade/Makefile
index 39dd779..53ac2d7 100644 (file)
--- a/lemonade/Makefile
+++ b/lemonade/Makefile
@@ -8,11 +8,11 @@ BAS_TO_TOK=../bas_to_tok.py
 .PHONY: all
 all: lemonade_patched.dsk lemonade_tone.obj
 
-lemonade_patched.dsk: lemonade_patched.bin tone.obj lemonade_flash_patched.obj bootable.dsk
-       cp bootable.dsk $@
+lemonade_patched.dsk: lemonade_patched.bin ../util/tone.obj lemonade_flash_patched.obj ../util/bootable.dsk
+       cp ../util/bootable.dsk $@
        ${DOS33} $@ DELETE HELLO
        ${DOS33} $@ SAVE A lemonade_patched.bin "LEMONADE PATCHED"
-       ${DOS33} $@ SAVE B tone.obj TONE.OBJ
+       ${DOS33} $@ SAVE B ../util/tone.obj TONE.OBJ
        ${DOS33} $@ SAVE B lemonade_flash_patched.obj "LEMONADE FLASH PATCHED.OBJ"
        ${DOS33} $@ HELLO "LEMONADE PATCHED"
 
@@ -35,30 +35,10 @@ lemonade.tok: lemonade.bin
 lemonade.bin: ../orig/Lemonade_Stand_1979_Apple.do
        ${DOS33} $< LOAD LEMONADE $@
 
-tone.obj: \
-tone.asm \
-tone_asm.txt \
-bootable.dsk \
-../orig/DOS_Tool_Kit_v1.0_1980_Apple.do
-       cp ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do .
-       tr '\t\na-z' ' \rA-Z' <tone.asm |\
-LC_ALL=C tr '\000-\177' '\200-\377' >__temp__.asm
-       ${MKDOS33FS} __temp__.dsk
-       ${DOS33} __temp__.dsk SAVE T __temp__.asm TONE.ASM
-       rm -f ../linapple-pie/Printer.txt
-       tr '\n' '\r' <tone_asm.txt |\
-( \
-  cd ../linapple-pie && \
-  ./linapple -b -1 ../lemonade/DOS_Tool_Kit_v1.0_1980_Apple.do -2 ../lemonade/__temp__.dsk \
-)
-       tr -d '\r' <../linapple-pie/Printer.txt >tone.lst
-       ${DOS33} __temp__.dsk LOAD TONE.OBJ $@
-       rm DOS_Tool_Kit_v1.0_1980_Apple.do __temp__.asm __temp__.dsk
-
 lemonade_tone.obj: \
 lemonade_tone.asm \
 lemonade_tone_asm.txt \
-bootable.dsk \
+../util/bootable.dsk \
 ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do
        cp ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do .
        tr '\t\na-z' ' \rA-Z' <lemonade_tone.asm |\
@@ -78,13 +58,13 @@ LC_ALL=C tr '\000-\177' '\200-\377' >__temp__.asm
 lemonade_tone.asm: \
 lemonade_tone_disasm.txt \
 lemonade_tone_disasm.sed \
-bootable.dsk \
+../util/bootable.dsk \
 ../orig/Lemonade_Stand_1979_Apple.do
        rm -f ../linapple-pie/Printer.txt
        tr '\n' '\r' <lemonade_tone_disasm.txt |\
 ( \
   cd ../linapple-pie && \
-  ./linapple -b -1 ../lemonade/bootable.dsk -2 ../orig/Lemonade_Stand_1979_Apple.do \
+  ./linapple -b -1 ../util/bootable.dsk -2 ../orig/Lemonade_Stand_1979_Apple.do \
 )
        tr -d '\r' <../linapple-pie/Printer.txt |\
 sed -nf lemonade_tone_disasm.sed >__temp__.asm
@@ -112,7 +92,7 @@ done
 lemonade_flash_patched.obj: \
 lemonade_flash_patched.asm \
 lemonade_flash_patched_asm.txt \
-bootable.dsk \
+../util/bootable.dsk \
 ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do
        cp ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do .
        tr '\t\na-z' ' \rA-Z' <lemonade_flash_patched.asm |\
@@ -136,13 +116,13 @@ lemonade_flash_patched.asm: lemonade_flash.asm lemonade_flash.asm.patch
 lemonade_flash.asm: \
 lemonade_flash_disasm.txt \
 lemonade_flash_disasm.sed \
-bootable.dsk \
+../util/bootable.dsk \
 ../orig/Lemonade_Stand_1979_Apple.do
        rm -f ../linapple-pie/Printer.txt
        tr '\n' '\r' <lemonade_flash_disasm.txt |\
 ( \
   cd ../linapple-pie && \
-  ./linapple -b -1 ../lemonade/bootable.dsk -2 ../orig/Lemonade_Stand_1979_Apple.do \
+  ./linapple -b -1 ../lemonade/../util/bootable.dsk -2 ../orig/Lemonade_Stand_1979_Apple.do \
 )
        tr -d '\r' <../linapple-pie/Printer.txt |\
 sed -nf lemonade_flash_disasm.sed >__temp__.asm
@@ -167,24 +147,15 @@ done
 ) >$@
        rm __temp__.asm __defs__.txt __refs__.txt
 
-bootable.dsk: ../orig/Apple_DOS_v3.3_1980_Apple.do bootable.txt
-       dd if=/dev/zero of=$@ count=35 bs=4096
-       tr '\n' '\r' <../lemonade/bootable.txt |\
-( \
-  cd ../linapple-pie && \
-  ./linapple -b -1 ../orig/Apple_DOS_v3.3_1980_Apple.do -2 ../lemonade/$@ \
-)
-
 clean:
        rm -f \
+*.bin \
+*.lst \
+*.obj \
+*.tok \
 lemonade_patched.dsk \
-lemonade_patched.bin \
-lemonade_patched.tok \
 lemonade_patched.bas \
 lemonade.bas \
-lemonade.tok \
-lemonade.bin \
-bootable.dsk \
 __temp__.asm \
 __temp__.dsk \
 __defs__.txt \
diff --git a/lemonade/bootable.txt b/lemonade/bootable.txt
deleted file mode 100644 (file)
index b027cda..0000000
--- a/lemonade/bootable.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-NEW
-10 HOME
-20 PRINT "HELLO"
-INIT HELLO,D2
diff --git a/lemonade/tone.asm b/lemonade/tone.asm
deleted file mode 100644 (file)
index ee672e8..0000000
--- a/lemonade/tone.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-spkr   equ     $c030
-       org     $300
-rest   lda     #0
-       sta     freql
-       sta     freqh
-tone   ldx     #0
-durl   equ     *-1
-       ldy     #0
-durh   equ     *-1
-loop   lda     #0
-freql  equ     *-1
-       adc     #0
-countl equ     *-1
-       sta     countl
-       lda     #0
-freqh  equ     *-1
-       adc     #0
-counth equ     *-1
-       sta     counth
-       bcc     nospkr
-       lda     spkr
-nospkr inx
-       bne     loop
-       iny
-       bne     loop
-       rts
diff --git a/lemonade/tone_asm.txt b/lemonade/tone_asm.txt
deleted file mode 100644 (file)
index f51e61c..0000000
--- a/lemonade/tone_asm.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-BRUN EDASM.OBJ
-PR#1
-DR 2
-ASM TONE.ASM,TONE.OBJ
-
diff --git a/little_brick_out/Makefile b/little_brick_out/Makefile
index 6a0f9ad..0aca40b 100644 (file)
--- a/little_brick_out/Makefile
+++ b/little_brick_out/Makefile
@@ -8,11 +8,10 @@ BAS_TO_TOK=../bas_to_tok.py
 .PHONY: all
 all: little_brick_out_patched.dsk little_brick_out_tone.obj
 
-little_brick_out_patched.dsk: little_brick_out_patched.bin tone.obj bootable.dsk
-       cp bootable.dsk $@
+little_brick_out_patched.dsk: little_brick_out_patched.bin ../util/bootable.dsk
+       cp ../util/bootable.dsk $@
        ${DOS33} $@ DELETE HELLO
        ${DOS33} $@ SAVE A little_brick_out_patched.bin "LITTLE BRICK OUT PATCHED"
-       ${DOS33} $@ SAVE B tone.obj TONE.OBJ
        ${DOS33} $@ HELLO "LITTLE BRICK OUT PATCHED"
 
 little_brick_out_patched.bin: little_brick_out_patched.tok
@@ -34,30 +33,10 @@ little_brick_out.tok: little_brick_out.bin
 little_brick_out.bin: ../orig/Apple_DOS_3.3_Master.dsk
        ${DOS33} $< LOAD "LITTLE BRICK OUT" $@
 
-tone.obj: \
-tone.asm \
-tone_asm.txt \
-bootable.dsk \
-../orig/DOS_Tool_Kit_v1.0_1980_Apple.do
-       cp ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do .
-       tr '\t\na-z' ' \rA-Z' <tone.asm |\
-LC_ALL=C tr '\000-\177' '\200-\377' >__temp__.asm
-       ${MKDOS33FS} __temp__.dsk
-       ${DOS33} __temp__.dsk SAVE T __temp__.asm TONE.ASM
-       rm -f ../linapple-pie/Printer.txt
-       tr '\n' '\r' <tone_asm.txt |\
-( \
-  cd ../linapple-pie && \
-  ./linapple -b -1 ../little_brick_out/DOS_Tool_Kit_v1.0_1980_Apple.do -2 ../little_brick_out/__temp__.dsk \
-)
-       tr -d '\r' <../linapple-pie/Printer.txt >tone.lst
-       ${DOS33} __temp__.dsk LOAD TONE.OBJ $@
-       rm DOS_Tool_Kit_v1.0_1980_Apple.do __temp__.asm __temp__.dsk
-
 little_brick_out_tone.obj: \
 little_brick_out_tone.asm \
 little_brick_out_tone_asm.txt \
-bootable.dsk \
+../util/bootable.dsk \
 ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do
        cp ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do .
        tr '\t\na-z' ' \rA-Z' <little_brick_out_tone.asm |\
@@ -77,13 +56,13 @@ LC_ALL=C tr '\000-\177' '\200-\377' >__temp__.asm
 little_brick_out_tone.asm: \
 little_brick_out_tone_disasm.txt \
 little_brick_out_tone_disasm.sed \
-bootable.dsk \
+../util/bootable.dsk \
 ../orig/Apple_DOS_3.3_Master.dsk
        rm -f ../linapple-pie/Printer.txt
        tr '\n' '\r' <little_brick_out_tone_disasm.txt |\
 ( \
   cd ../linapple-pie && \
-  ./linapple -b -1 ../little_brick_out/bootable.dsk -2 ../orig/Apple_DOS_3.3_Master.dsk \
+  ./linapple -b -1 ../util/bootable.dsk -2 ../orig/Apple_DOS_3.3_Master.dsk \
 )
        tr -d '\r' <../linapple-pie/Printer.txt |\
 sed -nf little_brick_out_tone_disasm.sed >__temp__.asm
@@ -108,24 +87,15 @@ done
 ) >$@
        rm __temp__.asm __defs__.txt __refs__.txt
 
-bootable.dsk: ../orig/Apple_DOS_v3.3_1980_Apple.do bootable.txt
-       dd if=/dev/zero of=$@ count=35 bs=4096
-       tr '\n' '\r' <../little_brick_out/bootable.txt |\
-( \
-  cd ../linapple-pie && \
-  ./linapple -b -1 ../orig/Apple_DOS_v3.3_1980_Apple.do -2 ../little_brick_out/$@ \
-)
-
 clean:
        rm -f \
+*.bin \
+*.lst \
+*.obj \
+*.tok \
 little_brick_out_patched.dsk \
-little_brick_out_patched.bin \
-little_brick_out_patched.tok \
 little_brick_out_patched.bas \
 little_brick_out.bas \
-little_brick_out.tok \
-little_brick_out.bin \
-bootable.dsk \
 __temp__.asm \
 __temp__.dsk \
 __defs__.txt \
diff --git a/little_brick_out/bootable.txt b/little_brick_out/bootable.txt
deleted file mode 100644 (file)
index b027cda..0000000
--- a/little_brick_out/bootable.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-NEW
-10 HOME
-20 PRINT "HELLO"
-INIT HELLO,D2
diff --git a/little_brick_out/tone.asm b/little_brick_out/tone.asm
deleted file mode 100644 (file)
index ee672e8..0000000
--- a/little_brick_out/tone.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-spkr   equ     $c030
-       org     $300
-rest   lda     #0
-       sta     freql
-       sta     freqh
-tone   ldx     #0
-durl   equ     *-1
-       ldy     #0
-durh   equ     *-1
-loop   lda     #0
-freql  equ     *-1
-       adc     #0
-countl equ     *-1
-       sta     countl
-       lda     #0
-freqh  equ     *-1
-       adc     #0
-counth equ     *-1
-       sta     counth
-       bcc     nospkr
-       lda     spkr
-nospkr inx
-       bne     loop
-       iny
-       bne     loop
-       rts
diff --git a/little_brick_out/tone_asm.txt b/little_brick_out/tone_asm.txt
deleted file mode 100644 (file)
index f51e61c..0000000
--- a/little_brick_out/tone_asm.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-BRUN EDASM.OBJ
-PR#1
-DR 2
-ASM TONE.ASM,TONE.OBJ
-
diff --git a/ribbit/Makefile b/ribbit/Makefile
index 484bbc9..5d4d60f 100644 (file)
--- a/ribbit/Makefile
+++ b/ribbit/Makefile
@@ -8,11 +8,10 @@ BAS_TO_TOK=../bas_to_tok.py
 .PHONY: all
 all: ribbit_patched.dsk ribbit_tone.obj
 
-ribbit_patched.dsk: ribbit_patched.bin tone.obj bootable.dsk
-       cp bootable.dsk $@
+ribbit_patched.dsk: ribbit_patched.bin ../util/bootable.dsk
+       cp ../util/bootable.dsk $@
        ${DOS33} $@ DELETE HELLO
        ${DOS33} $@ SAVE A ribbit_patched.bin "RIBBIT PATCHED"
-       ${DOS33} $@ SAVE B tone.obj TONE.OBJ
        ${DOS33} $@ HELLO "RIBBIT PATCHED"
 
 ribbit_patched.bin: ribbit_patched.tok
@@ -34,30 +33,10 @@ ribbit.tok: ribbit.bin
 ribbit.bin: ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do
        ${DOS33} $< LOAD RIBBIT $@
 
-tone.obj: \
-tone.asm \
-tone_asm.txt \
-bootable.dsk \
-../orig/DOS_Tool_Kit_v1.0_1980_Apple.do
-       cp ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do .
-       tr '\t\na-z' ' \rA-Z' <tone.asm |\
-LC_ALL=C tr '\000-\177' '\200-\377' >__temp__.asm
-       ${MKDOS33FS} __temp__.dsk
-       ${DOS33} __temp__.dsk SAVE T __temp__.asm TONE.ASM
-       rm -f ../linapple-pie/Printer.txt
-       tr '\n' '\r' <tone_asm.txt |\
-( \
-  cd ../linapple-pie && \
-  ./linapple -b -1 ../ribbit/DOS_Tool_Kit_v1.0_1980_Apple.do -2 ../ribbit/__temp__.dsk \
-)
-       tr -d '\r' <../linapple-pie/Printer.txt >tone.lst
-       ${DOS33} __temp__.dsk LOAD TONE.OBJ $@
-       rm DOS_Tool_Kit_v1.0_1980_Apple.do __temp__.asm __temp__.dsk
-
 ribbit_tone.obj: \
 ribbit_tone.asm \
 ribbit_tone_asm.txt \
-bootable.dsk \
+../util/bootable.dsk \
 ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do
        cp ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do .
        tr '\t\na-z' ' \rA-Z' <ribbit_tone.asm |\
@@ -77,13 +56,13 @@ LC_ALL=C tr '\000-\177' '\200-\377' >__temp__.asm
 ribbit_tone.asm: \
 ribbit_tone_disasm.txt \
 ribbit_tone_disasm.sed \
-bootable.dsk \
+../util/bootable.dsk \
 ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do
        rm -f ../linapple-pie/Printer.txt
        tr '\n' '\r' <ribbit_tone_disasm.txt |\
 ( \
   cd ../linapple-pie && \
-  ./linapple -b -1 ../ribbit/bootable.dsk -2 ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do \
+  ./linapple -b -1 ../util/bootable.dsk -2 ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do \
 )
        tr -d '\r' <../linapple-pie/Printer.txt |\
 sed -nf ribbit_tone_disasm.sed >__temp__.asm
@@ -108,24 +87,15 @@ done
 ) >$@
        rm __temp__.asm __defs__.txt __refs__.txt
 
-bootable.dsk: ../orig/Apple_DOS_v3.3_1980_Apple.do bootable.txt
-       dd if=/dev/zero of=$@ count=35 bs=4096
-       tr '\n' '\r' <../ribbit/bootable.txt |\
-( \
-  cd ../linapple-pie && \
-  ./linapple -b -1 ../orig/Apple_DOS_v3.3_1980_Apple.do -2 ../ribbit/$@ \
-)
-
 clean:
        rm -f \
+*.bin \
+*.lst \
+*.obj \
+*.tok \
 ribbit_patched.dsk \
-ribbit_patched.bin \
-ribbit_patched.tok \
 ribbit_patched.bas \
 ribbit.bas \
-ribbit.tok \
-ribbit.bin \
-bootable.dsk \
 __temp__.asm \
 __temp__.dsk \
 __defs__.txt \
diff --git a/ribbit/bootable.txt b/ribbit/bootable.txt
deleted file mode 100644 (file)
index b027cda..0000000
--- a/ribbit/bootable.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-NEW
-10 HOME
-20 PRINT "HELLO"
-INIT HELLO,D2
diff --git a/ribbit/tone.asm b/ribbit/tone.asm
deleted file mode 100644 (file)
index ee672e8..0000000
--- a/ribbit/tone.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-spkr   equ     $c030
-       org     $300
-rest   lda     #0
-       sta     freql
-       sta     freqh
-tone   ldx     #0
-durl   equ     *-1
-       ldy     #0
-durh   equ     *-1
-loop   lda     #0
-freql  equ     *-1
-       adc     #0
-countl equ     *-1
-       sta     countl
-       lda     #0
-freqh  equ     *-1
-       adc     #0
-counth equ     *-1
-       sta     counth
-       bcc     nospkr
-       lda     spkr
-nospkr inx
-       bne     loop
-       iny
-       bne     loop
-       rts
diff --git a/ribbit/tone_asm.txt b/ribbit/tone_asm.txt
deleted file mode 100644 (file)
index f51e61c..0000000
--- a/ribbit/tone_asm.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-BRUN EDASM.OBJ
-PR#1
-DR 2
-ASM TONE.ASM,TONE.OBJ
-
Unnamed repository; edit this file 'description' to name the repository.