Unvendor ppx_tools_versioned (#1138)

* Un-vendor ppx_tools_versioned

* Some other stuff

* I guess these are necessary for CI to pass?

* Fix package.json.in version

* Update version in subst package.json

Makefile

@@ -22,7 +22,6 @@ setup_convenient_bin_links:
 precompile:
 	cp pkg/META.in pkg/META
 	ocamlbuild -package topkg pkg/build.native
-	ocamlbuild -package ocaml-migrate-parsetree vendor/ppx_tools_versioned/ppx_metaquot_404.native
 
 build_without_utop: compile_error setup_convenient_bin_links precompile
 	./build.native build --utop false

_tags

@@ -5,10 +5,9 @@ true: warn(@5@8@10@11@12@14@23-24@26@29@40), bin_annot, safe_string, debug
 <bspacks/**>: -traverse
 "formatTest": -traverse
 "src": include
-<src/*>: package(menhirLib unix compiler-libs.common ocamlbuild findlib merlin_extend result dynlink findlib.dynload ocaml-migrate-parsetree)
+<src/*>: package(menhirLib unix compiler-libs.common ocamlbuild findlib merlin_extend result dynlink findlib.dynload ocaml-migrate-parsetree ppx_tools_versioned.metaquot_404)
 <src/reason_utop.*>: package(menhirLib utop)
-<vendor/ppx_deriving/*>: ppx(./vendor/ppx_tools_versioned/ppx_metaquot_404.native)
-<vendor/ppx_deriving/*>|<vendor/ppx_tools_versioned/*>: package(compiler-libs.common findlib result ocaml-migrate-parsetree)
+<vendor/ppx_deriving/*>: package(compiler-libs.common findlib result ocaml-migrate-parsetree ppx_tools_versioned.metaquot_404)
 
 <src_gen/*>: package(sedlex)
 

opam

@@ -14,7 +14,6 @@ substs: [ "pkg/META" ]
 build: [
   [make "compile_error"]
   ["ocamlbuild" "-package" "topkg" "pkg/build.native"]
-  ["ocamlbuild" "-package" "ocaml-migrate-parsetree" "vendor/ppx_tools_versioned/ppx_metaquot_404.native"]
   ["./build.native" "build"
                     "--native" "%{ocaml-native}%"
                     "--native-dynlink" "%{ocaml-native-dynlink}%"
@@ -24,13 +23,14 @@ build-test: [
   "ocamlbuild" "-classic-display" "-use-ocamlfind" "src_test/test_reason.byte" "--"
 ]
 depends: [
-  "ocamlfind"    {build}
-  "utop"         {>= "1.17"}
-  "menhir"       {>= "20160303"}
-  "merlin-extend"{>= "0.3"}
-  "result"       {=  "1.2"}
-  "topkg"        {=  "0.8.1"}
+  "ocamlfind"               {build}
+  "utop"                    {>= "1.17"}
+  "menhir"                  {>= "20160303"}
+  "merlin-extend"           {>= "0.3"}
+  "result"                  {=  "1.2"}
+  "topkg"                   {=  "0.8.1"}
   "ocaml-migrate-parsetree"
+  "ppx_tools_versioned"     {= "5.0alpha"}
 ]
 depopts: [
 ]

opam.in

@@ -13,7 +13,6 @@ substs: [ "pkg/META" ]
 build: [
   [make "compile_error"]
   ["ocamlbuild" "-package" "topkg" "pkg/build.native"]
-  ["ocamlbuild" "-package" "ocaml-migrate-parsetree" "vendor/ppx_tools_versioned/ppx_metaquot_404.native"]
   ["./build.native" "build"
                     "--native" "%{ocaml-native}%"
                     "--native-dynlink" "%{ocaml-native-dynlink}%"
@@ -23,13 +22,14 @@ build-test: [
   "ocamlbuild" "-classic-display" "-use-ocamlfind" "src_test/test_reason.byte" "--"
 ]
 depends: [
-  "ocamlfind"    {build}
-  "utop"         {>= "1.17"}
-  "menhir"       {>= "20160303"}
-  "merlin-extend"{>= "0.3"}
-  "result"       {=  "1.2"}
-  "topkg"        {=  "0.8.1"}
+  "ocamlfind"               {build}
+  "utop"                    {>= "1.17"}
+  "menhir"                  {>= "20160303"}
+  "merlin-extend"           {>= "0.3"}
+  "result"                  {=  "1.2"}
+  "topkg"                   {=  "0.8.1"}
   "ocaml-migrate-parsetree"
+  "ppx_tools_versioned"     {= "5.0alpha"}
 ]
 depopts: [
 ]

package.json

@@ -55,6 +55,7 @@
         "@opam-alpha/ocaml-migrate-parsetree": "*",
         "@opam-alpha/result": "*",
         "@opam-alpha/topkg": "0.8.1",
+        "@opam-alpha/ppx_tools_versioned": "5.0.0",
         "dependency-env": "*",
         "opam-installer-bin": "https://github.com/yunxing/opam-installer-bin.git",
         "nopam": "*",

package.json.in

@@ -54,6 +54,7 @@
         "@opam-alpha/ocaml-migrate-parsetree": "*",
         "@opam-alpha/result": "*",
         "@opam-alpha/topkg": "0.8.1",
+        "@opam-alpha/ppx_tools_versioned": "5.0.0",
         "dependency-env": "*",
         "opam-installer-bin": "https://github.com/yunxing/opam-installer-bin.git",
         "nopam": "*",

package.ml

@@ -1,4 +1,4 @@
 
 let version = "1.10.2"
-let git_version = "92b107b4bd08b501b6663d77b41feb8d01ac717d"
-let git_short_version = "92b107b"
+let git_version = "e3576ae51a73647b7f1e0c73286e91d4d3f35692"
+let git_short_version = "e3576ae"

pkg/META.in

@@ -12,13 +12,16 @@ preprocessor = "ocamlreason_preprocessor_where_does_this_end_up"
 # Toplevel
 archive(byte, toploop) = "@compiler-libs/ocamlcommon.cma"
 archive(byte, toploop) += "@result/result.cmo"
-archive(byte, toploop) += "easy_format.cmo ast_convenience_404.cmo ppx_deriving.cmo ppx_deriving_show.cmo reason.cma"
+archive(byte, toploop) += "@ppx_tools_versioned/ppx_tools_versioned.cma"
+archive(byte, toploop) += "easy_format.cmo ppx_deriving.cmo ppx_deriving_show.cmo reason.cma"
 archive(byte, toploop) += "@menhirLib/menhirLib.cmo"
 archive(byte, toploop, -pkg_utop) += "reason_toploop.cmo"
 archive(byte, toploop, pkg_utop) += "reason_utop.cmo"
 
 archive(byte) = "@result/result.cmo"
-archive(byte) += "ast_convenience_404.cmo ppx_deriving.cmo ppx_deriving_show.cmo reason.cma"
+archive(byte) += "@ppx_tools_versioned/ppx_tools_versioned.cma"
+archive(byte) += "ppx_deriving.cmo ppx_deriving_show.cmo reason.cma"
+
 archive(native) = "reason.cmxa"
 
 package "lib" (

pkg/build.ml

@@ -23,7 +23,6 @@ let () =
                                   % "-I,+ocamldoc"
                                   %% (v "-I" % "vendor/cmdliner")
                                   %% (v "-I" % "vendor/easy_format")
-                                  %% (v "-I" % "vendor/ppx_tools_versioned")
                                   %% (v "-I" % "vendor/ppx_deriving")
                                   %% of_list files)
   in
@@ -53,10 +52,6 @@ let () =
     Pkg.lib ~exts:(Exts.exts [".cmo"; ".cmx";".cmi"; ".cmt"; ".cmxs"]) "src/redoc_html";
     Pkg.lib ~exts:(Exts.exts [".cmo"; ".cmx";".cmi"; ".cmt"]) "vendor/cmdliner/cmdliner";
     Pkg.lib ~exts:(Exts.exts [".cmo"; ".cmx";".cmi"; ".cmt"]) "vendor/easy_format/easy_format";
-    (* TODO: clean up all this nonsense when ppx_tools_versioned is released on
-       opam *)
-    Pkg.lib ~exts:(Exts.exts [".cmo"; ".cmx";".cmi"; ".cmt"]) "vendor/ppx_tools_versioned/ast_convenience_404";
-    Pkg.bin ~auto:true "vendor/ppx_tools_versioned/ppx_metaquot_404" ~dst:"metaquot";
     Pkg.lib ~exts:(Exts.exts [".cmo"; ".cmx";".cmi"; ".cmt"]) "vendor/ppx_deriving/ppx_deriving";
     Pkg.lib ~exts:(Exts.exts [".cmo"; ".cmx";".cmi"; ".cmt"]) "vendor/ppx_deriving/ppx_deriving_show";
     Pkg.lib ~exts:Exts.library "src/reasondoc";