adds support for loading plugins in toplevels

Uses virtual libraries to select the proper dynamic linker facility. To load in the toplevel add `dune-site.toplevel` library as the dependency to your toplevel. Signed-off-by: Ivan Gotovchits <[email protected]>
ocaml · Aug 17, 2022 · a3e0aff · a3e0aff
1 parent d4bcecb
commit a3e0aff
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 2 deletions.
diff --git a/otherlibs/site/src/plugins/dune b/otherlibs/site/src/plugins/dune
@@ -6,4 +6,4 @@
   (dune_site
    (plugins)
    (data_module dune_site_plugins_data)))
- (libraries dune-site dune-private-libs.meta_parser dynlink))
+ (libraries dune-site dune-private-libs.meta_parser linker))
diff --git a/otherlibs/site/src/plugins/linker/dune b/otherlibs/site/src/plugins/linker/dune
@@ -0,0 +1,5 @@
+(library
+ (name linker)
+ (public_name dune-site.linker)
+ (virtual_modules linker)
+ (default_implementation dune-site.dynlink))
diff --git a/otherlibs/site/src/plugins/linker/dynlink/dune b/otherlibs/site/src/plugins/linker/dynlink/dune
@@ -0,0 +1,6 @@
+(library
+ (name dune_site_dynlink_linker)
+ (modes native)
+ (public_name dune-site.dynlink)
+ (implements dune-site.linker)
+ (libraries dynlink))
diff --git a/otherlibs/site/src/plugins/linker/dynlink/linker.ml b/otherlibs/site/src/plugins/linker/dynlink/linker.ml
@@ -0,0 +1 @@
+let load = Dynlink.loadfile
diff --git a/otherlibs/site/src/plugins/linker/linker.mli b/otherlibs/site/src/plugins/linker/linker.mli
@@ -0,0 +1 @@
+val load : string -> unit
diff --git a/otherlibs/site/src/plugins/linker/toplevel/dune b/otherlibs/site/src/plugins/linker/toplevel/dune
@@ -0,0 +1,6 @@
+(library
+ (name dune_site_toplevel_linker)
+ (modes byte)
+ (public_name dune-site.toplevel)
+ (implements dune-site.linker)
+ (libraries compiler-libs.toplevel))
diff --git a/otherlibs/site/src/plugins/linker/toplevel/linker.ml b/otherlibs/site/src/plugins/linker/toplevel/linker.ml
@@ -0,0 +1 @@
+let load = Topdirs.dir_load Format.err_formatter
diff --git a/otherlibs/site/src/plugins/plugins.ml b/otherlibs/site/src/plugins/plugins.ml
@@ -256,7 +256,7 @@ let load_gen ~load_requires dirs name =
     List.iter
       (fun p ->
         let file = Filename.concat directory p in
-        Dynlink.loadfile file)
+        Linker.load file)
       plugins)
 
 let rec load_requires name =
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		let load = Topdirs.dir_load Format.err_formatter