Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve dune rules #8

Merged
merged 9 commits into from
Apr 5, 2024
+457 −511
Merged

Improve dune rules #8

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
af46f2d
Update .gitignore
mbarbin Mar 31, 2024
6d42706
Git ignoring dune-workspace
mbarbin Mar 31, 2024
d641b01
Use dune's (mode promote) in a few places
mbarbin Apr 2, 2024
898f47c
Name build target
mbarbin Apr 2, 2024
f26f0d2
Run (mode promote) rules in runtest
mbarbin Apr 2, 2024
11ec0e7
Use dune's (mode promote) pattern for generated dune.inc files
mbarbin Apr 2, 2024
f96ebf2
Update .gitignore
mbarbin Apr 4, 2024
e665814
Replace [bash] by dune's built-in [run] in rules
mbarbin Apr 4, 2024
8042c79
Upgrade auto-format to 0.0.7 (run instead of bash in rules)
mbarbin Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use dune's (mode promote) pattern for generated dune.inc files
@mbarbin
mbarbin committed Apr 4, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit 11ec0e7fdb0892b6ae9ec406c8edd320b30bc6be
9 changes: 3 additions & 6 deletions doc/reference/dune
View file
Original file line number Diff line number Diff line change
@@ -6,21 +6,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(cram
(deps
(package bopkit)
9 changes: 3 additions & 6 deletions project/digital-watch/dune
View file
Original file line number Diff line number Diff line change
@@ -66,21 +66,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(cram
(deps
(package bopkit)
9 changes: 3 additions & 6 deletions project/subleq/circuit/dune
View file
Original file line number Diff line number Diff line change
@@ -43,17 +43,14 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))
18 changes: 6 additions & 12 deletions project/visa/circuit/dune
View file
Original file line number Diff line number Diff line change
@@ -3,9 +3,11 @@
(include dune.bop.inc)

(rule
(target dune.asm.inc.gen)
(target dune.asm.inc)
(deps
(glob_files *.asm))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
@@ -14,9 +16,11 @@
(run dune format-dune-file)))))

(rule
(target dune.bop.inc.gen)
(target dune.bop.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
@@ -25,16 +29,6 @@
"%{bin:bopkit} fmt gen-dune --exclude div10.bop -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.asm.inc dune.asm.inc.gen)))

(rule
(alias runtest)
(action
(diff dune.bop.inc dune.bop.inc.gen)))

(rule
(with-stdout-to
calendar.sexp.corrected
9 changes: 3 additions & 6 deletions project/visa/test/assembler/error/dune
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.asm))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:visa} fmt gen-dune -- \%{bin:visa} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(cram
(deps
(package bopkit)
9 changes: 3 additions & 6 deletions project/visa/test/runtime/dune
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.asm))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:visa} fmt gen-dune -- \%{bin:visa} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(rule
(copy ../../circuit/visa.bop visa.bop))

9 changes: 3 additions & 6 deletions stdlib/7-segment/dune
View file
Original file line number Diff line number Diff line change
@@ -7,21 +7,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(cram
(deps
(package bopkit)
9 changes: 3 additions & 6 deletions stdlib/bopboard/dune
View file
Original file line number Diff line number Diff line change
@@ -7,17 +7,14 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))
9 changes: 3 additions & 6 deletions stdlib/bopboard/example/dune
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(cram
(deps
(package bopkit)
9 changes: 3 additions & 6 deletions stdlib/counter/dune
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(mdx
(deps
(package bopkit)
9 changes: 3 additions & 6 deletions stdlib/counter/test/dune
View file
Original file line number Diff line number Diff line change
@@ -6,17 +6,14 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))
9 changes: 3 additions & 6 deletions stdlib/pulse/dune
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(install
(section
(site
9 changes: 3 additions & 6 deletions stdlib/pulse/test/dune
View file
Original file line number Diff line number Diff line change
@@ -6,17 +6,14 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))
9 changes: 3 additions & 6 deletions stdlib/stdlib/dune
View file
Original file line number Diff line number Diff line change
@@ -7,21 +7,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(cram
(deps
(package bopkit)
9 changes: 3 additions & 6 deletions stdlib/stdlib/test/dune
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(cram
(deps
(package bopkit)
18 changes: 6 additions & 12 deletions test/bop2c/dune
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,37 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(rule
(copy gen-dune/main.exe gen-dune.exe))

(include dune-bop2c.inc)

(rule
(target dune-bop2c.inc.gen)
(target dune-bop2c.inc)
(deps
gen-dune.exe
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "./gen-dune.exe")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune-bop2c.inc dune-bop2c.inc.gen)))

(cram
(deps
(package bopkit)
9 changes: 3 additions & 6 deletions test/netlist/check/dune
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(cram
(deps
(package bopkit)
9 changes: 3 additions & 6 deletions test/netlist/error/dune
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(cram
(deps
(package bopkit)
9 changes: 3 additions & 6 deletions test/netlist/runtime/dune
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(cram
(deps
(package bopkit)
9 changes: 3 additions & 6 deletions test/process/error/dune
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bpp))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
@@ -12,11 +14,6 @@
"%{bin:bopkit} process fmt gen-dune -- \%{bin:bopkit} process fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(cram
(deps
(package bopkit)
9 changes: 3 additions & 6 deletions test/process/runtime/dune
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bpp))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
@@ -12,11 +14,6 @@
"%{bin:bopkit} process fmt gen-dune -- \%{bin:bopkit} process fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(cram
(deps
(package bopkit)
9 changes: 3 additions & 6 deletions tutorial/bdd/division/dune
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
@@ -12,11 +14,6 @@
"%{bin:bopkit} fmt gen-dune --exclude div.bop,div_opt.bop -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(executables
(names div div_opt)
(flags -w +a-4-40-41-42-44-66 -warn-error +a -open Core)
9 changes: 3 additions & 6 deletions tutorial/functional-args/dune
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(cram
(deps
(package bopkit)
9 changes: 3 additions & 6 deletions tutorial/hello-world/dune
View file
Original file line number Diff line number Diff line change
@@ -6,21 +6,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(mdx
(deps
(package bopkit)
9 changes: 3 additions & 6 deletions tutorial/misc/dune
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(cram
(deps
(glob_files *.bop)
9 changes: 3 additions & 6 deletions tutorial/parametrized-blocks/dune
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
(include dune.inc)

(rule
(target dune.inc.gen)
(target dune.inc)
(deps
(glob_files *.bop))
(alias runtest)
(mode promote)
(action
(with-stdout-to
%{target}
(pipe-stdout
(bash "%{bin:bopkit} fmt gen-dune -- \%{bin:bopkit} fmt file")
(run dune format-dune-file)))))

(rule
(alias runtest)
(action
(diff dune.inc dune.inc.gen)))

(cram
(deps
(package bopkit)