fix generator to use argv to simplify the jbuild rules

rename more-mime.types to x-mime.types for clarity

generator/generate_mime_types.ml

@@ -35,16 +35,13 @@ let file_iter fn c =
 let _ =
   Arg.parse options (fun s -> files := s :: !files)
     (Printf.sprintf "Usage: %s [options]\nwhere options are:" Sys.argv.(0));
-  let fin =
-    match List.rev !files with
-      [] -> stdin
-    | file :: _ -> open_in file
-  in
   let fun_name = if !extensions then "map_extension" else "map_file" in
   let dup = Hashtbl.create 101 in
-  printf "(* This function is autogenerated by %s *)\n" (Sys.argv.(0));
+  printf "(* This function is autogenerated by: %s *)\n" (String.concat " " (Array.to_list Sys.argv));
   printf "let %s = function\n" fun_name;
-  file_iter (fun l ->
+  List.iter (fun fname ->
+    let fin = open_in fname in
+    file_iter (fun l ->
       match split (regexp "\t+") l with
       | [] -> ()
       | [_] -> ()
@@ -58,4 +55,6 @@ let _ =
           ) (split (regexp " +") exts)
       | _ -> ()
     ) fin;
+    close_in fin
+  ) (List.rev !files);
   printf " | _ -> \"application/octet-stream\"\n%!"

src/jbuild

@@ -8,5 +8,5 @@
  ((targets (mime_types.ml))
   (deps    (../generator/generate_mime_types.exe))
   (action  (with-stdout-to ${@}
-             (progn (run ${<} ../../../mime.types)
-                    (run ${<} ../../../more-mime.types --files))))))
+             (progn (run ${<} ../../../mime.types ../../../x-mime.types)
+                    (run ${<} ../../../files.types --files))))))