Move lemonade files to /lemonade, create Makefiles for /lemonade and /orig

diff --git a/.gitignore b/.gitignore
index cfcfea1..e7e1b4a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,13 @@
 *.bin
 *.tok
 __pycache__
-/Lemonade_Stand_1979_Apple.do
 /bas_to_tok.py
 /element.py
-/lemonade.bas
+/lemonade/lemonade.bas
+/lemonade/lemonade_patched.bas
+/lemonade/lemonade_patched.dsk
 /lex_yy.py
-/orig
+/orig/Lemonade_Stand_1979_Apple.do
 /tok_to_bas.py
 /t_def.py
 /y_tab.py

diff --git a/Makefile b/Makefile
index 451d446..c997d0f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,20 @@
        chmod a+x $@
 
 .PHONY: all
-all: dos33fsprogs element.py lex_yy.py t_def.py y_tab.py bas_to_tok.py tok_to_bas.py
+all: dos33fsprogs lemonade orig element.py lex_yy.py t_def.py y_tab.py bas_to_tok.py tok_to_bas.py
 
 .PHONY: dos33fsprogs
 dos33fsprogs:
        ${MAKE} ${MAKEFLAGS} -C dos33fsprogs/utils/dos33fs-utils dos33 mkdos33fs
 
+.PHONY: lemonade
+lemonade: dos33fsprogs tok_to_bin.py bin_to_tok.py tok_to_bas.py bas_to_tok.py
+       ${MAKE} ${MAKEFLAGS} -C lemonade
+
+.PHONY: orig
+orig:
+       ${MAKE} ${MAKEFLAGS} -C orig
+
 element.py:
        pitree --install-element
 
@@ -29,6 +37,8 @@ tok_to_bas.py: tok_to_bas.l
 
 clean:
        ${MAKE} ${MAKEFLAGS} -C dos33fsprogs/utils/dos33fs-utils clean
+       ${MAKE} ${MAKEFLAGS} -C lemonade clean
+       ${MAKE} ${MAKEFLAGS} -C orig clean
        rm -f \
 element.py \
 lex_yy.py \

diff --git a/lemonade.sh b/lemonade.sh
deleted file mode 100755 (executable)
index 5a49209..0000000
--- a/lemonade.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-rm -f Lemonade_Stand_1979_Apple.do
-wget https://archive.org/download/Lemonade_Stand_1979_Apple/Lemonade_Stand_1979_Apple.do
-mkdir --parents orig
-cp Lemonade_Stand_1979_Apple.do orig
-dos33fsprogs/utils/dos33fs-utils/dos33 orig/Lemonade_Stand_1979_Apple.do LOAD LEMONADE lemonade.bin
-./bin_to_tok.py <lemonade.bin >lemonade.tok
-./tok_to_bas.py <lemonade.tok >lemonade.bas
-cp lemonade.bas orig
-patch lemonade.bas <lemonade.bas.patch
-./bas_to_tok.py <lemonade.bas >lemonade.tok
-./tok_to_bin.py <lemonade.tok >lemonade.bin
-dos33fsprogs/utils/dos33fs-utils/dos33 Lemonade_Stand_1979_Apple.do SAVE A lemonade.bin "LEMONADE PATCHED"

diff --git a/lemonade/Makefile b/lemonade/Makefile
new file mode 100644 (file)
index 0000000..28a9306
--- /dev/null
+++ b/lemonade/Makefile
@@ -0,0 +1,41 @@
+DOS33=../dos33fsprogs/utils/dos33fs-utils/dos33
+TOK_TO_BIN=../tok_to_bin.py
+BIN_TO_TOK=../bin_to_tok.py
+TOK_TO_BAS=../tok_to_bas.py
+BAS_TO_TOK=../bas_to_tok.py
+
+.PHONY: all
+all: lemonade_patched.dsk
+
+lemonade_patched.dsk: ../orig/Lemonade_Stand_1979_Apple.do lemonade_patched.bin
+       cp ../orig/Lemonade_Stand_1979_Apple.do $@
+       ${DOS33} $@ SAVE A lemonade_patched.bin "LEMONADE PATCHED"
+
+lemonade_patched.bin: lemonade_patched.tok
+       ${TOK_TO_BIN} <$< >$@
+
+lemonade_patched.tok: lemonade_patched.bas
+       ${BAS_TO_TOK} <$< >$@
+
+lemonade_patched.bas: lemonade.bas lemonade.bas.patch
+       cp lemonade.bas $@
+       patch $@ <lemonade.bas.patch
+
+lemonade.bas: lemonade.tok
+       ${TOK_TO_BAS} <$< >$@
+
+lemonade.tok: lemonade.bin
+       ${BIN_TO_TOK} <$< >$@
+
+lemonade.bin: ../orig/Lemonade_Stand_1979_Apple.do
+       ${DOS33} $< LOAD LEMONADE $@
+
+clean:
+       rm -f \
+lemonade_patched.dsk \
+lemonade_patched.bin \
+lemonade_patched.tok \
+lemonade_patched.bas \
+lemonade.bas \
+lemonade.tok \
+lemonade.bin

diff --git a/lemonade.bas.patch b/lemonade/lemonade.bas.patch
similarity index 100%
rename from lemonade.bas.patch
rename to lemonade/lemonade.bas.patch

diff --git a/orig/Makefile b/orig/Makefile
new file mode 100644 (file)
index 0000000..272173a
--- /dev/null
+++ b/orig/Makefile
@@ -0,0 +1,11 @@
+.PHONY: all
+all: Lemonade_Stand_1979_Apple.do
+
+Lemonade_Stand_1979_Apple.do:
+       rm -f $@
+       wget https://archive.org/download/Lemonade_Stand_1979_Apple/$@
+
+clean:
+       # avoid hitting archive.org every time
+       # it can be deleted manually if needed
+       #rm -f Lemonade_Stand_1979_Apple.do