Skip to content

Commit fc28ddb

Browse files
mbarbinmbarbin
authored
Merge pull request #101 from mbarbin/pplumbing-pkgs
Use pplumbing sub pkgs directly
2 parents 6b3091b + b399adf commit fc28ddb

File tree

33 files changed

+158
-62
lines changed

33 files changed

+158
-62
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 volgo-vcs)
44
(package volgo-vcs)
55
(flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a)
6-
(libraries pplumbing.cmdlang-cmdliner-runner volgo-vcs.volgo-vcs-cli)
6+
(libraries cmdlang-cmdliner-err-runner volgo-vcs.volgo-vcs-cli)
77
(instrumentation
88
(backend bisect_ppx)))

‎bin/main.ml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,8 @@
2020
(*******************************************************************************)
2121

2222
let () =
23-
Cmdlang_cmdliner_runner.run Volgo_vcs_cli.main ~name:"volgo-vcs" ~version:"%%VERSION%%"
23+
Cmdlang_cmdliner_err_runner.run
24+
Volgo_vcs_cli.main
25+
~name:"volgo-vcs"
26+
~version:"%%VERSION%%"
2427
;;

‎dune-project‎

Lines changed: 54 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@
4545
(>= 0.3.1))
4646
(pp
4747
(>= 2.0.0))
48-
(pplumbing
49-
(>= 0.0.14))
48+
(pplumbing-err
49+
(>= 0.0.16))
50+
(pplumbing-pp-tty
51+
(>= 0.0.16))
5052
(sexplib0
5153
(>= v0.16))))
5254

@@ -64,8 +66,10 @@
6466
(>= 0.3.1))
6567
(pp
6668
(>= 2.0.0))
67-
(pplumbing
68-
(>= 0.0.14))
69+
(pplumbing-err
70+
(>= 0.0.16))
71+
(pplumbing-pp-tty
72+
(>= 0.0.16))
6973
(ppx_compare
7074
(>= v0.17))
7175
(ppx_enumerate
@@ -94,6 +98,8 @@
9498
(>= 4.14))
9599
(cmdlang
96100
(>= 0.0.9))
101+
(cmdlang-cmdliner-err-runner
102+
(>= 0.0.16))
97103
(conf-git :with-test)
98104
(conf-hg :with-test)
99105
(fpath
@@ -102,8 +108,10 @@
102108
(>= 0.3.1))
103109
(pp
104110
(>= 2.0.0))
105-
(pplumbing
106-
(>= 0.0.14))
111+
(pplumbing-err
112+
(>= 0.0.16))
113+
(pplumbing-pp-tty
114+
(>= 0.0.16))
107115
(sexplib0
108116
(>= v0.16))
109117
(volgo
@@ -131,8 +139,10 @@
131139
(>= 0.3.1))
132140
(pp
133141
(>= 2.0.0))
134-
(pplumbing
135-
(>= 0.0.14))
142+
(pplumbing-err
143+
(>= 0.0.16))
144+
(pplumbing-pp-tty
145+
(>= 0.0.16))
136146
(sexplib0
137147
(>= v0.16))
138148
(volgo
@@ -152,8 +162,10 @@
152162
(>= 0.3.1))
153163
(pp
154164
(>= 2.0.0))
155-
(pplumbing
156-
(>= 0.0.14))
165+
(pplumbing-err
166+
(>= 0.0.16))
167+
(pplumbing-pp-tty
168+
(>= 0.0.16))
157169
(sexplib0
158170
(>= v0.16))
159171
(volgo
@@ -175,8 +187,10 @@
175187
(>= 0.3.1))
176188
(pp
177189
(>= 2.0.0))
178-
(pplumbing
179-
(>= 0.0.14))
190+
(pplumbing-err
191+
(>= 0.0.16))
192+
(pplumbing-pp-tty
193+
(>= 0.0.16))
180194
(sexplib0
181195
(>= v0.17))
182196
(volgo
@@ -200,8 +214,10 @@
200214
(>= 0.3.1))
201215
(pp
202216
(>= 2.0.0))
203-
(pplumbing
204-
(>= 0.0.14))
217+
(pplumbing-err
218+
(>= 0.0.16))
219+
(pplumbing-pp-tty
220+
(>= 0.0.16))
205221
(sexplib0
206222
(>= v0.17))
207223
(volgo
@@ -225,8 +241,10 @@
225241
(>= 0.3.1))
226242
(pp
227243
(>= 2.0.0))
228-
(pplumbing
229-
(>= 0.0.14))
244+
(pplumbing-err
245+
(>= 0.0.16))
246+
(pplumbing-pp-tty
247+
(>= 0.0.16))
230248
(sexplib0
231249
(>= v0.16))
232250
(spawn
@@ -250,8 +268,10 @@
250268
(>= 0.3.1))
251269
(pp
252270
(>= 2.0.0))
253-
(pplumbing
254-
(>= 0.0.14))
271+
(pplumbing-err
272+
(>= 0.0.16))
273+
(pplumbing-pp-tty
274+
(>= 0.0.16))
255275
(sexplib0
256276
(>= v0.16))
257277
(volgo
@@ -277,8 +297,10 @@
277297
(>= 0.3.1))
278298
(pp
279299
(>= 2.0.0))
280-
(pplumbing
281-
(>= 0.0.14))
300+
(pplumbing-err
301+
(>= 0.0.16))
302+
(pplumbing-pp-tty
303+
(>= 0.0.16))
282304
(ppx_compare
283305
(>= v0.17))
284306
(ppx_enumerate
@@ -324,6 +346,8 @@
324346
(>= 2.1))
325347
(cmdlang
326348
(>= 0.0.9))
349+
(cmdlang-cmdliner-err-runner
350+
(>= 0.0.16))
327351
conf-git
328352
conf-hg
329353
(core
@@ -346,8 +370,10 @@
346370
(>= 2.4)))
347371
(pp
348372
(>= 2.0.0))
349-
(pplumbing
350-
(>= 0.0.14))
373+
(pplumbing-err
374+
(>= 0.0.16))
375+
(pplumbing-pp-tty
376+
(>= 0.0.16))
351377
(ppx_compare
352378
(>= v0.17))
353379
(ppx_enumerate
@@ -433,6 +459,8 @@
433459
(>= 2.1))
434460
(cmdlang
435461
(>= 0.0.9))
462+
(cmdlang-cmdliner-err-runner
463+
(>= 0.0.16))
436464
conf-git
437465
conf-hg
438466
(core
@@ -453,8 +481,10 @@
453481
(>= 2.4))
454482
(pp
455483
(>= 2.0.0))
456-
(pplumbing
457-
(>= 0.0.14))
484+
(pplumbing-err
485+
(>= 0.0.16))
486+
(pplumbing-pp-tty
487+
(>= 0.0.16))
458488
(ppx_compare
459489
(>= v0.17))
460490
(ppx_enumerate

‎example/dune‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
-open
1414
Fpath_sexp0
1515
-open
16+
Pplumbing_err
17+
-open
1618
Expect_test_helpers_base
1719
-open
1820
Volgo_base)
@@ -24,7 +26,7 @@
2426
fpath
2527
fpath-sexp0
2628
pp
27-
pplumbing.err
29+
pplumbing-err
2830
unix
2931
vcs_test_helpers
3032
volgo_base

