Make it more compat!

ocaml-community · Apr 4, 2023 · 05caeef · 05caeef
1 parent 999a5e3
commit 05caeef
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 21 deletions.
diff --git a/compat/camomileDefaultConfig.ml b/compat/camomileDefaultConfig.ml
@@ -0,0 +1 @@
+include Camomile.DefaultConfig
diff --git a/compat/camomileDefaultConfig__.ml b/compat/camomileDefaultConfig__.ml
@@ -0,0 +1 @@
+module InstallConfig = CamomileDefaultConfig__InstallConfig
diff --git a/compat/camomileDefaultConfig__InstallConfig.ml b/compat/camomileDefaultConfig__InstallConfig.ml
@@ -0,0 +1 @@
+let share_dir = Filename.dirname Camomile.DefaultConfig.datadir
diff --git a/compat/camomileLibrary.ml b/compat/camomileLibrary.ml
@@ -0,0 +1,15 @@
+[@@@ocaml.deprecated
+"this module is deprecated, please update to the most recent camomile API"]
+
+include Camomile
+module CharEncoding = CamomileLib.CharEncoding
+module UCharInfo = CamomileLib.UCharInfo
+module UNF = CamomileLib.UNF
+module UCol = CamomileLib.UCol
+module CaseMap = CamomileLib.CaseMap
+module UReStr = CamomileLib.UReStr
+module StringPrep = CamomileLib.StringPrep
+
+module ConfigInt = struct
+  module type Type = CamomileLib.Config.Type
+end
diff --git a/compat/camomileLibraryDefault.ml b/compat/camomileLibraryDefault.ml
@@ -0,0 +1,2 @@
+module Config = CamomileDefaultConfig
+module Camomile = Camomile
diff --git a/compat/camomileLibraryDyn.ml b/compat/camomileLibraryDyn.ml
@@ -0,0 +1 @@
+include CamomileLibraryDefault
diff --git a/compat/dune b/compat/dune
@@ -0,0 +1,10 @@
+(env
+ (dev
+  (flags
+   (:standard -w -3))))
+
+(library
+ (name camomileCompat)
+ (public_name camomile-compat)
+ (libraries camomile camomile.lib)
+ (wrapped false))
diff --git a/src/camomileCompat.ml b/src/camomileCompat.ml
diff --git a/src/dune b/src/dune
@@ -25,16 +25,10 @@
  (name camomileLib)
  (public_name camomile.lib)
  (libraries dune-site bigarray camlp-streams)
- (modules :standard \ camomile camomileCompat))
+ (modules :standard \ camomile))
 
 (library
  (name camomile)
  (public_name camomile)
  (libraries camomileLib)
  (modules camomile))
-
-(library
- (name camomileCompat)
- (public_name camomile-compat)
- (libraries camomile)
- (modules camomileCompat))