Switch to dune and include_subdirs

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>

Camomile/charmaps/dune

@@ -0,0 +1,21 @@
+(include_subdirs no)
+
+(executable (name dune_gen))
+
+(rule
+ (deps (glob_files sources/*))
+ (targets dune.inc.gen)
+ (action (with-stdout-to %{targets}
+          (run ./dune_gen.exe sources))))
+
+(copy_files sources/*)
+
+(alias
+ (name dune)
+ (action (diff dune.inc dune.inc.gen)))
+
+(alias
+ (name runtest)
+ (deps (alias dune)))
+
+(include dune.inc)

Camomile/charmaps/jbuild_gen.ml → Camomile/charmaps/dune_gen.ml

@@ -97,15 +97,15 @@ let () =
   let pr fmt = Printf.bprintf buf (fmt ^^ "\n") in
   pr "";
   pr "(install";
-  pr " ((section share)";
-  pr "  (files (";
+  pr " (section share)";
+  pr " (files";
   List.iter to_install ~f:(fun fn ->
       pr "   (%s as charmaps/%s)" fn fn);
-  pr "    ))))";
+  pr "    ))";
   List.iter charmaps ~f:(fun (fn, targets) ->
       pr "";
       pr "(rule";
-      pr " ((targets (%s))" (String.concat ~sep:" " targets);
-      pr "  (deps    (%s))" fn;
-      pr "  (action  (run ../tools/camomilecharmap.exe -d . ${^}))))");
+      pr " (targets %s)" (String.concat ~sep:" " targets);
+      pr " (deps    %s)" fn;
+      pr " (action  (run ../tools/camomilecharmap.exe -d . %%{deps})))");
   print_endline (Buffer.contents buf)