From 51933f3223a80e546f5f74b2bc0628522dbf47b0 Mon Sep 17 00:00:00 2001
From: Egan Ford <datajerk@gmail.com>
Date: Tue, 9 May 2023 12:32:10 -0600
Subject: [PATCH] fixed windows testing, docker required now

---
 README.md         |   1 +
 bin/c2d.exe       | Bin 186171 -> 186171 bytes
 bin/page2text.exe | Bin 28529 -> 28529 bytes
 bin/text2page.exe | Bin 28352 -> 28352 bytes
 dwine             |   4 ++++
 test.sh           |  28 ++++++++++++----------------
 6 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100755 dwine

diff --git a/README.md b/README.md
index 7970a4f..dc4da66 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,7 @@ Download <https://github.com/datajerk/c2d/archive/master.zip> and extract.
 ### Build Notes
 
 NOTE: cc65 2.13.3 required (no other version supported)
+NOTE: Docker required for `make disttest`
 
 Unix/Linux:
 
diff --git a/bin/c2d.exe b/bin/c2d.exe
index 8393615ac7973071d43aef367a9b7a9c316668a5..1156063dd4c43ff97aaa2e3c458337e6ad4e39dd 100755
GIT binary patch
delta 27
jcmdnJj(hhy?g<@C?Gq<<`7!Z?H{NQ!#klnrQ{puMtDFpM

delta 27
jcmdnJj(hhy?g<@C*SaQl`7uQYG~Q~x#klnrQ{puMv>FWj

diff --git a/bin/page2text.exe b/bin/page2text.exe
index c9ddf7f110ac493ab1d38cd650e19b96ae9cbd5c..eada6eeeaf4183a353356594da11be5f51a8d7d8 100755
GIT binary patch
delta 21
dcmex(kMZL@#t9uv?Gq<<`7w#sZoD-;4*+;=3Sa;L

delta 21
dcmex(kMZL@#t9uv*SaQl`7x!GZM-!-4*-3O3h)2`

diff --git a/bin/text2page.exe b/bin/text2page.exe
index 2d128e680473fb4144af57b19341ed6dec5da4ae..7027094e5438d5b9c725f4af5288c0ea2f3f3908 100755
GIT binary patch
delta 22
ecmX?bm+`<|#t9uv?Gq<<`7uu`WY~E7X)XYKA_~9&

delta 22
ecmX?bm+`<|#t9uv*SaQl`7uAqV%&K9X)XYP&I?cg

diff --git a/dwine b/dwine
new file mode 100755
index 0000000..19cde84
--- /dev/null
+++ b/dwine
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+set -x
+docker run --rm -it -v $PWD:/pwd wine32 bash -c "cd /pwd && wine $*"
diff --git a/test.sh b/test.sh
index 13669e9..0226800 100755
--- a/test.sh
+++ b/test.sh
@@ -47,9 +47,8 @@ then
 	echo
 	echo "Testing Windows c2d..."
 	echo
-	PATH=$HOME/wine/bin:$PATH
-	echo "wine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk"
-	wine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk 2>&1 | sed 's/^/    /'
+	echo "./dwine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk"
+	./dwine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk 2>&1 | sed 's/^/    /'
 	CHECK=$(md5sum ${BIN}.dsk | awk '{print $1}')
 	if [ "$CHECK" = "$SUM" ]
 	then
@@ -104,11 +103,10 @@ then
 	echo
 	echo "Testing Windows c2d textpage..."
 	echo
-	PATH=$HOME/wine/bin:$PATH
-	echo "wine bin/text2page.exe <${BIN}.text >${BIN}.textpage"
-	wine bin/text2page.exe <${BIN}.text >${BIN}.textpage
-	echo "wine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk"
-	wine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk 2>&1 | sed 's/^/    /'
+	echo "./dwine bin/text2page.exe <${BIN}.text >${BIN}.textpage"
+	./dwine bin/text2page.exe '<'${BIN}.text '>'${BIN}.textpage
+	echo "./dwine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk"
+	./dwine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk 2>&1 | sed 's/^/    /'
 	CHECK=$(md5sum ${BIN}.dsk | awk '{print $1}')
 	if [ "$CHECK" = "$SUM" ]
 	then
@@ -145,9 +143,8 @@ rm -f ${BIN}.dsk
 	echo
 	echo "Testing Windows c2d..."
 	echo
-	PATH=$HOME/wine/bin:$PATH
-	echo "wine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk"
-	wine bin/c2d.exe ${MON} ${BIN}.dsk 2>&1 | sed 's/^/    /'
+	echo "./dwine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk"
+	./dwine bin/c2d.exe ${MON} ${BIN}.dsk 2>&1 | sed 's/^/    /'
 	CHECK=$(md5sum ${BIN}.dsk | awk '{print $1}')
 	if [ "$CHECK" = "$SUM" ]
 	then
@@ -183,11 +180,10 @@ then
 	echo
 	echo "Testing Windows c2d textpage..."
 	echo
-	PATH=$HOME/wine/bin:$PATH
-	echo "wine bin/text2page.exe <${BIN}.text >${BIN}.textpage"
-	wine bin/text2page.exe <${BIN}.text >${BIN}.textpage
-	echo "wine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk"
-	wine bin/c2d.exe -t ${BIN}.textpage ${MON} ${BIN}.dsk 2>&1 | sed 's/^/    /'
+	echo "./dwine bin/text2page.exe <${BIN}.text >${BIN}.textpage"
+	./dwine bin/text2page.exe '<'${BIN}.text '>'${BIN}.textpage
+	echo "./dwine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk"
+	./dwine bin/c2d.exe -t ${BIN}.textpage ${MON} ${BIN}.dsk 2>&1 | sed 's/^/    /'
 	CHECK=$(md5sum ${BIN}.dsk | awk '{print $1}')
 	if [ "$CHECK" = "$SUM" ]
 	then