From 133607e8556e3fc2c24f3a761cc0951376871f24 Mon Sep 17 00:00:00 2001 From: Mathieu Barbin Date: Fri, 5 Apr 2024 16:34:46 +0200 Subject: [PATCH] Revert "Spurious commit that makes rule generation unstable" This reverts commit 3fe8fe09788712200f3983574985f8c618b010cc. --- doc/reference/dune.inc | 6 +- project/digital-watch/dune.inc | 6 +- project/subleq/circuit/dune.inc | 4 +- project/visa/circuit/dune.asm.inc | 2 +- project/visa/circuit/dune.bop.inc | 6 +- project/visa/test/assembler/error/dune.inc | 22 ++-- project/visa/test/runtime/dune.inc | 6 +- stdlib/7-segment/dune.inc | 2 +- stdlib/bopboard/dune.inc | 2 +- stdlib/bopboard/example/dune.inc | 8 +- stdlib/counter/dune.inc | 4 +- stdlib/counter/test/dune.inc | 2 +- stdlib/pulse/dune.inc | 4 +- stdlib/pulse/test/dune.inc | 2 +- stdlib/stdlib/dune.inc | 2 +- stdlib/stdlib/test/dune.inc | 34 +++--- test/bop2c/dune.inc | 8 +- test/netlist/check/dune.inc | 30 ++--- test/netlist/error/dune.inc | 124 ++++++++++----------- test/netlist/runtime/dune.inc | 12 +- test/process/error/dune.inc | 8 +- test/process/runtime/dune.inc | 8 +- tutorial/bdd/division/dune.inc | 4 +- tutorial/functional-args/dune.inc | 2 +- tutorial/hello-world/dune.inc | 4 +- tutorial/misc/dune.inc | 4 +- tutorial/parametrized-blocks/dune.inc | 2 +- 27 files changed, 159 insertions(+), 159 deletions(-) diff --git a/doc/reference/dune.inc b/doc/reference/dune.inc index 9ee8f514..44ffcd26 100644 --- a/doc/reference/dune.inc +++ b/doc/reference/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to and2_recursive.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:and2_recursive.bop}"))) + (run %{bin:bopkit} fmt file %{dep:and2_recursive.bop}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to one-of-each.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:one-of-each.bop}"))) + (run %{bin:bopkit} fmt file %{dep:one-of-each.bop}))) (rule (alias fmt) @@ -23,7 +23,7 @@ (rule (with-stdout-to parametrized-block.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:parametrized-block.bop}"))) + (run %{bin:bopkit} fmt file %{dep:parametrized-block.bop}))) (rule (alias fmt) diff --git a/project/digital-watch/dune.inc b/project/digital-watch/dune.inc index 85e9470f..cce1daf7 100644 --- a/project/digital-watch/dune.inc +++ b/project/digital-watch/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to main.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:main.bop}"))) + (run %{bin:bopkit} fmt file %{dep:main.bop}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to watch.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:watch.bop}"))) + (run %{bin:bopkit} fmt file %{dep:watch.bop}))) (rule (alias fmt) @@ -23,7 +23,7 @@ (rule (with-stdout-to watch_with_bopboard.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:watch_with_bopboard.bop}"))) + (run %{bin:bopkit} fmt file %{dep:watch_with_bopboard.bop}))) (rule (alias fmt) diff --git a/project/subleq/circuit/dune.inc b/project/subleq/circuit/dune.inc index 454c7cda..04c645e6 100644 --- a/project/subleq/circuit/dune.inc +++ b/project/subleq/circuit/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to main.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:main.bop}"))) + (run %{bin:bopkit} fmt file %{dep:main.bop}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to subleq.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:subleq.bop}"))) + (run %{bin:bopkit} fmt file %{dep:subleq.bop}))) (rule (alias fmt) diff --git a/project/visa/circuit/dune.asm.inc b/project/visa/circuit/dune.asm.inc index 44fb2519..5ef4e21b 100644 --- a/project/visa/circuit/dune.asm.inc +++ b/project/visa/circuit/dune.asm.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to calendar.asm.pp.output - (bash "%{bin:visa} fmt file %{dep:calendar.asm}"))) + (run %{bin:visa} fmt file %{dep:calendar.asm}))) (rule (alias fmt) diff --git a/project/visa/circuit/dune.bop.inc b/project/visa/circuit/dune.bop.inc index 40c52486..61d1358e 100644 --- a/project/visa/circuit/dune.bop.inc +++ b/project/visa/circuit/dune.bop.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to calendar-output.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:calendar-output.bop}"))) + (run %{bin:bopkit} fmt file %{dep:calendar-output.bop}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to main.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:main.bop}"))) + (run %{bin:bopkit} fmt file %{dep:main.bop}))) (rule (alias fmt) @@ -23,7 +23,7 @@ (rule (with-stdout-to visa.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:visa.bop}"))) + (run %{bin:bopkit} fmt file %{dep:visa.bop}))) (rule (alias fmt) diff --git a/project/visa/test/assembler/error/dune.inc b/project/visa/test/assembler/error/dune.inc index 54586500..dc487456 100644 --- a/project/visa/test/assembler/error/dune.inc +++ b/project/visa/test/assembler/error/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to duplicated-constant.asm.pp.output - (bash "%{bin:visa} fmt file %{dep:duplicated-constant.asm}"))) + (run %{bin:visa} fmt file %{dep:duplicated-constant.asm}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to duplicated-label.asm.pp.output - (bash "%{bin:visa} fmt file %{dep:duplicated-label.asm}"))) + (run %{bin:visa} fmt file %{dep:duplicated-label.asm}))) (rule (alias fmt) @@ -23,7 +23,7 @@ (rule (with-stdout-to duplicated-macro-parameter.asm.pp.output - (bash "%{bin:visa} fmt file %{dep:duplicated-macro-parameter.asm}"))) + (run %{bin:visa} fmt file %{dep:duplicated-macro-parameter.asm}))) (rule (alias fmt) @@ -35,7 +35,7 @@ (rule (with-stdout-to duplicated-macro.asm.pp.output - (bash "%{bin:visa} fmt file %{dep:duplicated-macro.asm}"))) + (run %{bin:visa} fmt file %{dep:duplicated-macro.asm}))) (rule (alias fmt) @@ -45,7 +45,7 @@ (rule (with-stdout-to invalid-arguments.asm.pp.output - (bash "%{bin:visa} fmt file %{dep:invalid-arguments.asm}"))) + (run %{bin:visa} fmt file %{dep:invalid-arguments.asm}))) (rule (alias fmt) @@ -55,7 +55,7 @@ (rule (with-stdout-to label-without-instruction.asm.pp.output - (bash "%{bin:visa} fmt file %{dep:label-without-instruction.asm}"))) + (run %{bin:visa} fmt file %{dep:label-without-instruction.asm}))) (rule (alias fmt) @@ -67,7 +67,7 @@ (rule (with-stdout-to undefined-macro.asm.pp.output - (bash "%{bin:visa} fmt file %{dep:undefined-macro.asm}"))) + (run %{bin:visa} fmt file %{dep:undefined-macro.asm}))) (rule (alias fmt) @@ -77,7 +77,7 @@ (rule (with-stdout-to unused-label.asm.pp.output - (bash "%{bin:visa} fmt file %{dep:unused-label.asm}"))) + (run %{bin:visa} fmt file %{dep:unused-label.asm}))) (rule (alias fmt) @@ -87,7 +87,7 @@ (rule (with-stdout-to unused-macro-parameter.asm.pp.output - (bash "%{bin:visa} fmt file %{dep:unused-macro-parameter.asm}"))) + (run %{bin:visa} fmt file %{dep:unused-macro-parameter.asm}))) (rule (alias fmt) @@ -97,7 +97,7 @@ (rule (with-stdout-to unused-macro.asm.pp.output - (bash "%{bin:visa} fmt file %{dep:unused-macro.asm}"))) + (run %{bin:visa} fmt file %{dep:unused-macro.asm}))) (rule (alias fmt) @@ -107,7 +107,7 @@ (rule (with-stdout-to unused-var.asm.pp.output - (bash "%{bin:visa} fmt file %{dep:unused-var.asm}"))) + (run %{bin:visa} fmt file %{dep:unused-var.asm}))) (rule (alias fmt) diff --git a/project/visa/test/runtime/dune.inc b/project/visa/test/runtime/dune.inc index 008d7f88..f8b4f147 100644 --- a/project/visa/test/runtime/dune.inc +++ b/project/visa/test/runtime/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to constant.asm.pp.output - (bash "%{bin:visa} fmt file %{dep:constant.asm}"))) + (run %{bin:visa} fmt file %{dep:constant.asm}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to loop.asm.pp.output - (bash "%{bin:visa} fmt file %{dep:loop.asm}"))) + (run %{bin:visa} fmt file %{dep:loop.asm}))) (rule (alias fmt) @@ -23,7 +23,7 @@ (rule (with-stdout-to minus.asm.pp.output - (bash "%{bin:visa} fmt file %{dep:minus.asm}"))) + (run %{bin:visa} fmt file %{dep:minus.asm}))) (rule (alias fmt) diff --git a/stdlib/7-segment/dune.inc b/stdlib/7-segment/dune.inc index 7c25b662..fcba782c 100644 --- a/stdlib/7-segment/dune.inc +++ b/stdlib/7-segment/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to 7_segment.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:7_segment.bop}"))) + (run %{bin:bopkit} fmt file %{dep:7_segment.bop}))) (rule (alias fmt) diff --git a/stdlib/bopboard/dune.inc b/stdlib/bopboard/dune.inc index f923fe41..77a6701e 100644 --- a/stdlib/bopboard/dune.inc +++ b/stdlib/bopboard/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to bopboard.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:bopboard.bop}"))) + (run %{bin:bopkit} fmt file %{dep:bopboard.bop}))) (rule (alias fmt) diff --git a/stdlib/bopboard/example/dune.inc b/stdlib/bopboard/example/dune.inc index 6698e062..129fad80 100644 --- a/stdlib/bopboard/example/dune.inc +++ b/stdlib/bopboard/example/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to bit_shift.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:bit_shift.bop}"))) + (run %{bin:bopkit} fmt file %{dep:bit_shift.bop}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to lights.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:lights.bop}"))) + (run %{bin:bopkit} fmt file %{dep:lights.bop}))) (rule (alias fmt) @@ -23,7 +23,7 @@ (rule (with-stdout-to lights_bdd.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:lights_bdd.bop}"))) + (run %{bin:bopkit} fmt file %{dep:lights_bdd.bop}))) (rule (alias fmt) @@ -33,7 +33,7 @@ (rule (with-stdout-to ram.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:ram.bop}"))) + (run %{bin:bopkit} fmt file %{dep:ram.bop}))) (rule (alias fmt) diff --git a/stdlib/counter/dune.inc b/stdlib/counter/dune.inc index 28d958a9..3154471b 100644 --- a/stdlib/counter/dune.inc +++ b/stdlib/counter/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to and.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:and.bop}"))) + (run %{bin:bopkit} fmt file %{dep:and.bop}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to out.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:out.bop}"))) + (run %{bin:bopkit} fmt file %{dep:out.bop}))) (rule (alias fmt) diff --git a/stdlib/counter/test/dune.inc b/stdlib/counter/test/dune.inc index 02bf90a1..f7de0863 100644 --- a/stdlib/counter/test/dune.inc +++ b/stdlib/counter/test/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to main.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:main.bop}"))) + (run %{bin:bopkit} fmt file %{dep:main.bop}))) (rule (alias fmt) diff --git a/stdlib/pulse/dune.inc b/stdlib/pulse/dune.inc index 18f11c1e..c1251409 100644 --- a/stdlib/pulse/dune.inc +++ b/stdlib/pulse/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to example.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:example.bop}"))) + (run %{bin:bopkit} fmt file %{dep:example.bop}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to pulse.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:pulse.bop}"))) + (run %{bin:bopkit} fmt file %{dep:pulse.bop}))) (rule (alias fmt) diff --git a/stdlib/pulse/test/dune.inc b/stdlib/pulse/test/dune.inc index 02bf90a1..f7de0863 100644 --- a/stdlib/pulse/test/dune.inc +++ b/stdlib/pulse/test/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to main.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:main.bop}"))) + (run %{bin:bopkit} fmt file %{dep:main.bop}))) (rule (alias fmt) diff --git a/stdlib/stdlib/dune.inc b/stdlib/stdlib/dune.inc index 819b79c7..3eb3f64d 100644 --- a/stdlib/stdlib/dune.inc +++ b/stdlib/stdlib/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to stdlib.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:stdlib.bop}"))) + (run %{bin:bopkit} fmt file %{dep:stdlib.bop}))) (rule (alias fmt) diff --git a/stdlib/stdlib/test/dune.inc b/stdlib/stdlib/test/dune.inc index d9074904..655c9543 100644 --- a/stdlib/stdlib/test/dune.inc +++ b/stdlib/stdlib/test/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to add.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:add.bop}"))) + (run %{bin:bopkit} fmt file %{dep:add.bop}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to and.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:and.bop}"))) + (run %{bin:bopkit} fmt file %{dep:and.bop}))) (rule (alias fmt) @@ -23,7 +23,7 @@ (rule (with-stdout-to andn.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:andn.bop}"))) + (run %{bin:bopkit} fmt file %{dep:andn.bop}))) (rule (alias fmt) @@ -33,7 +33,7 @@ (rule (with-stdout-to clock_divider.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:clock_divider.bop}"))) + (run %{bin:bopkit} fmt file %{dep:clock_divider.bop}))) (rule (alias fmt) @@ -43,7 +43,7 @@ (rule (with-stdout-to clock_divider2.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:clock_divider2.bop}"))) + (run %{bin:bopkit} fmt file %{dep:clock_divider2.bop}))) (rule (alias fmt) @@ -53,7 +53,7 @@ (rule (with-stdout-to cm2.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:cm2.bop}"))) + (run %{bin:bopkit} fmt file %{dep:cm2.bop}))) (rule (alias fmt) @@ -63,7 +63,7 @@ (rule (with-stdout-to cm4.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:cm4.bop}"))) + (run %{bin:bopkit} fmt file %{dep:cm4.bop}))) (rule (alias fmt) @@ -73,7 +73,7 @@ (rule (with-stdout-to equals.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:equals.bop}"))) + (run %{bin:bopkit} fmt file %{dep:equals.bop}))) (rule (alias fmt) @@ -83,7 +83,7 @@ (rule (with-stdout-to full_adder.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:full_adder.bop}"))) + (run %{bin:bopkit} fmt file %{dep:full_adder.bop}))) (rule (alias fmt) @@ -93,7 +93,7 @@ (rule (with-stdout-to or.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:or.bop}"))) + (run %{bin:bopkit} fmt file %{dep:or.bop}))) (rule (alias fmt) @@ -103,7 +103,7 @@ (rule (with-stdout-to orn.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:orn.bop}"))) + (run %{bin:bopkit} fmt file %{dep:orn.bop}))) (rule (alias fmt) @@ -113,7 +113,7 @@ (rule (with-stdout-to pred.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:pred.bop}"))) + (run %{bin:bopkit} fmt file %{dep:pred.bop}))) (rule (alias fmt) @@ -123,7 +123,7 @@ (rule (with-stdout-to reverse_bdd.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:reverse_bdd.bop}"))) + (run %{bin:bopkit} fmt file %{dep:reverse_bdd.bop}))) (rule (alias fmt) @@ -133,7 +133,7 @@ (rule (with-stdout-to sub.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:sub.bop}"))) + (run %{bin:bopkit} fmt file %{dep:sub.bop}))) (rule (alias fmt) @@ -143,7 +143,7 @@ (rule (with-stdout-to succ.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:succ.bop}"))) + (run %{bin:bopkit} fmt file %{dep:succ.bop}))) (rule (alias fmt) @@ -153,7 +153,7 @@ (rule (with-stdout-to xor.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:xor.bop}"))) + (run %{bin:bopkit} fmt file %{dep:xor.bop}))) (rule (alias fmt) @@ -163,7 +163,7 @@ (rule (with-stdout-to xorn.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:xorn.bop}"))) + (run %{bin:bopkit} fmt file %{dep:xorn.bop}))) (rule (alias fmt) diff --git a/test/bop2c/dune.inc b/test/bop2c/dune.inc index 8cb976b6..70497b92 100644 --- a/test/bop2c/dune.inc +++ b/test/bop2c/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to empty.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:empty.bop}"))) + (run %{bin:bopkit} fmt file %{dep:empty.bop}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to hello_ram.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:hello_ram.bop}"))) + (run %{bin:bopkit} fmt file %{dep:hello_ram.bop}))) (rule (alias fmt) @@ -23,7 +23,7 @@ (rule (with-stdout-to hello_register.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:hello_register.bop}"))) + (run %{bin:bopkit} fmt file %{dep:hello_register.bop}))) (rule (alias fmt) @@ -33,7 +33,7 @@ (rule (with-stdout-to hello_rom.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:hello_rom.bop}"))) + (run %{bin:bopkit} fmt file %{dep:hello_rom.bop}))) (rule (alias fmt) diff --git a/test/netlist/check/dune.inc b/test/netlist/check/dune.inc index 6f8274c8..11ef04f0 100644 --- a/test/netlist/check/dune.inc +++ b/test/netlist/check/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to cyclic-include-a.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:cyclic-include-a.bop}"))) + (run %{bin:bopkit} fmt file %{dep:cyclic-include-a.bop}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to cyclic-include-b.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:cyclic-include-b.bop}"))) + (run %{bin:bopkit} fmt file %{dep:cyclic-include-b.bop}))) (rule (alias fmt) @@ -23,7 +23,7 @@ (rule (with-stdout-to define-order.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:define-order.bop}"))) + (run %{bin:bopkit} fmt file %{dep:define-order.bop}))) (rule (alias fmt) @@ -33,7 +33,7 @@ (rule (with-stdout-to duplicated-block.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:duplicated-block.bop}"))) + (run %{bin:bopkit} fmt file %{dep:duplicated-block.bop}))) (rule (alias fmt) @@ -43,7 +43,7 @@ (rule (with-stdout-to duplicated-parametrized-block.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:duplicated-parametrized-block.bop}"))) + (run %{bin:bopkit} fmt file %{dep:duplicated-parametrized-block.bop}))) (rule (alias fmt) @@ -55,7 +55,7 @@ (rule (with-stdout-to eval-funarg-1.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:eval-funarg-1.bop}"))) + (run %{bin:bopkit} fmt file %{dep:eval-funarg-1.bop}))) (rule (alias fmt) @@ -65,7 +65,7 @@ (rule (with-stdout-to eval-funarg-2.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:eval-funarg-2.bop}"))) + (run %{bin:bopkit} fmt file %{dep:eval-funarg-2.bop}))) (rule (alias fmt) @@ -75,7 +75,7 @@ (rule (with-stdout-to eval-funarg-3.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:eval-funarg-3.bop}"))) + (run %{bin:bopkit} fmt file %{dep:eval-funarg-3.bop}))) (rule (alias fmt) @@ -85,7 +85,7 @@ (rule (with-stdout-to external-nested-arity-specified.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:external-nested-arity-specified.bop}"))) + (run %{bin:bopkit} fmt file %{dep:external-nested-arity-specified.bop}))) (rule (alias fmt) @@ -97,7 +97,7 @@ (rule (with-stdout-to memory-too-short.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:memory-too-short.bop}"))) + (run %{bin:bopkit} fmt file %{dep:memory-too-short.bop}))) (rule (alias fmt) @@ -107,7 +107,7 @@ (rule (with-stdout-to pipe-nested-arity-specified.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:pipe-nested-arity-specified.bop}"))) + (run %{bin:bopkit} fmt file %{dep:pipe-nested-arity-specified.bop}))) (rule (alias fmt) @@ -119,7 +119,7 @@ (rule (with-stdout-to ram-rom.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:ram-rom.bop}"))) + (run %{bin:bopkit} fmt file %{dep:ram-rom.bop}))) (rule (alias fmt) @@ -129,7 +129,7 @@ (rule (with-stdout-to unused-external.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:unused-external.bop}"))) + (run %{bin:bopkit} fmt file %{dep:unused-external.bop}))) (rule (alias fmt) @@ -139,7 +139,7 @@ (rule (with-stdout-to unused-parameter.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:unused-parameter.bop}"))) + (run %{bin:bopkit} fmt file %{dep:unused-parameter.bop}))) (rule (alias fmt) @@ -149,7 +149,7 @@ (rule (with-stdout-to using-any.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:using-any.bop}"))) + (run %{bin:bopkit} fmt file %{dep:using-any.bop}))) (rule (alias fmt) diff --git a/test/netlist/error/dune.inc b/test/netlist/error/dune.inc index 99f6bd4f..1b2bff6a 100644 --- a/test/netlist/error/dune.inc +++ b/test/netlist/error/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to any-block.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:any-block.bop}"))) + (run %{bin:bopkit} fmt file %{dep:any-block.bop}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to any-input.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:any-input.bop}"))) + (run %{bin:bopkit} fmt file %{dep:any-input.bop}))) (rule (alias fmt) @@ -23,7 +23,7 @@ (rule (with-stdout-to any-loop-index.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:any-loop-index.bop}"))) + (run %{bin:bopkit} fmt file %{dep:any-loop-index.bop}))) (rule (alias fmt) @@ -33,7 +33,7 @@ (rule (with-stdout-to any-output.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:any-output.bop}"))) + (run %{bin:bopkit} fmt file %{dep:any-output.bop}))) (rule (alias fmt) @@ -43,7 +43,7 @@ (rule (with-stdout-to any-param.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:any-param.bop}"))) + (run %{bin:bopkit} fmt file %{dep:any-param.bop}))) (rule (alias fmt) @@ -53,7 +53,7 @@ (rule (with-stdout-to any-unused-var.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:any-unused-var.bop}"))) + (run %{bin:bopkit} fmt file %{dep:any-unused-var.bop}))) (rule (alias fmt) @@ -63,7 +63,7 @@ (rule (with-stdout-to any-used-var.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:any-used-var.bop}"))) + (run %{bin:bopkit} fmt file %{dep:any-used-var.bop}))) (rule (alias fmt) @@ -73,7 +73,7 @@ (rule (with-stdout-to arg-fun-int.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:arg-fun-int.bop}"))) + (run %{bin:bopkit} fmt file %{dep:arg-fun-int.bop}))) (rule (alias fmt) @@ -83,7 +83,7 @@ (rule (with-stdout-to block-arity-2.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:block-arity-2.bop}"))) + (run %{bin:bopkit} fmt file %{dep:block-arity-2.bop}))) (rule (alias fmt) @@ -93,7 +93,7 @@ (rule (with-stdout-to block-arity.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:block-arity.bop}"))) + (run %{bin:bopkit} fmt file %{dep:block-arity.bop}))) (rule (alias fmt) @@ -103,7 +103,7 @@ (rule (with-stdout-to conflicting-connection.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:conflicting-connection.bop}"))) + (run %{bin:bopkit} fmt file %{dep:conflicting-connection.bop}))) (rule (alias fmt) @@ -113,7 +113,7 @@ (rule (with-stdout-to conflicting-unused.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:conflicting-unused.bop}"))) + (run %{bin:bopkit} fmt file %{dep:conflicting-unused.bop}))) (rule (alias fmt) @@ -123,7 +123,7 @@ (rule (with-stdout-to cyclic-define.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:cyclic-define.bop}"))) + (run %{bin:bopkit} fmt file %{dep:cyclic-define.bop}))) (rule (alias fmt) @@ -133,7 +133,7 @@ (rule (with-stdout-to duplicated-fun-param.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:duplicated-fun-param.bop}"))) + (run %{bin:bopkit} fmt file %{dep:duplicated-fun-param.bop}))) (rule (alias fmt) @@ -143,7 +143,7 @@ (rule (with-stdout-to duplicated-input.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:duplicated-input.bop}"))) + (run %{bin:bopkit} fmt file %{dep:duplicated-input.bop}))) (rule (alias fmt) @@ -153,7 +153,7 @@ (rule (with-stdout-to duplicated-output.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:duplicated-output.bop}"))) + (run %{bin:bopkit} fmt file %{dep:duplicated-output.bop}))) (rule (alias fmt) @@ -163,7 +163,7 @@ (rule (with-stdout-to duplicated-param.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:duplicated-param.bop}"))) + (run %{bin:bopkit} fmt file %{dep:duplicated-param.bop}))) (rule (alias fmt) @@ -173,7 +173,7 @@ (rule (with-stdout-to duplicated-ram.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:duplicated-ram.bop}"))) + (run %{bin:bopkit} fmt file %{dep:duplicated-ram.bop}))) (rule (alias fmt) @@ -183,7 +183,7 @@ (rule (with-stdout-to duplicated-rom.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:duplicated-rom.bop}"))) + (run %{bin:bopkit} fmt file %{dep:duplicated-rom.bop}))) (rule (alias fmt) @@ -193,7 +193,7 @@ (rule (with-stdout-to duplicated-unused.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:duplicated-unused.bop}"))) + (run %{bin:bopkit} fmt file %{dep:duplicated-unused.bop}))) (rule (alias fmt) @@ -203,7 +203,7 @@ (rule (with-stdout-to external-nested-arity.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:external-nested-arity.bop}"))) + (run %{bin:bopkit} fmt file %{dep:external-nested-arity.bop}))) (rule (alias fmt) @@ -213,7 +213,7 @@ (rule (with-stdout-to freevar-define.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:freevar-define.bop}"))) + (run %{bin:bopkit} fmt file %{dep:freevar-define.bop}))) (rule (alias fmt) @@ -223,7 +223,7 @@ (rule (with-stdout-to freevar-external.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:freevar-external.bop}"))) + (run %{bin:bopkit} fmt file %{dep:freevar-external.bop}))) (rule (alias fmt) @@ -233,7 +233,7 @@ (rule (with-stdout-to freevar-index.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:freevar-index.bop}"))) + (run %{bin:bopkit} fmt file %{dep:freevar-index.bop}))) (rule (alias fmt) @@ -243,7 +243,7 @@ (rule (with-stdout-to freevar-unused.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:freevar-unused.bop}"))) + (run %{bin:bopkit} fmt file %{dep:freevar-unused.bop}))) (rule (alias fmt) @@ -253,7 +253,7 @@ (rule (with-stdout-to fun-param-arity.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:fun-param-arity.bop}"))) + (run %{bin:bopkit} fmt file %{dep:fun-param-arity.bop}))) (rule (alias fmt) @@ -263,7 +263,7 @@ (rule (with-stdout-to input-as-output.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:input-as-output.bop}"))) + (run %{bin:bopkit} fmt file %{dep:input-as-output.bop}))) (rule (alias fmt) @@ -273,7 +273,7 @@ (rule (with-stdout-to invalid-funarg-2.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:invalid-funarg-2.bop}"))) + (run %{bin:bopkit} fmt file %{dep:invalid-funarg-2.bop}))) (rule (alias fmt) @@ -283,7 +283,7 @@ (rule (with-stdout-to invalid-funarg-3.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:invalid-funarg-3.bop}"))) + (run %{bin:bopkit} fmt file %{dep:invalid-funarg-3.bop}))) (rule (alias fmt) @@ -293,7 +293,7 @@ (rule (with-stdout-to invalid-funarg-4.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:invalid-funarg-4.bop}"))) + (run %{bin:bopkit} fmt file %{dep:invalid-funarg-4.bop}))) (rule (alias fmt) @@ -303,7 +303,7 @@ (rule (with-stdout-to invalid-funarg.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:invalid-funarg.bop}"))) + (run %{bin:bopkit} fmt file %{dep:invalid-funarg.bop}))) (rule (alias fmt) @@ -313,7 +313,7 @@ (rule (with-stdout-to invalid-pipe-arity.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:invalid-pipe-arity.bop}"))) + (run %{bin:bopkit} fmt file %{dep:invalid-pipe-arity.bop}))) (rule (alias fmt) @@ -323,7 +323,7 @@ (rule (with-stdout-to memory-file-not-found.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:memory-file-not-found.bop}"))) + (run %{bin:bopkit} fmt file %{dep:memory-file-not-found.bop}))) (rule (alias fmt) @@ -333,7 +333,7 @@ (rule (with-stdout-to memory-too-long.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:memory-too-long.bop}"))) + (run %{bin:bopkit} fmt file %{dep:memory-too-long.bop}))) (rule (alias fmt) @@ -343,7 +343,7 @@ (rule (with-stdout-to nested-block-size.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:nested-block-size.bop}"))) + (run %{bin:bopkit} fmt file %{dep:nested-block-size.bop}))) (rule (alias fmt) @@ -353,7 +353,7 @@ (rule (with-stdout-to nested-output-size.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:nested-output-size.bop}"))) + (run %{bin:bopkit} fmt file %{dep:nested-output-size.bop}))) (rule (alias fmt) @@ -363,7 +363,7 @@ (rule (with-stdout-to only-funparam.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:only-funparam.bop}"))) + (run %{bin:bopkit} fmt file %{dep:only-funparam.bop}))) (rule (alias fmt) @@ -373,7 +373,7 @@ (rule (with-stdout-to only-param.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:only-param.bop}"))) + (run %{bin:bopkit} fmt file %{dep:only-param.bop}))) (rule (alias fmt) @@ -383,7 +383,7 @@ (rule (with-stdout-to output-not-assigned.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:output-not-assigned.bop}"))) + (run %{bin:bopkit} fmt file %{dep:output-not-assigned.bop}))) (rule (alias fmt) @@ -393,7 +393,7 @@ (rule (with-stdout-to param-arity.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:param-arity.bop}"))) + (run %{bin:bopkit} fmt file %{dep:param-arity.bop}))) (rule (alias fmt) @@ -403,7 +403,7 @@ (rule (with-stdout-to pipe-nested-arity.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:pipe-nested-arity.bop}"))) + (run %{bin:bopkit} fmt file %{dep:pipe-nested-arity.bop}))) (rule (alias fmt) @@ -413,7 +413,7 @@ (rule (with-stdout-to primitive-arity-2.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:primitive-arity-2.bop}"))) + (run %{bin:bopkit} fmt file %{dep:primitive-arity-2.bop}))) (rule (alias fmt) @@ -423,7 +423,7 @@ (rule (with-stdout-to primitive-arity.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:primitive-arity.bop}"))) + (run %{bin:bopkit} fmt file %{dep:primitive-arity.bop}))) (rule (alias fmt) @@ -433,7 +433,7 @@ (rule (with-stdout-to ram-arity-2.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:ram-arity-2.bop}"))) + (run %{bin:bopkit} fmt file %{dep:ram-arity-2.bop}))) (rule (alias fmt) @@ -443,7 +443,7 @@ (rule (with-stdout-to ram-arity.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:ram-arity.bop}"))) + (run %{bin:bopkit} fmt file %{dep:ram-arity.bop}))) (rule (alias fmt) @@ -453,7 +453,7 @@ (rule (with-stdout-to redefining-primitive.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:redefining-primitive.bop}"))) + (run %{bin:bopkit} fmt file %{dep:redefining-primitive.bop}))) (rule (alias fmt) @@ -463,7 +463,7 @@ (rule (with-stdout-to rom-arity-2.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:rom-arity-2.bop}"))) + (run %{bin:bopkit} fmt file %{dep:rom-arity-2.bop}))) (rule (alias fmt) @@ -473,7 +473,7 @@ (rule (with-stdout-to rom-arity.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:rom-arity.bop}"))) + (run %{bin:bopkit} fmt file %{dep:rom-arity.bop}))) (rule (alias fmt) @@ -483,7 +483,7 @@ (rule (with-stdout-to type-clash.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:type-clash.bop}"))) + (run %{bin:bopkit} fmt file %{dep:type-clash.bop}))) (rule (alias fmt) @@ -493,7 +493,7 @@ (rule (with-stdout-to unbound-unused.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:unbound-unused.bop}"))) + (run %{bin:bopkit} fmt file %{dep:unbound-unused.bop}))) (rule (alias fmt) @@ -503,7 +503,7 @@ (rule (with-stdout-to unknown-block.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:unknown-block.bop}"))) + (run %{bin:bopkit} fmt file %{dep:unknown-block.bop}))) (rule (alias fmt) @@ -513,7 +513,7 @@ (rule (with-stdout-to unknown-distribution-include.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:unknown-distribution-include.bop}"))) + (run %{bin:bopkit} fmt file %{dep:unknown-distribution-include.bop}))) (rule (alias fmt) @@ -525,7 +525,7 @@ (rule (with-stdout-to unknown-include.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:unknown-include.bop}"))) + (run %{bin:bopkit} fmt file %{dep:unknown-include.bop}))) (rule (alias fmt) @@ -535,7 +535,7 @@ (rule (with-stdout-to unknown-parametrized-block.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:unknown-parametrized-block.bop}"))) + (run %{bin:bopkit} fmt file %{dep:unknown-parametrized-block.bop}))) (rule (alias fmt) @@ -547,7 +547,7 @@ (rule (with-stdout-to unused-block.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:unused-block.bop}"))) + (run %{bin:bopkit} fmt file %{dep:unused-block.bop}))) (rule (alias fmt) @@ -557,7 +557,7 @@ (rule (with-stdout-to unused-bus.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:unused-bus.bop}"))) + (run %{bin:bopkit} fmt file %{dep:unused-bus.bop}))) (rule (alias fmt) @@ -567,7 +567,7 @@ (rule (with-stdout-to unused-fun-param.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:unused-fun-param.bop}"))) + (run %{bin:bopkit} fmt file %{dep:unused-fun-param.bop}))) (rule (alias fmt) @@ -577,7 +577,7 @@ (rule (with-stdout-to unused-param.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:unused-param.bop}"))) + (run %{bin:bopkit} fmt file %{dep:unused-param.bop}))) (rule (alias fmt) @@ -587,7 +587,7 @@ (rule (with-stdout-to unused-signal.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:unused-signal.bop}"))) + (run %{bin:bopkit} fmt file %{dep:unused-signal.bop}))) (rule (alias fmt) @@ -597,7 +597,7 @@ (rule (with-stdout-to used-unused.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:used-unused.bop}"))) + (run %{bin:bopkit} fmt file %{dep:used-unused.bop}))) (rule (alias fmt) @@ -607,7 +607,7 @@ (rule (with-stdout-to used-var-not-assigned.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:used-var-not-assigned.bop}"))) + (run %{bin:bopkit} fmt file %{dep:used-var-not-assigned.bop}))) (rule (alias fmt) @@ -617,7 +617,7 @@ (rule (with-stdout-to write-input.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:write-input.bop}"))) + (run %{bin:bopkit} fmt file %{dep:write-input.bop}))) (rule (alias fmt) diff --git a/test/netlist/runtime/dune.inc b/test/netlist/runtime/dune.inc index 3dd77cdb..d3c0bf9e 100644 --- a/test/netlist/runtime/dune.inc +++ b/test/netlist/runtime/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to counter-input.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:counter-input.bop}"))) + (run %{bin:bopkit} fmt file %{dep:counter-input.bop}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to empty-input.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:empty-input.bop}"))) + (run %{bin:bopkit} fmt file %{dep:empty-input.bop}))) (rule (alias fmt) @@ -23,7 +23,7 @@ (rule (with-stdout-to empty-output.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:empty-output.bop}"))) + (run %{bin:bopkit} fmt file %{dep:empty-output.bop}))) (rule (alias fmt) @@ -33,7 +33,7 @@ (rule (with-stdout-to main-override.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:main-override.bop}"))) + (run %{bin:bopkit} fmt file %{dep:main-override.bop}))) (rule (alias fmt) @@ -43,7 +43,7 @@ (rule (with-stdout-to parameter-override.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:parameter-override.bop}"))) + (run %{bin:bopkit} fmt file %{dep:parameter-override.bop}))) (rule (alias fmt) @@ -53,7 +53,7 @@ (rule (with-stdout-to using-empty-output.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:using-empty-output.bop}"))) + (run %{bin:bopkit} fmt file %{dep:using-empty-output.bop}))) (rule (alias fmt) diff --git a/test/process/error/dune.inc b/test/process/error/dune.inc index dc53f9bc..ca9ba6f5 100644 --- a/test/process/error/dune.inc +++ b/test/process/error/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to arity-error.bpp.pp.output - (bash "%{bin:bopkit} process fmt file %{dep:arity-error.bpp}"))) + (run %{bin:bopkit} process fmt file %{dep:arity-error.bpp}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to unassigned-output.bpp.pp.output - (bash "%{bin:bopkit} process fmt file %{dep:unassigned-output.bpp}"))) + (run %{bin:bopkit} process fmt file %{dep:unassigned-output.bpp}))) (rule (alias fmt) @@ -23,7 +23,7 @@ (rule (with-stdout-to unassigned-var.bpp.pp.output - (bash "%{bin:bopkit} process fmt file %{dep:unassigned-var.bpp}"))) + (run %{bin:bopkit} process fmt file %{dep:unassigned-var.bpp}))) (rule (alias fmt) @@ -33,7 +33,7 @@ (rule (with-stdout-to undefined-operator.bpp.pp.output - (bash "%{bin:bopkit} process fmt file %{dep:undefined-operator.bpp}"))) + (run %{bin:bopkit} process fmt file %{dep:undefined-operator.bpp}))) (rule (alias fmt) diff --git a/test/process/runtime/dune.inc b/test/process/runtime/dune.inc index 091926e4..77ac6f5d 100644 --- a/test/process/runtime/dune.inc +++ b/test/process/runtime/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to runtime-error.bpp.pp.output - (bash "%{bin:bopkit} process fmt file %{dep:runtime-error.bpp}"))) + (run %{bin:bopkit} process fmt file %{dep:runtime-error.bpp}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to sp1.bpp.pp.output - (bash "%{bin:bopkit} process fmt file %{dep:sp1.bpp}"))) + (run %{bin:bopkit} process fmt file %{dep:sp1.bpp}))) (rule (alias fmt) @@ -23,7 +23,7 @@ (rule (with-stdout-to sp2.bpp.pp.output - (bash "%{bin:bopkit} process fmt file %{dep:sp2.bpp}"))) + (run %{bin:bopkit} process fmt file %{dep:sp2.bpp}))) (rule (alias fmt) @@ -33,7 +33,7 @@ (rule (with-stdout-to sp3.bpp.pp.output - (bash "%{bin:bopkit} process fmt file %{dep:sp3.bpp}"))) + (run %{bin:bopkit} process fmt file %{dep:sp3.bpp}))) (rule (alias fmt) diff --git a/tutorial/bdd/division/dune.inc b/tutorial/bdd/division/dune.inc index f3d458f1..c158eac1 100644 --- a/tutorial/bdd/division/dune.inc +++ b/tutorial/bdd/division/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to div_check.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:div_check.bop}"))) + (run %{bin:bopkit} fmt file %{dep:div_check.bop}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to generate.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:generate.bop}"))) + (run %{bin:bopkit} fmt file %{dep:generate.bop}))) (rule (alias fmt) diff --git a/tutorial/functional-args/dune.inc b/tutorial/functional-args/dune.inc index b620d13c..83f2ae16 100644 --- a/tutorial/functional-args/dune.inc +++ b/tutorial/functional-args/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to argsfcts.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:argsfcts.bop}"))) + (run %{bin:bopkit} fmt file %{dep:argsfcts.bop}))) (rule (alias fmt) diff --git a/tutorial/hello-world/dune.inc b/tutorial/hello-world/dune.inc index 4f1ed4aa..6215d18a 100644 --- a/tutorial/hello-world/dune.inc +++ b/tutorial/hello-world/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to hello-stdlib.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:hello-stdlib.bop}"))) + (run %{bin:bopkit} fmt file %{dep:hello-stdlib.bop}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to hello.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:hello.bop}"))) + (run %{bin:bopkit} fmt file %{dep:hello.bop}))) (rule (alias fmt) diff --git a/tutorial/misc/dune.inc b/tutorial/misc/dune.inc index 8a4f0e07..29acea79 100644 --- a/tutorial/misc/dune.inc +++ b/tutorial/misc/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to cycle.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:cycle.bop}"))) + (run %{bin:bopkit} fmt file %{dep:cycle.bop}))) (rule (alias fmt) @@ -13,7 +13,7 @@ (rule (with-stdout-to iii.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:iii.bop}"))) + (run %{bin:bopkit} fmt file %{dep:iii.bop}))) (rule (alias fmt) diff --git a/tutorial/parametrized-blocks/dune.inc b/tutorial/parametrized-blocks/dune.inc index 5120d9b4..9c7cfe62 100644 --- a/tutorial/parametrized-blocks/dune.inc +++ b/tutorial/parametrized-blocks/dune.inc @@ -3,7 +3,7 @@ (rule (with-stdout-to example.bop.pp.output - (bash "%{bin:bopkit} fmt file %{dep:example.bop}"))) + (run %{bin:bopkit} fmt file %{dep:example.bop}))) (rule (alias fmt)