Fix template install

ocsigen · Mar 22, 2024 · 34bfea2 · 34bfea2
1 parent 1a9e37a
commit 34bfea2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/dune-project b/dune-project
@@ -33,7 +33,7 @@ The client-side code is compiled to JS using Ocsigen Js_of_ocaml or to Wasm usin
   (js_of_ocaml-tyxml (>= 3.6.0))
   lwt_log
   (lwt_ppx (>= 1.2.3))
-  (tyxml (and (>= 4.4.0) (< 4.5.0)))
+  (tyxml (and (>= 4.6.0) (< 4.7.0)))
   (ocsigenserver (and (>= 5.1.0) (< 6.0.0)))
   (ipaddr (>= 2.1))
   (reactiveData (>= 0.2.1))

diff --git a/eliom.opam b/eliom.opam
@@ -31,7 +31,7 @@ depends: [
   "js_of_ocaml-tyxml" {>= "3.6.0"}
   "lwt_log"
   "lwt_ppx" {>= "1.2.3"}
-  "tyxml" {>= "4.6.0"}
+  "tyxml" {>= "4.6.0" & < "4.7.0"}
   "ocsigenserver" {>= "5.1.0" & < "6.0.0"}
   "ipaddr" {>= "2.1"}
   "reactiveData" {>= "0.2.1"}

diff --git a/pkg/distillery/dune b/pkg/distillery/dune
@@ -1,5 +1,5 @@
 (data_only_dirs templates)
 (install
   (section lib)
-  (files (glob_files templates/client-server.basic/*)
-         (glob_files templates/basic.ppx/*)))
+  (files (glob_files templates/client-server.basic/**)
+         (glob_files templates/basic.ppx/**)))
diff --git a/pkg/filelist.ml b/pkg/filelist.ml
@@ -172,7 +172,7 @@ let ppx_extra =
   exts ["cmi"] ppx.interface @ exts ["cmx"] (ppx.interface @ ppx.internal)
 
 let ppx_api = ppx.interface
-let templates_dir = "pkg/distillery"
+let templates_dir = "pkg/distillery/templates"
 let templates = Array.to_list (Sys.readdir templates_dir)
 
 let templates_files =