Depend on uchar

ocsigen · Aug 18, 2016 · 93e4ded · 93e4ded
1 parent 14a10e8
commit 93e4ded
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/doc/Makefile b/doc/Makefile
@@ -34,13 +34,13 @@ endif
 doc: api/html/index.html
 api/html/index.html: ${MLIS} api/index
 	mkdir -p api/html
-	ocamlfind ocamldoc ${DOCOPT} -package lwt,ocamlbuild ${OTHER} -intro api/index -html \
+	ocamlfind ocamldoc ${DOCOPT} -package lwt,ocamlbuild,uchar ${OTHER} -intro api/index -html \
 	   -d api/html -I ../lib -I ../lib/deriving_json ${MLIS}
 
 wikidoc: api/wiki/index.wiki cp-examples
 api/wiki/index.wiki: ${MLIS} api/index
 	mkdir -p api/wiki
-	ocamlfind ocamldoc ${DOCOPT} -package lwt,ocamlbuild ${OTHER} -intro api/index \
+	ocamlfind ocamldoc ${DOCOPT} -package lwt,ocamlbuild,uchar ${OTHER} -intro api/index \
 	   -d api/wiki -I ../lib -I ../lib/deriving_json -I ../lib/syntax \
 	   -i $(shell ocamlfind query wikidoc) -g odoc_wiki.cma \
 	   ${MLIS}

diff --git a/examples/Makefile.common b/examples/Makefile.common
@@ -4,7 +4,7 @@ include ../../Makefile.conf
 
 COMP=../../compiler/$(COMPILER)
 JSFILES=../../runtime/runtime.js
-OCAMLC=ocamlfind ocamlc -g -package lwt -pp "camlp4o ../../lib/syntax/pa_js.cmo" -I ../../lib
+OCAMLC=ocamlfind ocamlc -g -package lwt,uchar -pp "camlp4o ../../lib/syntax/pa_js.cmo" -I ../../lib
 STDLIB=$(LIBNAME).cma
 
 $(NAME).js: $(NAME).byte $(COMP) $(JSFILES)

diff --git a/lib/META b/lib/META
@@ -1,7 +1,7 @@
 description = "Js_of_ocaml library"
 version = "dev"
 archive(byte) = "js_of_ocaml.cma"
-requires = "lwt"
+requires = "lwt,uchar"
 
 linkopts(javascript,-jsoo_noruntime) = "+js_of_ocaml/runtime.js"
 linkopts(javascript,jsoo_classlist) += "+js_of_ocaml/classlist.js"

diff --git a/lib/Makefile b/lib/Makefile
@@ -240,6 +240,12 @@ ppx/ppx_deriving_json.cmxa: ppx/ppx_deriving_json.cmx
 ppx/ppx_deriving_json.cmxs: ppx/ppx_deriving_json.cmx
 	$(OCAMLOPT) -shared -o $@ $^
 
+dom_html.cmo: dom_html.ml syntax/pa_js.cmo
+	$(OCAMLC) -pp "camlp4o syntax/pa_js.cmo" $(SAFESTRING) -package lwt,uchar -c -g dom_html.ml
+
+dom_html.cmi: dom_html.mli
+	$(OCAMLC) -package lwt,uchar -I deriving_json $(SAFESTRING) -c dom_html.mli
+
 %.cmo: %.ml syntax/pa_js.cmo
 	$(OCAMLC) -pp "camlp4o syntax/pa_js.cmo" $(SAFESTRING) -package lwt -c -g $<
 

diff --git a/opam b/opam
@@ -23,6 +23,7 @@ depends: [
   "base64" {>= "2.0.0"}
   ("base-no-ppx" | "ppx_tools")
   "ocamlbuild"
+  "uchar"
 ]
 depopts: ["deriving" "ppx_deriving" "tyxml" "reactiveData" "async_kernel" "ppx_driver"]
 conflicts: [