Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mbarbin/bopkit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.3.2
Choose a base ref
...
head repository: mbarbin/bopkit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Nov 10, 2024

  1. Require fpath-base upgrade

    mbarbin committed Nov 10, 2024
    Copy the full SHA
    6cec7db View commit details
  2. Update dependencies bounds

    mbarbin committed Nov 10, 2024
    Copy the full SHA
    1ebb25e View commit details
  3. Dedup CI jobs on PRs (+ fmt)

    mbarbin committed Nov 10, 2024
    Copy the full SHA
    aec0844 View commit details
  4. Fix odoc warning

    mbarbin committed Nov 10, 2024
    Copy the full SHA
    084b7c8 View commit details
  5. Copy the full SHA
    4c12ffb View commit details
  6. pp-log.err and .cli renames

    mbarbin committed Nov 10, 2024
    Copy the full SHA
    722287e View commit details
  7. Copy the full SHA
    c6facae View commit details
  8. Require pp-log 0.0.7

    mbarbin committed Nov 10, 2024
    Copy the full SHA
    2160269 View commit details
  9. Prepare release

    mbarbin committed Nov 10, 2024
    Copy the full SHA
    24af6df View commit details
  10. Merge pull request #19 from mbarbin/pp-log

    Upgrade to pp-log
    mbarbin authored Nov 10, 2024
    Copy the full SHA
    fb6ec39 View commit details

Commits on Dec 2, 2024

  1. Update deps

    mbarbin committed Dec 2, 2024
    Copy the full SHA
    a665276 View commit details
  2. Copy the full SHA
    93d153f View commit details
  3. Copy the full SHA
    80a787a View commit details

Commits on Dec 3, 2024

  1. Copy the full SHA
    7d5414b View commit details

Commits on Dec 16, 2024

  1. Copy the full SHA
    aad2f52 View commit details
  2. Copy the full SHA
    c9443bf View commit details
  3. Require pp.2.0.0

    mbarbin committed Dec 16, 2024
    Copy the full SHA
    01c0afe View commit details
  4. Add missing dependency

    mbarbin committed Dec 16, 2024
    Copy the full SHA
    8f451ee View commit details
  5. Merge pull request #20 from mbarbin/add-implicit-transitive-deps

    Add implicit transitive deps
    mbarbin authored Dec 16, 2024
    Copy the full SHA
    63e6104 View commit details
  6. Require dune.3.17

    mbarbin committed Dec 16, 2024
    Copy the full SHA
    2adf6b0 View commit details
  7. Copy the full SHA
    c4b19ee View commit details

Commits on Dec 28, 2024

  1. Reduce dependencies

    mbarbin committed Dec 28, 2024
    Copy the full SHA
    bd87891 View commit details
  2. Merge pull request #21 from mbarbin/reduce-deps

    Reduce dependencies
    mbarbin authored Dec 28, 2024
    Copy the full SHA
    248d765 View commit details
  3. Copy the full SHA
    5031dbf View commit details
  4. Revert "Construct pipe-stdout got broken at some point"

    This reverts commit 5031dbf.
    mbarbin committed Dec 28, 2024
    Copy the full SHA
    91e30b2 View commit details
  5. Replace by bash actions

    mbarbin committed Dec 28, 2024
    Copy the full SHA
    5b27842 View commit details
  6. Merge pull request #22 from mbarbin/interactive-pipe-stdout

    Fix Interactive Test Commands (`pipe-stdout`)
    mbarbin authored Dec 28, 2024
    Copy the full SHA
    a267132 View commit details

Commits on Jan 10, 2025

  1. Lint

    mbarbin committed Jan 10, 2025
    Copy the full SHA
    60be28b View commit details
  2. Copy the full SHA
    9766884 View commit details
  3. Copy the full SHA
    2797105 View commit details
  4. Copy the full SHA
    e71dba8 View commit details
  5. Use OCaml 5.3 in the main CI

    mbarbin committed Jan 10, 2025
    Copy the full SHA
    c37420d View commit details
  6. Copy the full SHA
    e0f4b60 View commit details
  7. Copy the full SHA
    1d168f9 View commit details
  8. Copy the full SHA
    f549f1b View commit details
  9. Copy the full SHA
    e880688 View commit details
  10. Fix cyclic dep (typo)

    mbarbin committed Jan 10, 2025
    Copy the full SHA
    7dae86c View commit details
  11. Copy the full SHA
    2908a5e View commit details

