More deterministic generation of jbuild.inc

mirage · Aug 14, 2018 · 2146ad2 · 2146ad2
1 parent 0069662
commit 2146ad2
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 35 deletions.
diff --git a/src/generate/generate.ml b/src/generate/generate.ml
@@ -32,7 +32,7 @@ let () =
       | _ -> error ()
     with _ -> error () in
 
-  let files = Array.to_list (Sys.readdir database) in
+  let files = List.sort String.compare (Array.to_list (Sys.readdir database)) in
   let out = open_out output |> Format.formatter_of_out_channel in
 
   List.map (make_rule database) files |> List.iter (Fmt.(pf out) "%s\n\n%!")

diff --git a/src/jbuild.inc b/src/jbuild.inc
@@ -1,30 +1,46 @@
-(rule ((targets (ISO_8859_2.ml))
-       (deps (maps/8859-2.TXT))
-       (action (run ${exe:../gen/generate.exe} maps/8859-2.TXT ISO_8859_2.ml))))
-
-(rule ((targets (ISO_8859_16.ml))
-       (deps (maps/8859-16.TXT))
-       (action (run ${exe:../gen/generate.exe} maps/8859-16.TXT ISO_8859_16.ml))))
-
-(rule ((targets (ISO_8859_9.ml))
-       (deps (maps/8859-9.TXT))
-       (action (run ${exe:../gen/generate.exe} maps/8859-9.TXT ISO_8859_9.ml))))
-
 (rule ((targets (ISO_8859_1.ml))
        (deps (maps/8859-1.TXT))
        (action (run ${exe:../gen/generate.exe} maps/8859-1.TXT ISO_8859_1.ml))))
 
+(rule ((targets (ISO_8859_10.ml))
+       (deps (maps/8859-10.TXT))
+       (action (run ${exe:../gen/generate.exe} maps/8859-10.TXT ISO_8859_10.ml))))
+
 (rule ((targets (ISO_8859_11.ml))
        (deps (maps/8859-11.TXT))
        (action (run ${exe:../gen/generate.exe} maps/8859-11.TXT ISO_8859_11.ml))))
 
+(rule ((targets (ISO_8859_13.ml))
+       (deps (maps/8859-13.TXT))
+       (action (run ${exe:../gen/generate.exe} maps/8859-13.TXT ISO_8859_13.ml))))
+
+(rule ((targets (ISO_8859_14.ml))
+       (deps (maps/8859-14.TXT))
+       (action (run ${exe:../gen/generate.exe} maps/8859-14.TXT ISO_8859_14.ml))))
+
+(rule ((targets (ISO_8859_15.ml))
+       (deps (maps/8859-15.TXT))
+       (action (run ${exe:../gen/generate.exe} maps/8859-15.TXT ISO_8859_15.ml))))
+
+(rule ((targets (ISO_8859_16.ml))
+       (deps (maps/8859-16.TXT))
+       (action (run ${exe:../gen/generate.exe} maps/8859-16.TXT ISO_8859_16.ml))))
+
+(rule ((targets (ISO_8859_2.ml))
+       (deps (maps/8859-2.TXT))
+       (action (run ${exe:../gen/generate.exe} maps/8859-2.TXT ISO_8859_2.ml))))
+
 (rule ((targets (ISO_8859_3.ml))
        (deps (maps/8859-3.TXT))
        (action (run ${exe:../gen/generate.exe} maps/8859-3.TXT ISO_8859_3.ml))))
 
-(rule ((targets (ISO_8859_10.ml))
-       (deps (maps/8859-10.TXT))
-       (action (run ${exe:../gen/generate.exe} maps/8859-10.TXT ISO_8859_10.ml))))
+(rule ((targets (ISO_8859_4.ml))
+       (deps (maps/8859-4.TXT))
+       (action (run ${exe:../gen/generate.exe} maps/8859-4.TXT ISO_8859_4.ml))))
+
+(rule ((targets (ISO_8859_5.ml))
+       (deps (maps/8859-5.TXT))
+       (action (run ${exe:../gen/generate.exe} maps/8859-5.TXT ISO_8859_5.ml))))
 
 (rule ((targets (ISO_8859_6.ml))
        (deps (maps/8859-6.TXT))
@@ -34,27 +50,11 @@
        (deps (maps/8859-7.TXT))
        (action (run ${exe:../gen/generate.exe} maps/8859-7.TXT ISO_8859_7.ml))))
 
-(rule ((targets (ISO_8859_5.ml))
-       (deps (maps/8859-5.TXT))
-       (action (run ${exe:../gen/generate.exe} maps/8859-5.TXT ISO_8859_5.ml))))
-
-(rule ((targets (ISO_8859_13.ml))
-       (deps (maps/8859-13.TXT))
-       (action (run ${exe:../gen/generate.exe} maps/8859-13.TXT ISO_8859_13.ml))))
-
-(rule ((targets (ISO_8859_15.ml))
-       (deps (maps/8859-15.TXT))
-       (action (run ${exe:../gen/generate.exe} maps/8859-15.TXT ISO_8859_15.ml))))
-
-(rule ((targets (ISO_8859_14.ml))
-       (deps (maps/8859-14.TXT))
-       (action (run ${exe:../gen/generate.exe} maps/8859-14.TXT ISO_8859_14.ml))))
-
 (rule ((targets (ISO_8859_8.ml))
        (deps (maps/8859-8.TXT))
        (action (run ${exe:../gen/generate.exe} maps/8859-8.TXT ISO_8859_8.ml))))
 
-(rule ((targets (ISO_8859_4.ml))
-       (deps (maps/8859-4.TXT))
-       (action (run ${exe:../gen/generate.exe} maps/8859-4.TXT ISO_8859_4.ml))))
+(rule ((targets (ISO_8859_9.ml))
+       (deps (maps/8859-9.TXT))
+       (action (run ${exe:../gen/generate.exe} maps/8859-9.TXT ISO_8859_9.ml))))