Skip to content

Commit 5765646

Browse files
mbarbinmbarbin
authored
Merge pull request #87 from mbarbin/pplumbing-pkgs
Switch to pplumbing split pkgs
2 parents a07d584 + 6276404 commit 5765646

File tree

10 files changed

+52
-16
lines changed

10 files changed

+52
-16
lines changed

‎bin/dune‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
(public_name crs)
44
(package crs)
55
(flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a)
6-
(libraries crs_cli pplumbing.cmdlang-cmdliner-runner)
6+
(libraries cmdlang-cmdliner-err-runner crs_cli)
77
(instrumentation
88
(backend bisect_ppx)))

‎bin/main.ml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
(* <http://www.gnu.org/licenses/> and <https://spdx.org>, respectively. *)
2020
(********************************************************************************)
2121

22-
let () = Cmdlang_cmdliner_runner.run Crs_cli.main ~name:"crs" ~version:"%%VERSION%%"
22+
let () = Cmdlang_cmdliner_err_runner.run Crs_cli.main ~name:"crs" ~version:"%%VERSION%%"

‎crs-dev.opam‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ depends: [
1616
"base_quickcheck" {>= "v0.17"}
1717
"bisect_ppx" {>= "2.8.3"}
1818
"cmdlang" {>= "0.0.9"}
19+
"cmdlang-cmdliner-err-runner" {>= "0.0.16"}
1920
"conf-git"
2021
"conf-hg"
2122
"crs" {= version}
@@ -32,7 +33,8 @@ depends: [
3233
"pbrt" {>= "3.1"}
3334
"pbrt_yojson" {>= "3.1"}
3435
"pp" {>= "2.0.0"}
35-
"pplumbing" {>= "0.0.14"}
36+
"pplumbing-err" {>= "0.0.16"}
37+
"pplumbing-pp-tty" {>= "0.0.16"}
3638
"ppx_compare" {>= "v0.17"}
3739
"ppx_deriving_yojson" {>= "3.9"}
3840
"ppx_enumerate" {>= "v0.17"}

‎crs-tests.opam‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ depends: [
1414
"base" {>= "v0.17"}
1515
"base_quickcheck" {>= "v0.17"}
1616
"cmdlang" {>= "0.0.9"}
17+
"cmdlang-cmdliner-err-runner" {>= "0.0.16"}
1718
"cmdlang-stdlib-runner" {>= "0.0.9"}
1819
"conf-git"
1920
"conf-hg"
@@ -29,7 +30,8 @@ depends: [
2930
"pbrt" {>= "3.1"}
3031
"pbrt_yojson" {>= "3.1"}
3132
"pp" {>= "2.0.0"}
32-
"pplumbing" {>= "0.0.14"}
33+
"pplumbing-err" {>= "0.0.16"}
34+
"pplumbing-pp-tty" {>= "0.0.16"}
3335
"ppx_compare" {>= "v0.17"}
3436
"ppx_deriving_yojson" {>= "3.9"}
3537
"ppx_enumerate" {>= "v0.17"}

‎crs.opam‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ depends: [
1212
"ocaml" {>= "5.2"}
1313
"base" {>= "v0.17"}
1414
"cmdlang" {>= "0.0.9"}
15+
"cmdlang-cmdliner-err-runner" {>= "0.0.16"}
1516
"file-rewriter" {>= "0.0.3"}
1617
"fpath" {>= "0.7.3"}
1718
"fpath-base" {>= "0.3.1"}
1819
"loc" {>= "0.2.2"}
1920
"pageantty" {>= "0.0.2"}
2021
"pp" {>= "2.0.0"}
21-
"pplumbing" {>= "0.0.14"}
22+
"pplumbing-err" {>= "0.0.16"}
23+
"pplumbing-pp-tty" {>= "0.0.16"}
2224
"ppx_compare" {>= "v0.17"}
2325
"ppx_deriving_yojson" {>= "3.9"}
2426
"ppx_enumerate" {>= "v0.17"}

‎dune-project‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
(>= v0.17))
3131
(cmdlang
3232
(>= 0.0.9))
33+
(cmdlang-cmdliner-err-runner
34+
(>= 0.0.16))
3335
(file-rewriter
3436
(>= 0.0.3))
3537
(fpath
@@ -42,8 +44,10 @@
4244
(>= 0.0.2))
4345
(pp
4446
(>= 2.0.0))
45-
(pplumbing
46-
(>= 0.0.14))
47+
(pplumbing-err
48+
(>= 0.0.16))
49+
(pplumbing-pp-tty
50+
(>= 0.0.16))
4751
(ppx_compare
4852
(>= v0.17))
4953
(ppx_deriving_yojson
@@ -95,6 +99,8 @@
9599
(>= v0.17))
96100
(cmdlang
97101
(>= 0.0.9))
102+
(cmdlang-cmdliner-err-runner
103+
(>= 0.0.16))
98104
(cmdlang-stdlib-runner
99105
(>= 0.0.9))
100106
conf-git
@@ -123,8 +129,10 @@
123129
(>= 3.1))
124130
(pp
125131
(>= 2.0.0))
126-
(pplumbing
127-
(>= 0.0.14))
132+
(pplumbing-err
133+
(>= 0.0.16))
134+
(pplumbing-pp-tty
135+
(>= 0.0.16))
128136
(ppx_compare
129137
(>= v0.17))
130138
(ppx_deriving_yojson
@@ -196,6 +204,8 @@
196204
(>= 2.8.3))
197205
(cmdlang
198206
(>= 0.0.9))
207+
(cmdlang-cmdliner-err-runner
208+
(>= 0.0.16))
199209
conf-git
200210
conf-hg
201211
(crs
@@ -226,8 +236,10 @@
226236
(>= 3.1))
227237
(pp
228238
(>= 2.0.0))
229-
(pplumbing
230-
(>= 0.0.14))
239+
(pplumbing-err
240+
(>= 0.0.16))
241+
(pplumbing-pp-tty
242+
(>= 0.0.16))
231243
(ppx_compare
232244
(>= v0.17))
233245
(ppx_deriving_yojson

‎dune-workspace‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
(lang dune 3.17)
2+
3+
(lock_dir
4+
(repositories overlay upstream mbarbin))
5+
6+
(repository
7+
(name mbarbin)
8+
(url "git+https://github.com/mbarbin/opam-repository.git"))

‎lib/crs_cli/src/dune‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
-open
1313
Fpath_base
1414
-open
15+
Pplumbing_pp_tty
16+
-open
17+
Pplumbing_err
18+
-open
1519
Stdio
1620
-open
1721
Volgo_base
@@ -28,8 +32,8 @@
2832
loc
2933
pageantty.git-pager
3034
pp
31-
pplumbing.err
32-
pplumbing.pp-tty
35+
pplumbing-err
36+
pplumbing-pp-tty
3337
ppx_deriving_yojson.runtime
3438
print-table
3539
reviewdog

‎lib/crs_cli/test/dune‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
-open
1313
Fpath_base
1414
-open
15+
Pplumbing_err
16+
-open
1517
Expect_test_helpers_base
1618
-open
1719
Volgo
@@ -28,7 +30,7 @@
2830
fpath
2931
fpath-base
3032
loc
31-
pplumbing.err
33+
pplumbing-err
3234
print-table
3335
printbox
3436
printbox-md

‎lib/crs_parser/src/dune‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
-open
1111
Base
1212
-open
13+
Pplumbing_pp_tty
14+
-open
15+
Pplumbing_err
16+
-open
1317
Fpath_base
1418
-open
1519
Stdio
@@ -22,8 +26,8 @@
2226
fpath-base
2327
loc
2428
pp
25-
pplumbing.err
26-
pplumbing.pp-tty
29+
pplumbing-err
30+
pplumbing-pp-tty
2731
re
2832
spawn
2933
stdio

0 commit comments

Comments
 (0)