Commits on Jan 13, 2025

  1. Relax tsdl constraint

    mbarbin committed Jan 13, 2025
    Copy the full SHA
    89f3403 View commit details

Commits on Feb 4, 2025

  1. Fix missing dep

    mbarbin committed Feb 4, 2025
    Copy the full SHA
    8bbe55f View commit details
  2. Copy the full SHA
    8e71b84 View commit details

Commits on Feb 17, 2025

  1. Copy the full SHA
    1730b7d View commit details
  2. Merge pull request #23 from mbarbin/less-deps

    Simplify dependencies in this gen-dune
    mbarbin authored Feb 17, 2025
    Copy the full SHA
    ecfeaac View commit details

Commits on Feb 20, 2025

  1. Remove stale dependencies

    mbarbin committed Feb 20, 2025
    Copy the full SHA
    271d3e5 View commit details

Commits on Feb 21, 2025

  1. Sync with test file (mdx)

    mbarbin committed Feb 21, 2025
    Copy the full SHA
    0d2bf57 View commit details

Commits on Feb 23, 2025

  1. Prepare renaming command libs

    mbarbin committed Feb 23, 2025
    Copy the full SHA
    7b12924 View commit details
  2. Rename _command to _cli

    mbarbin committed Feb 23, 2025
    Copy the full SHA
    2cc4642 View commit details
  3. Fix stale names

    mbarbin committed Feb 23, 2025
    Copy the full SHA
    e21010a View commit details
  4. Merge pull request #24 from mbarbin/cli-rename

    Internal lib rename (command -> cli)
    mbarbin authored Feb 23, 2025
    Copy the full SHA
    5e37592 View commit details
