CHANGES.md

+v1.2.0 2018-12-19 London
+------------------------
+
+- Remove unused ocamlfind dependency in the opam file (#53, @diml)
+
+- Add `--print-transformations` to list registered transformations
+  (#55, @rgrinberg)
+
+- Fix Windows compatibility by setting the output to binary mode when
+  writing a binary ast (#57, #59, @bryphe and @dra27)
+
+- Switch to dune and opam 2.0 (#58, #60, @diml)
+
+v1.1.0 2018-09-05 London
+------------------------
+
+- Allow ppx rewriters to specify when they should be applied
+
+v1.0.11 2018-06-06 London
+-------------------------
+
+- Fix handling of `--impl/--intf`. Before the driver would crash if
+  the file extension was neither `.ml` nor `.mli`
+
 v1.0.10 2018-04-19 London
 -------------------------
 

Makefile

@@ -7,15 +7,15 @@ INSTALL_ARGS := $(if $(PREFIX),--prefix $(PREFIX),)
 
 .PHONY: all
 all:
-	jbuilder build @install
+	dune build @install
 
 .PHONY: install
 install:
-	jbuilder install $(INSTALL_ARGS)
+	dune install $(INSTALL_ARGS)
 
 .PHONY: uninstall
 uninstall:
-	jbuilder uninstall $(INSTALL_ARGS)
+	dune uninstall $(INSTALL_ARGS)
 
 .PHONY: reinstall
 reinstall:
@@ -24,11 +24,11 @@ reinstall:
 
 .PHONY: test
 test:
-	jbuilder runtest
+	dune runtest
 
 .PHONY: all-supported-ocaml-versions
 all-supported-ocaml-versions:
-	jbuilder runtest --workspace jbuild-workspace.dev
+	dune runtest --workspace jbuild-workspace.dev
 
 .PHONY: cinaps
 cinaps:

bin/dune

+(executables
+ (names ocaml_migrate_parsetree)
+ (libraries migrate_parsetree))

bin/jbuild

-(jbuild_version 1)
-
-(executables
- ((names (ocaml_migrate_parsetree))
-  (libraries (migrate_parsetree))))

debian/changelog

+ocaml-migrate-parsetree (1.2.0-1) unstable; urgency=medium
+
+  * New upstream release.
+    + Update Build-Depends and d/rules. (Closes: #917058)
+
+ -- Andy Li <andy@onthewings.net>  Sun, 23 Dec 2018 21:15:28 +0800
+
 ocaml-migrate-parsetree (1.0.10-2) unstable; urgency=medium
 
   * Fix dh_ocamldoc usage.

debian/control

@@ -8,7 +8,8 @@ Build-Depends:
  debhelper (>= 10.3),
  ocaml-nox (>= 4.02.0),
  ocamlbuild,
- dune,
+ dune (>= 1.6.0),
+ libppx-derivers-ocaml-dev,
  libresult-ocaml-dev,
  ocaml-compiler-libs,
  ocaml-findlib,

debian/libmigrate-parsetree-ocaml-doc.ocamldoc.in

 # Documentation generated by dh_ocamldoc
 --include debian/tmp@OCamlStdlibDir@
+-package ppx_derivers
 -package result
 -package compiler-libs
 -package ocamlbuild

debian/libmigrate-parsetree-ocaml.install.in

@@ -3,4 +3,4 @@
 @OCamlStdlibDir@/ocaml-migrate-parsetree/{,**/}*.cma
 DYN: @OCamlStdlibDir@/ocaml-migrate-parsetree/{,**/}*.cmxs
 
-doc/ocaml-migrate-parsetree/{CHANGES.md,README.md,MANUAL.md} /usr/share/doc/ocaml-migrate-parsetree/
\ No newline at end of file
+usr/doc/ocaml-migrate-parsetree/{CHANGES.md,README.md,MANUAL.md,LICENSE.md} /usr/share/doc/ocaml-migrate-parsetree/
\ No newline at end of file

debian/libmigrate-parsetree-ocamlbuild-ocaml.install.in

@@ -3,4 +3,4 @@
 @OCamlStdlibDir@/ocaml-migrate-parsetree-ocamlbuild/{,**/}*.cma
 DYN: @OCamlStdlibDir@/ocaml-migrate-parsetree-ocamlbuild/{,**/}*.cmxs
 
-doc/ocaml-migrate-parsetree-ocamlbuild/{CHANGES.md,README.md} /usr/share/doc/ocaml-migrate-parsetree-ocamlbuild/
\ No newline at end of file
+usr/doc/ocaml-migrate-parsetree-ocamlbuild/{CHANGES.md,README.md,LICENSE.md} /usr/share/doc/ocaml-migrate-parsetree-ocamlbuild/
\ No newline at end of file

debian/rules

@@ -11,7 +11,7 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
 	mkdir -p '$(OCAMLFIND_DESTDIR)'
-	dh_auto_install -- INSTALL_ARGS='--destdir=$(DESTDIR) --libdir=$(OCAMLFIND_DESTDIR) --verbose'
+	dh_auto_install -- INSTALL_ARGS='--destdir=$(DESTDIR) --verbose'
 
 override_dh_missing:
 	dh_missing --fail-missing

dune

+(install
+ (section doc)
+ (package ocaml-migrate-parsetree)
+ (files MANUAL.md))

dune-project

+(lang dune 1.6)
+(name ocaml-migrate-parsetree)

jbuild

-(install
- ((section doc)
-  (package ocaml-migrate-parsetree)
-  (files (MANUAL.md))))

ocaml-migrate-parsetree-ocamlbuild.opam

-opam-version: "1.2"
+opam-version: "2.0"
 maintainer: "frederic.bour@lakaban.net"
 authors: [
   "Jérémie Dimino <jeremie@dimino.org>"
@@ -6,7 +6,7 @@ authors: [
 license: "LGPL-2.1"
 homepage: "https://github.com/let-def/ocaml-migrate-parsetree"
 bug-reports: "https://github.com/let-def/ocaml-migrate-parsetree/issues"
-dev-repo: "git://github.com/let-def/ocaml-migrate-parsetree.git"
+dev-repo: "git+https://github.com/let-def/ocaml-migrate-parsetree.git"
 tags: [ "syntax" "org:ocamllabs" ]
 build: [
   ["jbuilder" "build" "-p" name "-j" jobs]
@@ -15,5 +15,11 @@ depends: [
   "jbuilder" {build & >= "1.0+beta7"}
   "ocaml-migrate-parsetree"
   "ocamlbuild"
+  "ocaml" {>= "4.02.0"}
 ]
-available: ocaml-version >= "4.02.0"
+synopsis: "Ocamlbuild plugin for ocaml-migrate-parsetree"
+description: """
+This package provides an ocamlbuild plugin that can be used to produce
+optimized on-demand statically linked ppx drivers, as Dune does
+by default.
+"""

ocaml-migrate-parsetree.descr

-Convert OCaml parsetrees between different versions 
-
-This library converts parsetrees, outcometree and ast mappers between different OCaml versions.
-High-level functions help making PPX rewriters independent of a compiler version.

ocaml-migrate-parsetree.opam

-opam-version: "1.2"
+opam-version: "2.0"
 maintainer: "frederic.bour@lakaban.net"
 authors: [
   "Frédéric Bour <frederic.bour@lakaban.net>"
@@ -7,14 +7,23 @@ authors: [
 license: "LGPL-2.1"
 homepage: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree"
 bug-reports: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/issues"
-dev-repo: "git://github.com/ocaml-ppx/ocaml-migrate-parsetree.git"
+dev-repo: "git+https://github.com/ocaml-ppx/ocaml-migrate-parsetree.git"
+doc: "https://ocaml-ppx.github.io/ocaml-migrate-parsetree/"
 tags: [ "syntax" "org:ocamllabs" ]
 build: [
   ["jbuilder" "build" "-p" name "-j" jobs]
 ]
 depends: [
   "result"
-  "ocamlfind" {build}
-  "jbuilder" {build & >= "1.0+beta18.1"}
+  "ppx_derivers"
+  "dune" {build}
+  "ocaml" {>= "4.02.0"}
 ]
-available: ocaml-version >= "4.02.0"
+synopsis: "Convert OCaml parsetrees between different versions"
+description: """
+Convert OCaml parsetrees between different versions
+
+This library converts parsetrees, outcometree and ast mappers between
+different OCaml versions.  High-level functions help making PPX
+rewriters independent of a compiler version.
+"""

ocamlbuild_plugin/dune

+(library
+ (name        migrate_parsetree_ocamlbuild)
+ (public_name ocaml-migrate-parsetree-ocamlbuild)
+ (synopsis    "ocamlbuild plugin for automatically generating ppx dirvers")
+ (libraries   ocamlbuild))

ocamlbuild_plugin/jbuild

-(library
- ((name        migrate_parsetree_ocamlbuild)
-  (public_name ocaml-migrate-parsetree-ocamlbuild)
-  (synopsis    "ocamlbuild plugin for automatically generating ppx dirvers")
-  (libraries   (ocamlbuild))))
-
-(jbuild_version 1)

pkg/pkg.ml

-#use "topfind"
-#require "topkg-jbuilder.auto"

src/dune

+(library
+ (name migrate_parsetree)
+ (public_name ocaml-migrate-parsetree)
+ (wrapped false)
+ (libraries compiler-libs.common result ppx_derivers)
+ (flags :standard -open Result)
+ (modules :standard \ migrate_parsetree_driver_main)
+ (preprocess (action (run %{exe:../tools/pp.exe} %{read:ast-version}
+                       %{input-file})))
+ (ppx.driver
+  (main       Migrate_parsetree.Driver.run_main)
+  (flags      --dump-ast)
+  (lint_flags --null)))
+
+(library
+ (name migrate_parsetree_driver_main)
+ (public_name ocaml-migrate-parsetree.driver-main)
+ (modules migrate_parsetree_driver_main)
+ (library_flags -linkall)
+ (libraries migrate_parsetree))
+
+(rule
+ (copy#
+  compiler-functions/%{read:compiler-functions-file}
+  migrate_parsetree_compiler_functions.ml))
+
+(rule
+ (targets ast-version compiler-functions-file)
+ (action  (run %{ocaml} %{dep:config/gen.ml} %{ocaml_version})))