diff --git a/ivette/Makefile b/ivette/Makefile index 3c7ad47409a38f3a611fccb0d717644f644afb3f..2a169d38b7cce699b634979ac2a15ac5009a6c45 100644 --- a/ivette/Makefile +++ b/ivette/Makefile @@ -44,16 +44,14 @@ lint: dome-pkg dome-templ checkdirs yarn run typecheck yarn run lint -checkdirs: headers/checkdir +checkdirs: @echo "[Ivette] check imported filenames" - @headers/checkdirs.sh - -headers/checkdir: headers/checkdir.ml - @echo "[Ivette] headers/checkdir" - @ocamlopt -o $@ $< - -clean:: - @rm -f headers/*.cm* headers/*.o headers/checkdir + @err=0 ; for f in `find src | sed -E 's/(.ts|.tsx|.js|.jsx|.css|.json)$$//' | sort -f | uniq -di` ;\ + do \ + err=1; \ + echo " - ambiguous $$f.*"; \ + done ;\ + exit $$err tsc: dome-pkg dome-templ @echo "[Ivette] running typechecker & linter (with cache & fix mode)" diff --git a/ivette/headers/checkdir b/ivette/headers/checkdir deleted file mode 100755 index 843336b7b3f4232d6d61a834f0b0a8a500d39564..0000000000000000000000000000000000000000 Binary files a/ivette/headers/checkdir and /dev/null differ diff --git a/ivette/headers/checkdir.ml b/ivette/headers/checkdir.ml deleted file mode 100644 index 9d241f67a4f3fa1f2d0806a2c516ed17fa01c519..0000000000000000000000000000000000000000 --- a/ivette/headers/checkdir.ml +++ /dev/null @@ -1,35 +0,0 @@ -(* -------------------------------------------------------------------------- *) -(* --- Check Filename CASE sensitivity --- *) -(* -------------------------------------------------------------------------- *) - -let loadable = [".ts";".tsx";".js";".jsx";".css";".json"] - -let basename f = - let rec lookup f = function - | [] -> None - | suffix::others -> - match Filename.chop_suffix_opt ~suffix f with - | None -> lookup f others - | Some basename -> Some (String.lowercase_ascii basename) - in lookup f loadable - -let () = - let dir = Sys.argv.(1) in - let hmap : (string,string) Hashtbl.t = Hashtbl.create 32 in - Sys.readdir dir |> Array.iter - begin fun f -> - match basename f with - | None -> () - | Some base -> - try - let f0 = Hashtbl.find hmap base in - Format.printf "Ambiguous import '%s/%s':@\n" dir base ; - Format.printf " - '%s'@\n" f0 ; - Format.printf " - '%s'@\n" f ; - exit 1 ; - with Not_found -> - Hashtbl.add hmap base f - end ; - exit 0 - -(* -------------------------------------------------------------------------- *) diff --git a/ivette/headers/checkdirs.sh b/ivette/headers/checkdirs.sh deleted file mode 100755 index 610cc9e9b9c1784436c999af20dcb00c7690ef4c..0000000000000000000000000000000000000000 --- a/ivette/headers/checkdirs.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -e - -for d in `find src -type d` -do - headers/checkdir $d -done