Showing with 1,203 additions and 828 deletions.
  1. +9 −5 .github/workflows/ci.yml
  2. +66 −0 .github/workflows/more-ci.yml
  3. +3 −1 .ocamlformat
  4. +14 −0 CHANGES.md
  5. +1 −1 bin/dune
  6. +1 −3 bin/main.ml
  7. +75 −0 bopkit-dev.opam
  8. +15 −17 bopkit-tests.opam
  9. +14 −16 bopkit.opam
  10. +1 −1 doc/dune
  11. +2 −2 doc/reference/dune
  12. +182 −76 dune-project
  13. +1 −1 editor/README.md
  14. +1 −1 editor/dune
  15. +6 −6 lib/bit_utils/src/bit_counter.ml
  16. +17 −5 lib/bit_utils/test/dune
  17. +8 −8 lib/bit_utils/test/test__bit_array.ml
  18. +1 −1 lib/bit_utils/test/test__bit_counter.ml
  19. +28 −17 lib/bit_utils/test/test__bit_matrix.ml
  20. +7 −3 lib/bit_utils/test/test__bit_string_encoding.ml
  21. +13 −6 lib/bit_utils/test/test__partial_bit.ml
  22. +35 −11 lib/bit_utils/test/test__partial_bit_array.ml
  23. +16 −11 lib/bit_utils/test/test__partial_bit_matrix.ml
  24. +25 −22 lib/bopkit/src/arithmetic_expression.ml
  25. +2 −2 lib/bopkit/src/comment.ml
  26. +2 −2 lib/bopkit/src/dune
  27. +8 −6 lib/bopkit/src/string_with_vars.ml
  28. +18 −9 lib/bopkit/test/test__comment.ml
  29. +6 −3 lib/bopkit/test/test__interval.ml
  30. +28 −14 lib/bopkit/test/test__string_with_vars.ml
  31. 0 lib/{bopkit_bdd_command/src/bopkit_bdd_command.ml → bopkit_bdd_cli/src/bopkit_bdd_cli.ml}
  32. 0 lib/{bopkit_bdd_command/src/bopkit_bdd_command.mli → bopkit_bdd_cli/src/bopkit_bdd_cli.mli}
  33. 0 lib/{bopkit_bdd_command → bopkit_bdd_cli}/src/cmd_bomber.ml
  34. 0 lib/{bopkit_bdd_command → bopkit_bdd_cli}/src/cmd_bomber.mli
  35. 0 lib/{bopkit_bdd_command → bopkit_bdd_cli}/src/cmd_checker.ml
  36. 0 lib/{bopkit_bdd_command → bopkit_bdd_cli}/src/cmd_checker.mli
  37. 0 lib/{bopkit_bdd_command → bopkit_bdd_cli}/src/cmd_synthesize.ml
  38. 0 lib/{bopkit_bdd_command → bopkit_bdd_cli}/src/cmd_synthesize.mli
  39. +2 −4 lib/{bopkit_bdd_command → bopkit_bdd_cli}/src/dune
  40. +3 −3 {project/subleq/lib/subleq_command → lib/bopkit_bdd_cli}/test/dune
  41. +31 −26 lib/bopkit_block/src/bopkit_block.ml
  42. +3 −2 lib/bopkit_block/src/dune
  43. +2 −2 lib/bopkit_circuit/src/cds.ml
  44. +4 −4 lib/bopkit_circuit/src/circuit.ml
  45. +4 −2 lib/bopkit_circuit/src/dune
  46. +5 −5 lib/bopkit_circuit/src/gate_kind.mli
  47. +2 −2 lib/{bopkit_command/src/bopkit_command.ml → bopkit_cli/src/bopkit_cli.ml}
  48. 0 lib/{bopkit_command/src/bopkit_command.mli → bopkit_cli/src/bopkit_cli.mli}
  49. +1 −1 lib/{bopkit_command → bopkit_cli}/src/cmd_bop2c.ml
  50. 0 lib/{bopkit_command → bopkit_cli}/src/cmd_bop2c.mli
  51. +1 −1 lib/{bopkit_command → bopkit_cli}/src/cmd_check.ml
  52. 0 lib/{bopkit_command → bopkit_cli}/src/cmd_check.mli
  53. 0 lib/{bopkit_command → bopkit_cli}/src/cmd_echo.ml
  54. 0 lib/{bopkit_command → bopkit_cli}/src/cmd_echo.mli
  55. +1 −1 lib/{bopkit_command → bopkit_cli}/src/cmd_simu.ml
  56. 0 lib/{bopkit_command → bopkit_cli}/src/cmd_simu.mli
  57. +9 −7 lib/{bopkit_command → bopkit_cli}/src/dune
  58. +3 −3 {project/visa/lib/visa_command → lib/bopkit_cli}/test/dune
  59. +2 −3 lib/bopkit_compiler/src/dune
  60. +18 −17 lib/bopkit_compiler/src/pass_expanded_block.ml
  61. +35 −35 lib/bopkit_compiler/src/pass_expanded_netlist.ml
  62. +5 −5 lib/bopkit_compiler/src/pass_expanded_nodes.ml
  63. +0 −2 lib/bopkit_compiler/src/pass_includes.ml
  64. +10 −10 lib/bopkit_compiler/src/pass_memories.ml
  65. +2 −2 lib/bopkit_memory/src/bopkit_memory.mli
  66. +1 −1 lib/bopkit_memory/src/dune
  67. +1 −1 lib/bopkit_pp/src/dune
  68. +8 −8 lib/bopkit_pp/src/expanded_netlist.ml
  69. +39 −32 lib/bopkit_pp/src/netlist.ml
  70. +1 −1 ...kit_process_command/src/bopkit_process_command.ml → bopkit_process_cli/src/bopkit_process_cli.ml}
  71. 0 ...t_process_command/src/bopkit_process_command.mli → bopkit_process_cli/src/bopkit_process_cli.mli}
  72. +6 −5 lib/{bopkit_process_command → bopkit_process_cli}/src/dune
  73. +3 −3 lib/{bopkit_bdd_command → bopkit_process_cli}/test/dune
  74. +0 −19 lib/bopkit_process_command/test/dune
  75. +6 −8 lib/bopkit_process_interpreter/src/bopkit_process_interpreter.ml
  76. +2 −1 lib/bopkit_process_interpreter/src/dune
  77. +3 −5 lib/bopkit_process_interpreter/src/interpreted_code.ml
  78. +5 −7 lib/bopkit_process_interpreter/src/operator.ml
  79. +1 −1 lib/bopkit_process_pp/src/program.ml
  80. +2 −2 lib/bopkit_simulator/src/bopkit_simulator.ml
  81. +19 −23 lib/bopkit_simulator/src/circuit_simulator.ml
  82. +7 −6 lib/bopkit_simulator/src/dune
  83. +8 −13 lib/bopkit_sleeper/src/bopkit_sleeper.ml
  84. +2 −2 lib/bopkit_sleeper/src/dune
  85. +1 −1 lib/bopkit_syntax/src/dune
  86. +3 −4 lib/bopkit_to_c/src/bopkit_to_c.ml
  87. +4 −2 lib/bopkit_to_c/src/dune
  88. +4 −4 lib/bopkit_topological_sort/src/bopkit_topological_sort.ml
  89. +3 −2 lib/bopkit_topological_sort/test/dune
  90. +5 −4 project/digital-watch/dune
  91. +1 −1 project/subleq/bin/dune
  92. +1 −3 project/subleq/bin/main.ml
  93. +8 −5 project/subleq/circuit/disk_interface.ml
  94. +9 −5 project/subleq/circuit/dune
  95. +8 −5 project/subleq/circuit/subleq_ram.ml
  96. +1 −1 project/subleq/dune
  97. +2 −2 project/subleq/lib/{subleq_command → subleq_cli}/src/dune
  98. 0 project/subleq/lib/{subleq_command/src/subleq_command.ml → subleq_cli/src/subleq_cli.ml}
  99. 0 project/subleq/lib/{subleq_command/src/subleq_command.mli → subleq_cli/src/subleq_cli.mli}
  100. +3 −3 {lib/bopkit_command → project/subleq/lib/subleq_cli}/test/dune
  101. +1 −1 project/visa/bin/dune
  102. +1 −1 project/visa/bin/main.ml
  103. +11 −12 project/visa/circuit/dune
  104. +3 −3 project/visa/doc/assembler.md
  105. +1 −1 project/visa/doc/dune
  106. +1 −1 project/visa/lib/visa/src/dune
  107. +2 −2 project/visa/lib/visa/src/executable.ml
  108. +4 −4 project/visa/lib/visa/src/executable.mli
  109. +4 −4 project/visa/lib/visa/test/test__machine_code.ml
  110. +1 −1 project/visa/lib/visa_assembler/src/dune
  111. +21 −22 project/visa/lib/visa_assembler/src/visa_assembler.ml
  112. +6 −4 project/visa/lib/{visa_command → visa_cli}/src/dune
  113. +5 −5 project/visa/lib/{visa_command/src/visa_command.ml → visa_cli/src/visa_cli.ml}
  114. 0 project/visa/lib/{visa_command/src/visa_command.mli → visa_cli/src/visa_cli.mli}
  115. +19 −0 project/visa/lib/visa_cli/test/dune
  116. +1 −1 project/visa/lib/visa_dsl/src/dune
  117. +2 −2 project/visa/lib/visa_dsl/src/visa_dsl.ml
  118. +2 −1 project/visa/lib/visa_dsl/test/dune
  119. +5 −6 project/visa/lib/visa_dsl/test/test__visa_dsl.ml
  120. +1 −3 project/visa/lib/visa_simulator/src/code.ml
  121. +6 −5 project/visa/lib/visa_simulator/src/dune
  122. +4 −8 project/visa/lib/visa_simulator/src/memory.ml
  123. +2 −10 project/visa/lib/visa_simulator/src/memory.mli
  124. +26 −25 project/visa/lib/visa_simulator/src/visa_simulator.ml
  125. +3 −1 project/visa/test/runtime/dune
  126. +11 −14 stdlib/7-segment/bin/dune
  127. +1 −1 stdlib/7-segment/dune
  128. +3 −3 stdlib/7-segment/src/cmd_digital_calendar_gen_input.ml
  129. +3 −3 stdlib/7-segment/src/cmd_digital_calendar_gen_raw_input.ml
  130. +1 −3 stdlib/7-segment/src/cmd_digital_calendar_map_raw_input.ml
  131. +3 −6 stdlib/7-segment/src/cmd_digital_watch_gen_input.ml
  132. +1 −11 stdlib/7-segment/src/dune
  133. +3 −1 stdlib/7-segment/src/seven_segment_code.ml
  134. +1 −1 stdlib/7-segment/src/seven_segment_display.ml
  135. +5 −1 stdlib/7-segment/test/dune
  136. +4 −4 stdlib/7-segment/test/test__digital_calendar.ml
  137. +4 −4 stdlib/7-segment/test/test__digital_watch.ml
  138. +1 −1 stdlib/bopboard/bin/dune
  139. +1 −1 stdlib/bopboard/example/dune
  140. +14 −7 stdlib/bopboard/src/bopboard.ml
  141. +1 −2 stdlib/bopboard/src/dune
  142. +1 −1 stdlib/counter/dune
  143. +11 −1 stdlib/counter/src/dune
  144. +8 −5 stdlib/memories/bin/dune
  145. +8 −5 stdlib/memories/bin/ram_memory.ml
  146. +1 −1 stdlib/pulse/bin/dune
  147. +1 −1 stdlib/pulse/dune
  148. +1 −1 stdlib/pulse/src/dune
  149. +1 −1 stdlib/stdlib/dune
  150. +12 −14 subleq.opam
  151. +7 −11 test/bop2c/gen-dune/dune
  152. +16 −11 test/bop2c/gen-dune/main.ml
  153. +17 −6 tutorial/bdd/division/dune
  154. +1 −1 tutorial/bdd/dune
  155. +1 −1 tutorial/hello-world/dune
  156. +1 −1 tutorial/misc/dune
  157. +12 −14 visa.opam
