diff --git a/compat/camomileDefaultConfig.ml b/compat/camomileDefaultConfig.ml new file mode 100644 index 0000000..c5ce2db --- /dev/null +++ b/compat/camomileDefaultConfig.ml @@ -0,0 +1 @@ +include Camomile.DefaultConfig diff --git a/compat/camomileDefaultConfig__.ml b/compat/camomileDefaultConfig__.ml new file mode 100644 index 0000000..03e5d09 --- /dev/null +++ b/compat/camomileDefaultConfig__.ml @@ -0,0 +1 @@ +module InstallConfig = CamomileDefaultConfig__InstallConfig diff --git a/compat/camomileDefaultConfig__InstallConfig.ml b/compat/camomileDefaultConfig__InstallConfig.ml new file mode 100644 index 0000000..b8acca9 --- /dev/null +++ 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 new file mode 100644 index 0000000..0b820a5 --- /dev/null +++ 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 new file mode 100644 index 0000000..0763e06 --- /dev/null +++ b/compat/camomileLibraryDefault.ml @@ -0,0 +1,2 @@ +module Config = CamomileDefaultConfig +module Camomile = Camomile diff --git a/compat/camomileLibraryDyn.ml b/compat/camomileLibraryDyn.ml new file mode 100644 index 0000000..fceab3e --- /dev/null +++ b/compat/camomileLibraryDyn.ml @@ -0,0 +1 @@ +include CamomileLibraryDefault diff --git a/compat/dune b/compat/dune new file mode 100644 index 0000000..98e72b3 --- /dev/null +++ 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 deleted file mode 100644 index 6789ab8..0000000 --- a/src/camomileCompat.ml +++ /dev/null @@ -1,14 +0,0 @@ -module CamomileLibrary = struct - [@@@ocaml.deprecated - "this module is deprecated, please update to the most recent camomile API"] - - include Camomile - - module ConfigInt = struct - module type Type = CamomileLib.Config.Type - end -end - -module CamomileDefaultConfig = Camomile.DefaultConfig -module CamomileLibraryDefault = CamomileLibrary -module CamomileLibraryDyn = CamomileLibraryDefault diff --git a/src/dune b/src/dune index ede4337..32cb911 100644 --- 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))