CatalaLang/catala
1
1
Fork 0
mirror of https://github.com/CatalaLang/catala.git synced 2024-11-08 07:51:43 +03:00
Code Issues Projects Releases Wiki Activity

Clerk: replace colordiff with diff --color

Browse Source 
This should be available mostly everywhere now (first appeared in e.g. Ubuntu
18) and avoids the need for an additional run-time dependency.
This commit is contained in:
Louis Gesbert 2023-08-02 12:19:38 +02:00
parent f35825a9c1
commit ab365b25b3
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_system/clerk_driver.ml
View File

@ -338,7 +338,7 @@ let pipe_diff_cmd =
Var.tested_file; Var.tested_file;
Lit "/dev/stdin"; Lit "/dev/stdin";
] ]
else Seq [Lit "| colordiff -u -b"; Var.tested_file; Lit "-"] else Seq [Lit "| diff -u -b --color"; Var.tested_file; Lit "-"]
let inline_test_rule catala_exe catala_opts = let inline_test_rule catala_exe catala_opts =
let open Nj.Expr in let open Nj.Expr in

5
clerk.opam
View File

@ -19,6 +19,7 @@ depends: [
"catala" {= version} "catala" {= version}
"ninja_utils" {= version} "ninja_utils" {= version}
"odoc" {with-doc} "odoc" {with-doc}
"conf-diffutils" {cataladevmode}
] ]
build: [ build: [
["dune" "subst"] {dev} ["dune" "subst"] {dev}
@ -38,8 +39,4 @@ dev-repo: "git+https://github.com/CatalaLang/catala.git"
depexts: [ depexts: [
["ninja-build"] {os-family = "debian"} ["ninja-build"] {os-family = "debian"}
["samurai"] {os-distribution = "alpine"} ["samurai"] {os-distribution = "alpine"}
["colordiff"] {cataladevmode &
(os-distribution = "alpine" |
os-family = "arch" |
os-family = "debian")}
] ]