From 1e01a47380a47be0318a1247cf14a68a444bf6c1 Mon Sep 17 00:00:00 2001
From: Brad Nelson <flagxor@gmail.com>
Date: Mon, 1 Jan 2024 18:39:27 -0800
Subject: [PATCH] Closer.

---
 configure.py   | 20 ++++++++++++++++----
 esp32/BUILD    |  8 ++++++--
 pico-ice/BUILD |  6 +++---
 site/BUILD     |  2 ++
 web/BUILD      |  1 +
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/configure.py b/configure.py
index c729e5c..c437772 100755
--- a/configure.py
+++ b/configure.py
@@ -225,6 +225,10 @@ rule run
   description = RUN $in
   command = $in >$out
 
+rule cmd
+  description = CMD
+  command = $cmd
+
 rule resize
   description = RESIZE $size
   command = convert -resize $size $in $out
@@ -286,15 +290,15 @@ def Importation(target, source, header_mode='cpp', name=None, keep=False, deps=N
 
 
 def Esp32Optional(main_name, main_source, parts):
-  parts = []
+  implicit = []
   for name, source in parts:
-    parts.append(Importation('$dst/gen/esp32_' + name + '.h',
-                             source, name=name.replace('-', '_') + '_source'))
+    implicit.append(Importation('$dst/gen/esp32_' + name + '.h',
+                                source, name=name.replace('-', '_') + '_source'))
   return Importation('$dst/esp32/ESP32forth/optional/' + main_name + '.h',
                      main_source,
                      keep=True,
                      deps='$dst/gen/esp32_optional_' + main_name + '.h.d',
-                     implicit=parts)
+                     implicit=implicit)
 
 
 def Simple(op, target, source, implicit=[]):
@@ -404,6 +408,14 @@ def ForthTest(target, forth, test, interp='', pool=None):
   return target
 
 
+def Command(target, source, command, implicit=[]):
+  global output
+  implicit = ' '.join(implicit)
+  output += f'build {target}: cmd {source} | {implicit}\n'
+  output += f'  cmd = {command}\n'
+  return target
+
+
 def Default(target):
   global output
   output += f'default {target}\n'
diff --git a/esp32/BUILD b/esp32/BUILD
index c828e80..4fcbbd3 100644
--- a/esp32/BUILD
+++ b/esp32/BUILD
@@ -54,8 +54,12 @@ ESP32_FILES += [
 
 # Simulator.
 ESP32_FILES += [
-  Compile('$dst/esp32-sim/esp32-sim', '$src/esp32/sim_main.cpp',
-          implicit=['$dst/gen/esp32_boot.h', '$dst/gen/esp32_sim_opcodes.h'])
+  Compile('$dst/esp32-sim/Esp32forth-sim', '$src/esp32/sim_main.cpp',
+          implicit=['$dst/gen/esp32_boot.h', '$dst/gen/esp32_sim_opcodes.h']),
+  Command('$dst/esp32-sim/sizes.txt',
+          ' '.join(['$dst/esp32-sim/Esp32forth-sim', '$src/tools/memuse.py']),
+	        'echo internals size-all bye | $dst/esp32-sim/Esp32forth-sim | '
+          '$src/tools/memuse.py >$dst/esp32-sim/sizes.txt'),
 ]
 Compile('$dst/gen/print-esp32-builtins', '$src/esp32/print-builtins.cpp'),
 Run('$dst/gen/esp32_sim_opcodes.h', '$dst/gen/print-esp32-builtins')
diff --git a/pico-ice/BUILD b/pico-ice/BUILD
index 6765c66..0455a43 100644
--- a/pico-ice/BUILD
+++ b/pico-ice/BUILD
@@ -20,10 +20,10 @@ PICO_ICE_ZIP_FILES += [
   Importation('$dst/pico-ice/ueforth-pico-ice/README.txt',
               '$src/pico-ice/README.txt'),
   # TODO: .uf2
-  Copy('$dst/pico-ice/ueforth-pice-ice/LICENSE', '$src/LICENSE'),
-  Copy('$dst/pico-ice/ueforth-pice-ice/pico-ice-sdk-LICENSE.md',
+  Copy('$dst/pico-ice/ueforth-pico-ice/LICENSE', '$src/LICENSE'),
+  Copy('$dst/pico-ice/ueforth-pico-ice/pico-ice-sdk-LICENSE.md',
        '$src/pico-ice/pico-ice-sdk/LICENSE.md'),
-  Copy('$dst/pico-ice/ueforth-pice-ice/pico-sdk-LICENSE.TXT',
+  Copy('$dst/pico-ice/ueforth-pico-ice/pico-sdk-LICENSE.TXT',
        '$src/pico-ice/pico-sdk/LICENSE.TXT'),
 ]
 
diff --git a/site/BUILD b/site/BUILD
index 2bd880e..182cc14 100644
--- a/site/BUILD
+++ b/site/BUILD
@@ -56,6 +56,8 @@ DEPLOY_ITEMS += [
     'esp-cam-wiring.jpg',
     'serial_bridge.jpg',
   ]
+] + [
+  Copy('$dst/deploy/static/favicon.ico', '$dst/resources/eforth.ico'),
 ]
 
 Alias('site', ' '.join(DEPLOY_ITEMS))
diff --git a/web/BUILD b/web/BUILD
index 013624f..1fb34fb 100644
--- a/web/BUILD
+++ b/web/BUILD
@@ -29,6 +29,7 @@ WEB_ITEMS = [
   Copy('$dst/web/terminal.html', '$src/web/terminal.html'),
   Copy('$dst/web/lazy_terminal.html', '$src/web/lazy_terminal.html'),
   Copy('$dst/web/script_lite_test.html', '$src/web/script_lite_test.html'),
+  Copy('$dst/web/script_test.html', '$src/web/script_test.html'),
   Copy('$dst/web/script_test.fs', '$src/web/script_test.fs'),
 ]