14 changes: 9 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
name: ci

on:
- pull_request
- push
push:
branches:
- main
pull_request:
branches:
- "**" # This will match pull requests targeting any branch

jobs:
build:
@@ -12,7 +16,7 @@ jobs:
os:
- ubuntu-latest
ocaml-compiler:
- 5.2.x
- 5.3.x

runs-on: ${{ matrix.os }}

@@ -33,8 +37,8 @@ jobs:
opam-repositories: |
default: https://github.com/ocaml/opam-repository.git
mbarbin: https://github.com/mbarbin/opam-repository.git
# janestreet-bleeding: https://github.com/janestreet/opam-repository.git
# janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
# janestreet-bleeding: https://github.com/janestreet/opam-repository.git
# janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages

- name: Install dependencies
run: opam install . --deps-only --with-doc --with-test --with-dev-setup
66 changes: 66 additions & 0 deletions .github/workflows/more-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# This workflow file is named 'more-ci' and is used to run additional CI checks
# that complement the main CI workflow. It ensures that our code is tested
# across multiple operating systems and OCaml compiler versions.
#
# Compared to the main 'ci.yml' job, this skips some steps that are not
# necessary to check for every combination of os and ocaml-compiler, such as
# generating coverage report, linting odoc, opam and fmt, etc.
#
# We prefer to keep it separate from the main CI workflow because we find it
# more readable, over having too many conditional steps in the same job.

