[Pkg-ocaml-maint-commits] [yojson] 01/06: Imported Upstream version 1.1.8

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository yojson.

commit f76160a0d1ca1920fe81a989113f3ba5f66e31d8
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Feb 1 11:09:02 2014 +0100

    Imported Upstream version 1.1.8
---
 META.in  |  2 ++
 Makefile | 19 +++++++++++++++----
 util.mli |  2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/META.in b/META.in
index 967d36e..535edfa 100644
--- a/META.in
+++ b/META.in
@@ -4,10 +4,12 @@ description = "JSON parsing and printing (successor of json-wheel)"
 requires = "easy-format,biniou"
 archive(byte) = "yojson.cmo"
 archive(native) = "yojson.cmx"
+archive(native,plugin) = "yojson.cmxs"
 package "biniou" (
  version = "@@VERSION@@"
  description = "JSON <=> Biniou conversion"
  requires = "easy-format,biniou"
  archive(byte) = "yojson_biniou.cmo"
  archive(native) = "yojson_biniou.cmx"
+ archive(native,plugin) = "yojson_biniou.cmxs"
 )
diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
index f71ce53..5d11d5e
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.1.7
+VERSION = 1.1.8
 
 ifeq "$(shell ocamlc -config |grep os_type)" "os_type: Win32"
 EXE=.exe
@@ -7,15 +7,20 @@ EXE=
 endif
 
 
+NATDYNLINK := $(shell if [ -f `ocamlc -where`/dynlink.cmxa ]; then echo YES; else echo NO; fi)
+
 FLAGS = -dtypes -g
 CMO = yojson.cmo yojson_biniou.cmo
 CMX = yojson.cmx yojson_biniou.cmx
+ifeq "${NATDYNLINK}" "YES"
+CMXS = yojson.cmxs yojson_biniou.cmxs
+endif
 PACKS = easy-format,biniou
 
 .PHONY: default all opt install uninstall reinstall doc install-doc
 default: META all opt
 all: $(CMO)
-opt: $(CMX) ydump$(EXE)
+opt: $(CMX) $(CMXS) ydump$(EXE)
 
 ifndef PREFIX
   PREFIX = $(shell dirname $$(dirname $$(which ocamlfind)))
@@ -36,12 +41,12 @@ install: META
 	ocamlfind install yojson META \
           $$(ls yojson.mli yojson_biniou.mli \
 		yojson.cmi yojson_biniou.cmi \
-		$(CMO) $(CMX) \
+		$(CMO) $(CMX) $(CMXS) \
 		yojson.o yojson_biniou.o)
 
 uninstall:
 	test ! -f $(BINDIR)/ydump || rm $(BINDIR)/ydump
-	test ! -f $(BINDIR)/ydump.exe || rm $(BINDIR)/ydump.exe 
+	test ! -f $(BINDIR)/ydump.exe || rm $(BINDIR)/ydump.exe
 	ocamlfind remove yojson
 
 reinstall:
@@ -70,6 +75,9 @@ yojson.cmo: yojson.cmi yojson.ml
 yojson.cmx: yojson.cmi yojson.ml
 	ocamlfind ocamlopt -c $(FLAGS) -package $(PACKS) yojson.ml
 
+yojson.cmxs: yojson.cmx
+	ocamlopt -shared -linkall -I . -o yojson.cmxs yojson.cmx
+
 yojson_biniou.cmi: yojson_biniou.mli
 	ocamlfind ocamlc -c $(FLAGS) -package $(PACKS) yojson_biniou.mli
 
@@ -79,6 +87,9 @@ yojson_biniou.cmo: yojson_biniou.cmi yojson_biniou.ml
 yojson_biniou.cmx: yojson_biniou.cmi yojson_biniou.ml
 	ocamlfind ocamlopt -c $(FLAGS) -package $(PACKS) yojson_biniou.ml
 
+yojson_biniou.cmxs: yojson_biniou.cmx
+	ocamlopt -shared -linkall -I . -o yojson_biniou.cmxs yojson_biniou.cmx
+
 ydump$(EXE): yojson.cmx yojson_biniou.cmx ydump.ml
 	ocamlfind ocamlopt -o ydump$(EXE) $(FLAGS) -package $(PACKS) -linkpkg \
 		$(CMX) ydump.ml
diff --git a/util.mli b/util.mli
index 6de6fbc..dfcec47 100644
--- a/util.mli
+++ b/util.mli
@@ -86,7 +86,7 @@ val map : (json -> json) -> json -> json
       [arr], and returns a JSON array containing the results. *)
 
 val to_assoc : json -> (string * json) list
-  (** Extract the items of a JSON array or raise [Type_error]. *)
+  (** Extract the items of a JSON object or raise [Type_error]. *)
 
 val to_option : (json -> 'a) -> json -> 'a option
   (** Return [None] if the JSON value is null or map the JSON value

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/yojson.git