Revert "Construct pipe-stdout got broken at some point"

This reverts commit 5031dbf.
mbarbin · Dec 28, 2024 · 91e30b2 · 91e30b2
1 parent 5031dbf
commit 91e30b2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 19 deletions.
diff --git a/project/visa/circuit/dune b/project/visa/circuit/dune
@@ -110,23 +110,24 @@
  (deps
   calendar.bin
   initial-memory.txt
-  (package bopkit)
-  %{bin:bopkit}
-  visa.bop)
+  (package bopkit))
  (action
-  (run %{dep:visa-simulation-soft-mapping.sh})))
+  (pipe-stdout
+   (run %{bin:bopkit} simu %{dep:visa.bop} --output-only-on-change)
+   (run %{bin:bopkit} digital-calendar map-raw-input)
+   (run %{bin:bopkit} digital-calendar display --no-output))))
 
 (rule
  (alias visa-simulation)
  (deps
   calendar.bin
   initial-memory.txt
-  (package bopkit)
-  %{bin:bopkit}
-  visa.bop
-  calendar-output.bop)
+  (package bopkit))
  (action
-  (run %{dep:visa-simulation.sh})))
+  (pipe-stdout
+   (run %{bin:bopkit} simu %{dep:visa.bop} --output-only-on-change)
+   (run %{bin:bopkit} simu %{dep:calendar-output.bop} -p)
+   (run %{bin:bopkit} digital-calendar display --no-output))))
 
 (rule
  (target div10.txt)

diff --git a/project/visa/circuit/visa-simulation-soft-mapping.sh b/project/visa/circuit/visa-simulation-soft-mapping.sh
diff --git a/project/visa/circuit/visa-simulation.sh b/project/visa/circuit/visa-simulation.sh