diff --git a/LICENSE.md b/LICENSE.md index 3a1a808..54ac543 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2015--2018 Jane Street Group, LLC +Copyright (c) 2015--2019 Jane Street Group, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Makefile b/Makefile index 2773ca9..1965878 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,17 @@ INSTALL_ARGS := $(if $(PREFIX),--prefix $(PREFIX),) -# Default rule default: - jbuilder build @install + dune build install: - jbuilder install $(INSTALL_ARGS) + dune install $(INSTALL_ARGS) uninstall: - jbuilder uninstall $(INSTALL_ARGS) + dune uninstall $(INSTALL_ARGS) reinstall: uninstall install clean: - rm -rf _build + dune clean .PHONY: default install uninstall reinstall clean diff --git a/dune b/dune new file mode 100644 index 0000000..e69de29 diff --git a/dune-project b/dune-project new file mode 100644 index 0000000..598db56 --- /dev/null +++ b/dune-project @@ -0,0 +1 @@ +(lang dune 1.5) \ No newline at end of file diff --git a/example/dune b/example/dune new file mode 100644 index 0000000..68cfc63 --- /dev/null +++ b/example/dune @@ -0,0 +1,4 @@ +(executables (names test) (libraries variantslib) + (preprocess (pps ppx_variants_conv))) + +(alias (name DEFAULT) (deps test.ml.pp test.mli.pp)) \ No newline at end of file diff --git a/example/jbuild b/example/jbuild deleted file mode 100644 index 58960fb..0000000 --- a/example/jbuild +++ /dev/null @@ -1,11 +0,0 @@ -(executables - ((names (test)) - (libraries (variantslib)) - (preprocess (pps (ppx_variants_conv ppxlib.runner))))) - -(alias - ((name DEFAULT) - (deps (test.ml.pp test.mli.pp)))) - - -(jbuild_version 1) diff --git a/jbuild b/jbuild deleted file mode 100644 index ea8e234..0000000 --- a/jbuild +++ /dev/null @@ -1,2 +0,0 @@ - -(jbuild_version 1) diff --git a/ppx_variants_conv.opam b/ppx_variants_conv.opam index 0af089e..fbdbe87 100644 --- a/ppx_variants_conv.opam +++ b/ppx_variants_conv.opam @@ -1,23 +1,22 @@ -opam-version: "1.2" +opam-version: "2.0" maintainer: "opensource@janestreet.com" authors: ["Jane Street Group, LLC "] homepage: "https://github.com/janestreet/ppx_variants_conv" bug-reports: "https://github.com/janestreet/ppx_variants_conv/issues" dev-repo: "git+https://github.com/janestreet/ppx_variants_conv.git" +doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_variants_conv/index.html" license: "MIT" build: [ - ["jbuilder" "build" "-p" name "-j" jobs] + ["dune" "build" "-p" name "-j" jobs] ] depends: [ + "ocaml" {>= "4.04.2"} "base" "variantslib" - "jbuilder" {build & >= "1.0+beta18.1"} - "ocaml-migrate-parsetree" {>= "1.0"} - "ppxlib" {>= "0.1.0"} + "dune" {build & >= "1.5.1"} + "ppxlib" {>= "0.4.0"} ] -available: [ ocaml-version >= "4.04.2" ] -descr: " -Generation of accessor and iteration functions for ocaml variant types - +synopsis: "Generation of accessor and iteration functions for ocaml variant types" +description: " Part of the Jane Street's PPX rewriters collection. " diff --git a/src/dune b/src/dune new file mode 100644 index 0000000..6bc5257 --- /dev/null +++ b/src/dune @@ -0,0 +1,3 @@ +(library (name ppx_variants_conv) (public_name ppx_variants_conv) + (kind ppx_deriver) (ppx_runtime_libraries variantslib) + (libraries base ppxlib) (preprocess (pps ppxlib.metaquot))) \ No newline at end of file diff --git a/src/jbuild b/src/jbuild deleted file mode 100644 index 5ed098d..0000000 --- a/src/jbuild +++ /dev/null @@ -1,10 +0,0 @@ -(library - ((name ppx_variants_conv) - (public_name ppx_variants_conv) - (kind ppx_deriver) - (ppx_runtime_libraries (variantslib)) - (libraries (base ppxlib)) - (preprocess (pps (ppxlib.metaquot ppxlib.runner))))) - - -(jbuild_version 1) diff --git a/test/dune b/test/dune new file mode 100644 index 0000000..e69de29 diff --git a/test/jbuild b/test/jbuild deleted file mode 100644 index a407603..0000000 --- a/test/jbuild +++ /dev/null @@ -1,3 +0,0 @@ - - -(jbuild_version 1)