From 5031dbfa0bb6b67348e6b22875f6cd09b988ef1d Mon Sep 17 00:00:00 2001 From: Mathieu Barbin Date: Sat, 28 Dec 2024 15:54:00 +0100 Subject: [PATCH] Construct pipe-stdout got broken at some point --- project/visa/circuit/dune | 19 +++++++++---------- .../circuit/visa-simulation-soft-mapping.sh | 5 +++++ project/visa/circuit/visa-simulation.sh | 5 +++++ 3 files changed, 19 insertions(+), 10 deletions(-) create mode 100755 project/visa/circuit/visa-simulation-soft-mapping.sh create mode 100755 project/visa/circuit/visa-simulation.sh diff --git a/project/visa/circuit/dune b/project/visa/circuit/dune index 7736863..135cd06 100644 --- 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 new file mode 100755 index 0000000..b23e44a --- /dev/null +++ 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 new file mode 100755 index 0000000..b372768 --- /dev/null +++ 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