Merge pull request #71 from smolkaj/master

upgrade to dune, opam >= 2.0

Makefile

@@ -7,21 +7,21 @@ INSTALL_ARGS := $(if $(PREFIX),--prefix $(PREFIX),)
 .PHONY: build install uninstall clean doc test all
 
 build:
-	jbuilder build @install
+	dune build @install
 
 install:
-	jbuilder install $(INSTALL_ARGS)
+	dune install $(INSTALL_ARGS)
 
 uninstall:
-	jbuilder uninstall $(INSTALL_ARGS)
+	dune uninstall $(INSTALL_ARGS)
 
 clean:
-	jbuilder clean
+	dune clean
 
 doc:
-	jbuilder build @doc
+	dune build @doc
 
 test:
-	jbuilder build @runtest
+	dune build @runtest
 
-all: build doc
+all: build test doc

dune-project

@@ -0,0 +1,2 @@
+(lang dune 1.0)
+(name sedlex)

examples/dune

@@ -0,0 +1,41 @@
+(executables
+ (names tokenizer complement subtraction repeat performance)
+ (libraries sedlex)
+ (preprocess
+  (pps sedlex.ppx))
+  (flags :standard -w -39))
+
+(alias
+ (name runtest)
+ (deps
+  (:< tokenizer.exe))
+ (action
+  (run %{<})))
+
+(alias
+ (name runtest)
+ (deps
+  (:< complement.exe))
+ (action
+  (run %{<})))
+
+(alias
+ (name runtest)
+ (deps
+  (:< subtraction.exe))
+ (action
+  (run %{<})))
+
+(alias
+ (name runtest)
+ (deps
+  (:< repeat.exe))
+ (action
+  (run %{<})))
+
+(alias
+ (name runtest)
+ (deps
+  (:< performance.exe))
+ (action
+  (run %{<})))

examples/performance.ml

@@ -15,7 +15,7 @@ let time f x =
 
 let () =
   let long_str = String.make 1000000 '\n' in
-  let token_from str =
+  let token_from _ =
     let lexbuf = Sedlexing.Latin1.from_string long_str in
     (* let () = Sedlexing.set_curr_p lexbuf Lexing.dummy_pos in *)
     token lexbuf

sedlex.opam

@@ -1,23 +1,27 @@
-opam-version: "1.2"
+opam-version: "2.0"
 name: "sedlex"
-version: "1.99.4"
+synopsis: "An OCaml lexer generator for Unicode"
+version: "1.99.5"
+license: "MIT"
 maintainer: "Alain Frisch <[email protected]>"
 authors: [
   "Alain Frisch <[email protected]>"
+  "https://github.com/ocaml-community/sedlex/graphs/contributors"
+]
+homepage: "https://github.com/ocaml-community/sedlex"
+dev-repo: "git+https://github.com/ocaml-community/sedlex.git"
+bug-reports: "https://github.com/ocaml-community/sedlex/issues"
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
+]
+depends: [
+  "ocaml" {build & >= "4.02.3"}
+  "dune" {build & >= "1.0"}
+  "ppx_tools_versioned"
+  "ocaml-migrate-parsetree"
+  "gen"
+  "uchar"
 ]
-
-build: ["jbuilder" "build" "-p" name "-j" jobs]
-build-doc: ["jbuilder" "build" "@doc" "-p" name "-j" jobs]
-build-test: ["jbuilder" "runtest" "-p" name "-j" jobs]
-
-depends: ["jbuilder" {build}
-          "ppx_tools_versioned"
-          "ocaml-migrate-parsetree"
-          "gen"
-          "uchar"
-         ]
-available: [ ocaml-version >= "4.02.3" ]
-homepage: "https://github.com/alainfrisch/sedlex"
-bug-reports: "https://github.com/alainfrisch/sedlex/issues"
-license: "MIT"
-dev-repo: "https://github.com/alainfrisch/sedlex.git"

src/lib/dune

@@ -0,0 +1,6 @@
+(library
+ (name sedlex)
+ (public_name sedlex)
+ (wrapped false)
+ (libraries gen uchar)
+ (flags :standard -w +A-4-9 -safe-string))

src/syntax/dune

@@ -0,0 +1,9 @@
+(library
+ (name sedlex_ppx)
+ (public_name sedlex.ppx)
+ (kind ppx_rewriter)
+ (libraries ppx_tools_versioned.metaquot_405 ocaml-migrate-parsetree sedlex)
+ (ppx_runtime_libraries sedlex)
+ (preprocess
+  (pps ppx_tools_versioned.metaquot_405))
+ (flags (:standard -w -9)))