name: more-ci

on:
push:
branches:
- main
pull_request:
branches:
- "**" # This will match pull requests targeting any branch

jobs:
build:
strategy:
fail-fast: false
matrix:
os:
- ubuntu-latest
ocaml-compiler:
- 5.3.x
- 5.2.x
exclude:
# We exclude the combination already tested in the 'ci' workflow.
- os: ubuntu-latest
ocaml-compiler: 5.3.x

runs-on: ${{ matrix.os }}

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install sdl2 dependencies
run: |
sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
sudo apt-get update -y -qq
sudo apt-get install libsdl2-dev libsdl2-image-dev
- name: Setup OCaml
uses: ocaml/setup-ocaml@v3
with:
ocaml-compiler: ${{ matrix.ocaml-compiler }}
opam-repositories: |
default: https://github.com/ocaml/opam-repository.git
mbarbin: https://github.com/mbarbin/opam-repository.git
# janestreet-bleeding: https://github.com/janestreet/opam-repository.git
# janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages

# We build and run tests for a subset of packages. More tests are run in
# the development workflow and as part of the main CI job. These are the
# tests that are checked for every combination of os and ocaml-compiler.
- name: Install dependencies
run: opam install ./bopkit.opam ./bopkit-tests.opam --deps-only --with-test

