114.20+69

.gitignore

@@ -1,7 +1,3 @@
-_build/
-/setup.data
-/setup.log
-/*.exe
-/*.docdir
-/*.native
-/*.byte
+_build
+*.install
+

Makefile

@@ -1,68 +1,18 @@
-# Generic Makefile for oasis project
-
-SETUP := setup.exe
 NAME := sexplib
-PREFIX ?= $(shell grep ^prefix= setup.data | cut -d\" -f 2)
 
 # Default rule
-default: build
-
-setup.exe: _oasis setup.ml
-	ocamlfind ocamlopt -o $@ -linkpkg -package ocamlbuild,oasis.dynrun setup.ml || \
-	  ocamlfind ocamlc -o $@ -linkpkg -package ocamlbuild,oasis.dynrun setup.ml || true
-	for f in setup.*; do [ $$f = $@ -o $$f = setup.ml ] || rm -f $$f; done
-
-build: $(SETUP) setup.data
-	./$(SETUP) -build $(BUILDFLAGS)
-	$(MAKE) $(NAME).install
-
-doc: $(SETUP) setup.data build
-	./$(SETUP) -doc $(DOCFLAGS)
-
-test: $(SETUP) setup.data build
-	./$(SETUP) -test $(TESTFLAGS)
-
-all: $(SETUP)
-	./$(SETUP) -all $(ALLFLAGS)
-	$(MAKE) $(NAME).install
-
-$(NAME).install: install.ml setup.log setup.data
-	ocaml -I "$(OCAML_TOPLEVEL_PATH)" install.ml
+default:
+	jbuilder build-package $(NAME)
 
-install: $(NAME).install
+install:
 	opam-installer -i --prefix $(PREFIX) $(NAME).install
 
-uninstall: $(NAME).install
+uninstall:
 	opam-installer -u --prefix $(PREFIX) $(NAME).install
 
-reinstall: $(NAME).install
-	opam-installer -u --prefix $(PREFIX) $(NAME).install &> /dev/null || true
-	opam-installer -i --prefix $(PREFIX) $(NAME).install
-
-bin.tar.gz: $(NAME).install
-	rm -rf _install
-	mkdir _install
-	opam-installer -i --prefix _install $(NAME).install
-	tar czf bin.tar.gz -C _install .
-	rm -rf _install
-
-bin.lzo: $(NAME).install
-	rm -rf _install
-	mkdir _install
-	opam-installer -i --prefix _install $(NAME).install
-	cd _install && lzop -1 -P -o ../bin.lzo `find . -type f`
-	rm -rf _install
-
-clean: $(SETUP)
-	./$(SETUP) -clean $(CLEANFLAGS)
-
-distclean: $(SETUP)
-	./$(SETUP) -distclean $(DISTCLEANFLAGS)
-
-configure: $(SETUP)
-	./$(SETUP) -configure $(CONFIGUREFLAGS)
+reinstall: uninstall reinstall
 
-setup.data: $(SETUP)
-	./$(SETUP) -configure $(CONFIGUREFLAGS)
+clean:
+	rm -rf _build
 
-.PHONY: default build doc test all install uninstall reinstall clean distclean configure
+.PHONY: default install uninstall reinstall clean

num/lib/jbuild

@@ -1,5 +1,5 @@
 (library
  ((name sexplib_num)
   (public_name sexplib.num)
-  (libraries (nums sexplib))
-  (preprocess ((no_preprocessing All)))))
+  (libraries (num sexplib))
+  (preprocess no_preprocessing)))

opam → sexplib.opam

@@ -6,15 +6,18 @@ bug-reports: "https://github.com/janestreet/sexplib/issues"
 dev-repo: "https://github.com/janestreet/sexplib.git"
 license: "Apache-2.0"
 build: [
-  ["./configure" "--prefix" prefix]
-  [make]
+  ["jbuilder" "build-package" "sexplib" "-j" jobs]
 ]
 depends: [
-  "ocamlbuild"     {build}
-  "oasis"          {build & >= "0.4"}
-  "ocamlfind"      {build & >= "1.3.2"}
   "base"
-  "js-build-tools" {build}
+  "jbuilder"
 ]
 available: [ ocaml-version >= "4.03.0" ]
-conflicts: [ "oasis" {= "0.4.7"} ]
+descr: "
+Library for serializing OCaml values to and from S-expressions
+
+Part of Jane Street\226\128\153s Core library
+The Core suite of libraries is an industrial strength alternative to
+OCaml's standard library that was developed by Jane Street, the
+largest industrial user of OCaml.
+"

src/conv.ml

@@ -1,8 +1,9 @@
 open Printf
 open Bigarray
+
+module Sexplib = Base.Exported_for_specific_uses.Sexplib
 module String = Bytes
-include (Base0.Sexplib.Conv : module type of Base0.Sexplib.Conv
-         with module Sexp := Base0.Sexplib.Conv.Sexp)
+include Sexplib.Conv
 open Sexp
 
 type bigstring = (char, int8_unsigned_elt, c_layout) Array1.t

src/conv.mli

@@ -1,8 +1,7 @@
 (** Utility Module for S-expression Conversions *)
 
 open Bigarray
-include (module type of Base0.Sexplib.Conv with module Sexp := Base0.Sexplib.Conv.Sexp)
-
+include module type of Base.Exported_for_specific_uses.Sexplib.Conv
 
 (** {6 Type aliases} *)
 

src/conv_error.ml

@@ -1 +1 @@
-include Base0.Sexplib.Conv_error
+include Base.Exported_for_specific_uses.Sexplib.Conv_error

src/jbuild

@@ -2,7 +2,7 @@
  ((name sexplib)
   (libraries (bigarray base))
   (public_name sexplib)
-  (preprocess (((command ${PA_CPP}) (List (pre_sexp)))))
+  (preprocess (per_file ((command ${PA_CPP}) (pre_sexp))))
   (js_of_ocaml ())))
 
 (ocamllex (lexer))