Factor the list of C headers for stubgen into a helper library

Author: Armael

config/dune

@@ -1,7 +1,8 @@
 (executables
   (names discover)
   (flags (:standard -safe-string))
-  (libraries base stdio dune.configurator))
+  (libraries base stdio dune.configurator)
+  (modules discover))
 
 (rule
   (targets wlroots-ccopt.sexp
@@ -15,6 +16,13 @@
            pixman-1-ccopt.sexp
            pixman-1-cclib.sexp
            pixman-1-ccopt
-           pixman-1-cclib)
+           pixman-1-cclib
+           wayland-protocols-dir
+           wayland-scanner-bin)
   (deps    (:discover discover.exe))
   (action  (run %{discover})))
+
+(library
+ (name wlroots_config)
+ (public_name wlroots.config)
+ (modules wlroots_config))

config/wlroots_config.ml

@@ -0,0 +1,20 @@
+let stubgen_prologue ="
+#define _POSIX_C_SOURCE 200809L
+#include <wayland-server.h>
+#include <wlr/backend.h>
+#include <wlr/render/wlr_renderer.h>
+#include <wlr/types/wlr_cursor.h>
+#include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_data_device.h>
+#include <wlr/types/wlr_input_device.h>
+#include <wlr/types/wlr_keyboard.h>
+#include <wlr/types/wlr_matrix.h>
+#include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_output_layout.h>
+#include <wlr/types/wlr_pointer.h>
+#include <wlr/types/wlr_seat.h>
+#include <wlr/types/wlr_xcursor_manager.h>
+#include <wlr/backend.h>
+#include <wlr/util/log.h>
+#include <wlr/types/wlr_xdg_shell.h>
+"

ffi/dune

@@ -4,7 +4,7 @@
   (modules generated_types ffi)
   (flags (:standard -w -9))
   (libraries wlroots_types_f
-             wlroots_common
+             wlroots_config wlroots_common
              ctypes ctypes.stubs
              unix-time.unix mtime.clock.os
              xkbcommon))

ffi/stubgen.ml

@@ -1,24 +1,5 @@
 let prefix = "wlroots_stub"
 
-let prologue = "
-#define _POSIX_C_SOURCE 200809L
-#include <wayland-server.h>
-#include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_cursor.h>
-#include <wlr/types/wlr_compositor.h>
-#include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_input_device.h>
-#include <wlr/types/wlr_keyboard.h>
-#include <wlr/types/wlr_matrix.h>
-#include <wlr/types/wlr_output.h>
-#include <wlr/types/wlr_output_layout.h>
-#include <wlr/types/wlr_pointer.h>
-#include <wlr/types/wlr_seat.h>
-#include <wlr/types/wlr_xcursor_manager.h>
-#include <wlr/backend.h>
-#include <wlr/util/log.h>
-"
-
 let () =
   let generate_ml, generate_c = ref false, ref false in
   let () =
@@ -34,5 +15,5 @@ let () =
   | true, false ->
     Cstubs.write_ml Format.std_formatter ~prefix (module Wlroots_ffi_f.Ffi.Make)
   | false, true ->
-    print_endline prologue;
+    print_endline Wlroots_config.stubgen_prologue;
     Cstubs.write_c Format.std_formatter ~prefix (module Wlroots_ffi_f.Ffi.Make)

types/dune

@@ -9,7 +9,7 @@
 (executables
   (names stubgen)
   (modules stubgen)
-  (libraries wlroots_types_f ctypes.stubs ctypes))
+  (libraries wlroots_config wlroots_types_f ctypes.stubs ctypes))
 
 ; C file built by stubgen
 (rule (with-stdout-to "types_stubgen.c" (run "./stubgen.exe")))

types/stubgen.ml

@@ -1,24 +1,4 @@
-let prologue = "
-#define _POSIX_C_SOURCE 200809L
-#include <wayland-server.h>
-#include <wlr/backend.h>
-#include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_cursor.h>
-#include <wlr/types/wlr_compositor.h>
-#include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_input_device.h>
-#include <wlr/types/wlr_keyboard.h>
-#include <wlr/types/wlr_matrix.h>
-#include <wlr/types/wlr_output.h>
-#include <wlr/types/wlr_output_layout.h>
-#include <wlr/types/wlr_pointer.h>
-#include <wlr/types/wlr_seat.h>
-#include <wlr/types/wlr_xcursor_manager.h>
-#include <wlr/backend.h>
-#include <wlr/util/log.h>
-"
-
 let () =
-  print_endline prologue;
+  print_endline Wlroots_config.stubgen_prologue;
   Cstubs_structs.write_c Format.std_formatter
     (module Wlroots_types_f.Types.Make)