From a99a06f0241cb23be9811ea6ea669bb7f3060801 Mon Sep 17 00:00:00 2001
From: Lucas Scharenbroich <lscharen@prowestgis.com>
Date: Thu, 13 Aug 2020 23:33:11 -0500
Subject: [PATCH] Improve test to delete and remove OMF files

---
 build-image.bat   |  17 +++++++++++++++++
 emu/Target.2mg    | Bin 2097216 -> 2097216 bytes
 package-lock.json |  12 ++++++------
 package.json      |   6 ++----
 4 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 build-image.bat

diff --git a/build-image.bat b/build-image.bat
new file mode 100644
index 0000000..c59dce0
--- /dev/null
+++ b/build-image.bat
@@ -0,0 +1,17 @@
+echo off
+
+REM Copy all of the assets into the ProDOS image for emulator testing
+REM
+REM Pass the path of the Cadius tool as the first argument (%1)
+
+set CADIUS="%1"
+set IMAGE="emu\\Target.2mg"
+set FOLDER="/GTEDEV/Build"
+
+REM Cadius does not overwrite files, so clear the root folder first
+%CADIUS% DELETEFOLDER %IMAGE% %FOLDER%
+%CADIUS% CREATEFOLDER %IMAGE% %FOLDER%
+
+REM Now copy files and folders as needed
+%CADIUS% ADDFILE %IMAGE% %FOLDER% test\\GTETestApp
+%CADIUS% ADDFILE %IMAGE% %FOLDER% src\\GTETool
diff --git a/emu/Target.2mg b/emu/Target.2mg
index 1b2fce8000b108bec7bc112148bc6f0234bdf253..99ab3d0f31032ed6940db423f42d3ee9678ebdba 100644
GIT binary patch
delta 911
zcmb`EPiqrV6vfYbGnsLwnIxudM%$=Ev4jK>+}W%;A!#YZPN}1yD+^*NinwXFEeQ65
zxX^_QF$*D-QV@iG0QZ(sx)X8Zu6pjvq*=HS#0$SS^X8rVXU;p=*-;1N{e62os7E1Q
zS+ln*IULsl4F@PqFDxy$JF7R_aT<eh=t5x*2<ix5?4Qa@6l#2F-COFmldec4iXLUq
z<`jF!Lm9Gat4WfI>@c8gLQbpUt*l&?<^Ir(QRj(H54-A6_hQ{tujd^{!|lcSGu70n
zp@4NfVRMP=u+c|ZpAEKL6^dLNRH?6%Xd!0?N0+retA)i(XVQI}gYd0%o^0}EcLVc?
z&g0J7#`D4Eha^5_t$nq9GN>$a6I<ES*u3|t7FhJhs!c7XowRc|jaOETpy#vaL-|z|
zKHANk^AL(G85!IcM>uX!pQ~Ub8(mj5yRSTTiRhxCb5ZDV!Zr1PT}<R<{g=O$#F@7^
zsz<&l^wZ))!D0C~|Iy68TK@aRYRs~E1LIKN<zoGjufIy>+dH_KiJb3)D%-H&qS0(^
zZajNzaqh;;xUd@+6w$;YHpvl(xa0!yh)>2yo&-eliljs?k}?@56J(N9NJuV`%Vdg7
QlPbAFu6~RQ*S?+n2At87wg3PC

delta 187
zcmWm7xedZF7(n6QIn3pNITFBJqCl)b2_w)@lMNUl5)ur+2rPi)f;JK}P*YK}0x!k)
z+E*5ZD)Bf(X}H>Ca;X~2Yn_N_5$kusTiv%>E9Lj*r*21M&$+wiP9Z>u2r)EjsH1@<
lS};h^Mh6yM^w7ruDKZQ(!Wh+Of+=R0KXbSEeErES%^%7iGJF64

diff --git a/package-lock.json b/package-lock.json
index 77d68c8..07f2ab0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,15 +14,15 @@
       }
     },
     "merge": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz",
-      "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
       "dev": true
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "dev": true
     },
     "watch": {
diff --git a/package.json b/package.json
index 8112dda..1b06b7f 100644
--- a/package.json
+++ b/package.json
@@ -9,11 +9,9 @@
     "gsport": "C:\\Programs\\gsport\\gsport_0.31\\GSPort.exe"
   },
   "scripts": {
-    "test": "npm run build:test && npm run build:test:copy && %npm_package_config_gsport%",
+    "test": "npm run build && build-image.bat %npm_package_config_cadius% && %npm_package_config_gsport%",
+    "build": "npm run build:tool && npm run build:test",
     "build:test": "%npm_package_config_merlin32% -V macros test/App.s",
-    "build:test:copy": "%npm_package_config_cadius% ADDFILE emu\\Target.2mg /GTEDEV test/GTETestApp",
-    "build": "npm run build:tool && npm run build:copy",
-    "build:copy": "%npm_package_config_cadius% ADDFILE emu\\Target.2mg /GTEDEV src\\GTETool",
     "build:tool": "%npm_package_config_merlin32% -V C:\\Programs\\BrutalDeluxe\\Merlin32\\Library src\\Tool.s",
     "build:watch": "watch \"npm run build\" src"
   },