‎lib/vcs_test_helpers/test/dune‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
-open
1414
Fpath_sexp0
1515
-open
16+
Pplumbing_err
17+
-open
1618
Expect_test_helpers_base
1719
-open
1820
Volgo)
@@ -24,7 +26,7 @@
2426
fpath
2527
fpath-sexp0
2628
pp
27-
pplumbing.err
29+
pplumbing-err
2830
vcs_test_helpers
2931
volgo
3032
volgo_git_eio)

‎lib/volgo/src/dune‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
-open
1111
Fpath_sexp0
1212
-open
13+
Pplumbing_pp_tty
14+
-open
15+
Pplumbing_err
16+
-open
1317
Sexplib0
1418
-open
1519
Sexplib0.Sexp_conv)
@@ -19,8 +23,8 @@
1923
fpath
2024
fpath-sexp0
2125
pp
22-
pplumbing.err
23-
pplumbing.pp-tty
26+
pplumbing-err
27+
pplumbing-pp-tty
2428
sexplib0)
2529
(modules
2630
(:standard \ stdlib_compat4xx stdlib_compat5xx))

‎lib/volgo/test/dune‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
-open
1919
Fpath_sexp0
2020
-open
21+
Pplumbing_err
22+
-open
2123
Expect_test_helpers_base
2224
-open
2325
Volgo)
@@ -30,7 +32,7 @@
3032
fpath
3133
fpath-sexp0
3234
pp
33-
pplumbing.err
35+
pplumbing-err
3436
volgo
3537
volgo_base
3638
volgo_git_backend)

‎lib/volgo_base/src/dune‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
-open
1313
Fpath_base
1414
-open
15+
Pplumbing_err
16+
-open
1517
Volgo)
16-
(libraries base fpath fpath-base pp pplumbing.err volgo)
18+
(libraries base fpath fpath-base pp pplumbing-err volgo)
1719
(instrumentation
1820
(backend bisect_ppx))
1921
(lint

‎lib/volgo_base/test/dune‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
-open
1717
Base
1818
-open
19+
Pplumbing_err
20+
-open
1921
Fpath_sexp0
2022
-open
2123
Expect_test_helpers_base
@@ -29,7 +31,7 @@
2931
fpath
3032
fpath-sexp0
3133
pp
32-
pplumbing.err
34+
pplumbing-err
3335
volgo
3436
volgo_base
3537
volgo_git_backend)

‎lib/volgo_git_backend/src/dune‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
-open
1111
Fpath_sexp0
1212
-open
13+
Pplumbing_pp_tty
14+
-open
15+
Pplumbing_err
16+
-open
1317
Sexplib0
1418
-open
1519
Sexplib0.Sexp_conv
@@ -20,8 +24,8 @@
2024
fpath
2125
fpath-sexp0
2226
pp
23-
pplumbing.err
24-
pplumbing.pp-tty
27+
pplumbing-err
28+
pplumbing-pp-tty
2529
sexplib0
2630
volgo)
2731
(instrumentation

0 commit comments

Comments
 (0)