- name: Build & Run tests
run: opam exec -- dune build @all @runtest -p bopkit,bopkit-tests
4 changes: 3 additions & 1 deletion .ocamlformat
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
version=0.26.2
version=0.27.0
ocaml-version=5.2
profile=janestreet
parse-docstrings=true
14 changes: 14 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
## 0.3.3 (unreleased)

### Added

### Changed

### Deprecated

### Fixed

- Replace `pipe-stdout` constructs by `bash` when they are expected to be interactive (#22, @mbarbin).

### Removed

## 0.3.2 (2024-09-29)

### Changed
2 changes: 1 addition & 1 deletion bin/dune
Original file line number Diff line number Diff line change
@@ -2,5 +2,5 @@
(name main)
(package bopkit)
(public_name bopkit)
(libraries bopkit_command cmdlang-cmdliner-runner)
(libraries bopkit_cli cmdlang-cmdliner-runner)
(flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a))
4 changes: 1 addition & 3 deletions bin/main.ml
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
let () =
Cmdlang_cmdliner_runner.run Bopkit_command.main ~name:"bopkit" ~version:"%%VERSION%%"
;;
let () = Cmdlang_cmdliner_runner.run Bopkit_cli.main ~name:"bopkit" ~version:"%%VERSION%%"
75 changes: 75 additions & 0 deletions bopkit-dev.opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
synopsis:
"Package to regroup dev targets for the bopkit project, documentation, and more"
maintainer: ["Mathieu Barbin <opensource@mbarbin.org>"]
authors: ["Mathieu Barbin"]
license: "MIT"
homepage: "https://github.com/mbarbin/bopkit"
doc: "https://mbarbin.github.io/bopkit/"
bug-reports: "https://github.com/mbarbin/bopkit/issues"
depends: [
"dune" {>= "3.17"}
"ocaml" {>= "5.2"}
"ocamlformat" {with-dev-setup & = "0.27.0"}
"ANSITerminal" {>= "0.8.3"}
"appendable-list" {>= "v0.17" & < "v0.18"}
"auto-format" {>= "0.0.14"}
"base" {>= "v0.17" & < "v0.18"}
"base_quickcheck" {>= "v0.17" & < "v0.18"}
"bopkit" {= version}
"bopkit-tests" {= version}
"cmdlang" {>= "0.0.9"}
"cmdlang-cmdliner-runner" {>= "0.0.8"}
"cmdlang-to-cmdliner" {>= "0.0.9"}
"cmdliner" {>= "1.3.0"}
"comments-parser" {>= "0.2.2"}
"core" {>= "v0.17" & < "v0.18"}
"dune-site" {>= "3.17"}
"expect_test_helpers_core" {>= "v0.17" & < "v0.18"}
"fpath" {>= "0.7.3"}
"fpath-base" {>= "0.2.2"}
"graphics" {>= "5.1.2"}
"loc" {>= "0.2.0"}
"mdx" {>= "2.4"}
"menhir" {>= "20220210"}
"parsing-utils" {>= "0.2.2"}
"pp" {>= "2.0.0"}
"pp-extended" {>= "0.0.2"}
"pp-log" {>= "0.0.8"}
"ppx_compare" {>= "v0.17" & < "v0.18"}
"ppx_enumerate" {>= "v0.17" & < "v0.18"}
"ppx_expect" {>= "v0.17" & < "v0.18"}
"ppx_fields_conv" {>= "v0.17" & < "v0.18"}
"ppx_hash" {>= "v0.17" & < "v0.18"}
"ppx_here" {>= "v0.17" & < "v0.18"}
"ppx_js_style" {with-dev-setup & >= "v0.17" & < "v0.18"}
"ppx_let" {>= "v0.17" & < "v0.18"}
"ppx_sexp_conv" {>= "v0.17" & < "v0.18"}
"ppx_sexp_value" {>= "v0.17" & < "v0.18"}
"ppxlib" {>= "0.33"}
"stdio" {>= "v0.17" & < "v0.18"}
"stdune" {>= "3.17"}
"subleq" {= version}
"tsdl" {>= "1.0.0"}
"tsdl-image" {>= "0.6"}
"visa" {= version}
"odoc" {with-doc}
]
build: [
["dune" "subst"] {dev}
[
"dune"
"build"
"-p"
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
dev-repo: "git+https://github.com/mbarbin/bopkit.git"
32 changes: 15 additions & 17 deletions bopkit-tests.opam
Original file line number Diff line number Diff line change
@@ -8,35 +8,33 @@ homepage: "https://github.com/mbarbin/bopkit"
doc: "https://mbarbin.github.io/bopkit/"
bug-reports: "https://github.com/mbarbin/bopkit/issues"
depends: [
"dune" {>= "3.16"}
"dune" {>= "3.17"}
"ocaml" {>= "5.2"}
"ocamlformat" {with-dev-setup & = "0.26.2"}
"ocamlformat" {with-dev-setup & = "0.27.0"}
"ANSITerminal" {>= "0.8.3"}
"appendable-list" {>= "v0.17" & < "v0.18"}
"auto-format" {>= "0.0.13"}
"auto-format" {>= "0.0.14"}
"base" {>= "v0.17" & < "v0.18"}
"base_quickcheck" {>= "v0.17" & < "v0.18"}
"bopkit" {= version}
"cmdlang" {>= "0.0.5"}
"cmdlang-cmdliner-runner" {>= "0.0.5"}
"cmdlang-to-cmdliner" {>= "0.0.5"}
"cmdliner" {= "1.3.0"}
"comments-parser" {>= "0.2.1"}
"cmdlang" {>= "0.0.9"}
"cmdlang-cmdliner-runner" {>= "0.0.8"}
"cmdlang-to-cmdliner" {>= "0.0.9"}
"cmdliner" {>= "1.3.0"}
"comments-parser" {>= "0.2.2"}
"core" {>= "v0.17" & < "v0.18"}
"core_unix" {>= "v0.17" & < "v0.18"}
"dune-site" {>= "3.16"}
"err" {>= "0.0.5"}
"err-cli" {>= "0.0.5"}
"dune-site" {>= "3.17"}
"expect_test_helpers_core" {>= "v0.17" & < "v0.18"}
"fpath" {>= "0.7.3"}
"fpath-base" {>= "0.2.0"}
"fpath-base" {>= "0.2.2"}
"graphics" {>= "5.1.2"}
"loc" {>= "0.2.0"}
"mdx" {>= "2.4"}
"menhir" {>= "20220210"}
"parsing-utils" {>= "0.2.1"}
"pp" {>= "1.2.0"}
"parsing-utils" {>= "0.2.2"}
"pp" {>= "2.0.0"}
"pp-extended" {>= "0.0.2"}
"pp-log" {>= "0.0.8"}
"ppx_compare" {>= "v0.17" & < "v0.18"}
"ppx_enumerate" {>= "v0.17" & < "v0.18"}
"ppx_expect" {>= "v0.17" & < "v0.18"}
@@ -49,9 +47,9 @@ depends: [
"ppx_sexp_value" {>= "v0.17" & < "v0.18"}
"ppxlib" {>= "0.33"}
"stdio" {>= "v0.17" & < "v0.18"}
"stdune" {>= "3.16"}
"stdune" {>= "3.17"}
"subleq" {= version}
"tsdl" {= "1.0.0"}
"tsdl" {>= "1.0.0"}
"tsdl-image" {>= "0.6"}
"visa" {= version}
"odoc" {with-doc}
30 changes: 14 additions & 16 deletions bopkit.opam
Original file line number Diff line number Diff line change
@@ -8,32 +8,30 @@ homepage: "https://github.com/mbarbin/bopkit"
doc: "https://mbarbin.github.io/bopkit/"
bug-reports: "https://github.com/mbarbin/bopkit/issues"
depends: [
"dune" {>= "3.16"}
"dune" {>= "3.17"}
"ocaml" {>= "5.2"}
"ANSITerminal" {>= "0.8.3"}
"appendable-list" {>= "v0.17" & < "v0.18"}
"auto-format" {>= "0.0.13"}
"auto-format" {>= "0.0.14"}
"base" {>= "v0.17" & < "v0.18"}
"base_quickcheck" {>= "v0.17" & < "v0.18"}
"cmdlang" {>= "0.0.5"}
"cmdlang-cmdliner-runner" {>= "0.0.5"}
"cmdlang-to-cmdliner" {>= "0.0.5"}
"cmdliner" {= "1.3.0"}
"comments-parser" {>= "0.2.1"}
"cmdlang" {>= "0.0.9"}
"cmdlang-cmdliner-runner" {>= "0.0.8"}
"cmdlang-to-cmdliner" {>= "0.0.9"}
"cmdliner" {>= "1.3.0"}
"comments-parser" {>= "0.2.2"}
"core" {>= "v0.17" & < "v0.18"}
"core_unix" {>= "v0.17" & < "v0.18"}
"dune-site" {>= "3.16"}
"err" {>= "0.0.5"}
"err-cli" {>= "0.0.5"}
"dune-site" {>= "3.17"}
"fpath" {>= "0.7.3"}
"fpath-base" {>= "0.2.0"}
"fpath-base" {>= "0.2.2"}
"graphics" {>= "5.1.2"}
"loc" {>= "0.2.0"}
"mdx" {>= "2.4"}
"menhir" {>= "20220210"}
"parsing-utils" {>= "0.2.1"}
"pp" {>= "1.2.0"}
"parsing-utils" {>= "0.2.2"}
"pp" {>= "2.0.0"}
"pp-extended" {>= "0.0.2"}
"pp-log" {>= "0.0.8"}
"ppx_compare" {>= "v0.17" & < "v0.18"}
"ppx_enumerate" {>= "v0.17" & < "v0.18"}
"ppx_fields_conv" {>= "v0.17" & < "v0.18"}
@@ -44,8 +42,8 @@ depends: [
"ppx_sexp_value" {>= "v0.17" & < "v0.18"}
"ppxlib" {>= "0.33"}
"stdio" {>= "v0.17" & < "v0.18"}
"stdune" {>= "3.16"}
"tsdl" {= "1.0.0"}
"stdune" {>= "3.17"}
"tsdl" {>= "1.0.0"}
"tsdl-image" {>= "0.6"}
"odoc" {with-doc}
]
2 changes: 1 addition & 1 deletion doc/dune
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
(mdx
(package bopkit-tests))
(package bopkit-dev))
4 changes: 2 additions & 2 deletions doc/reference/dune
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(mdx
(package bopkit-tests)
(package bopkit-dev)
(deps
(package bopkit)
(glob_files *.bop)))
@@ -20,7 +20,7 @@
(run dune format-dune-file)))))

(cram
(package bopkit-tests)
(package bopkit-dev)
(deps
(package bopkit)
%{bin:bopkit}
Loading