Construct pipe-stdout got broken at some point

mbarbin · Dec 28, 2024 · 5031dbf · 5031dbf
1 parent 248d765
commit 5031dbf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/project/visa/circuit/dune b/project/visa/circuit/dune
@@ -110,24 +110,23 @@
  (deps
   calendar.bin
   initial-memory.txt
-  (package bopkit))
+  (package bopkit)
+  %{bin:bopkit}
+  visa.bop)
  (action
-  (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))))
+  (run %{dep:visa-simulation-soft-mapping.sh})))
 
 (rule
  (alias visa-simulation)
  (deps
   calendar.bin
   initial-memory.txt
-  (package bopkit))
+  (package bopkit)
+  %{bin:bopkit}
+  visa.bop
+  calendar-output.bop)
  (action
-  (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))))
+  (run %{dep:visa-simulation.sh})))
 
 (rule
  (target div10.txt)

diff --git a/project/visa/circuit/visa-simulation-soft-mapping.sh b/project/visa/circuit/visa-simulation-soft-mapping.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+bopkit simu visa.bop --output-only-on-change | \
+bopkit digital-calendar map-raw-input | \
+bopkit digital-calendar display --no-output
diff --git a/project/visa/circuit/visa-simulation.sh b/project/visa/circuit/visa-simulation.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+bopkit simu visa.bop --output-only-on-change | \
+bopkit simu calendar-output.bop -p | \
+bopkit digital-calendar display --no-output