114.20+69

.gitignore

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

META.ab

@@ -1,9 +0,0 @@
-version = "$(pkg_version)"
-description = "Monadic let-bindings"
-requires = "compiler-libs.common ppx_core ppx_driver"
-archive(ppx_driver, byte  ) = "ppx_let.cma"
-archive(ppx_driver, native) = "ppx_let.cmxa"
-plugin(ppx_driver, byte  ) = "ppx_let.cma"
-plugin(ppx_driver, native) = "ppx_let.cmxs"
-exists_if = "ppx_let.cma"
-ppx(-ppx_driver,-custom_ppx) = "./ppx"

Makefile

@@ -1,68 +1,18 @@
-# Generic Makefile for oasis project
-
-SETUP := setup.exe
 NAME := ppx_let
-PREFIX ?= $(shell grep ^prefix= setup.data | cut -d\" -f 2)
 
 # Default rule
-default: build
+default:
+	jbuilder build-package $(NAME)
 
-setup.exe: _oasis setup.ml
+install:
-	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
-
-install: $(NAME).install
 	opam-installer -i --prefix $(PREFIX) $(NAME).install
 
-uninstall: $(NAME).install
+uninstall:
 	opam-installer -u --prefix $(PREFIX) $(NAME).install
 
-reinstall: $(NAME).install
+reinstall: uninstall reinstall
-	opam-installer -u --prefix $(PREFIX) $(NAME).install &> /dev/null || true
-	opam-installer -i --prefix $(PREFIX) $(NAME).install
 
-bin.tar.gz: $(NAME).install
+clean:
-	rm -rf _install
+	rm -rf _build
-	mkdir _install
-	opam-installer -i --prefix _install $(NAME).install
-	tar czf bin.tar.gz -C _install .
-	rm -rf _install
 
-bin.lzo: $(NAME).install
+.PHONY: default install uninstall reinstall clean
-	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)
-
-setup.data: $(SETUP)
-	./$(SETUP) -configure $(CONFIGUREFLAGS)
-
-.PHONY: default build doc test all install uninstall reinstall clean distclean configure

_oasis

@@ -1,37 +0,0 @@
-OASISFormat:           0.4
-OCamlVersion:          >= 4.03.0
-FindlibVersion:        >= 1.3.2
-Name:                  ppx_let
-Version:               114.08+89
-Synopsis:              Monadic let-bindings
-Authors:               Jane Street Group, LLC <opensource@janestreet.com>
-Copyrights:            (C) 2015-2016 Jane Street Group LLC <opensource@janestreet.com>
-Maintainers:           Jane Street Group, LLC <opensource@janestreet.com>
-License:               Apache-2.0
-LicenseFile:           LICENSE.txt
-Homepage:              https://github.com/janestreet/ppx_let
-Plugins:               StdFiles (0.3), DevFiles (0.3)
-XStdFilesAUTHORS:      false
-XStdFilesREADME:       false
-BuildTools:            ocamlbuild
-BetaFeatures:          section_object
-AlphaFeatures:         ocamlbuild_more_args
-XOCamlbuildPluginTags: package(js-build-tools.ocamlbuild_goodies)
-FilesAB:               META.ab
-Description:
-  Part of the Jane Street's PPX rewriters collection.
-
-Library ppx_let
-  Path:         src
-  Pack:         false
-  Modules:      Ppx_let
-  BuildDepends: compiler-libs.common,
-                ppx_core,
-                ppx_driver
-
-Executable ppx
-  Path:           as_ppx
-  MainIs:         ppx.ml
-  CompiledObject: best
-  BuildDepends:   ppx_let,
-                  ppx_driver

_tags

@@ -1,8 +0,0 @@
-<**/*.ml{,i}>: warn(-40), no_alias_deps
-<**/*>: thread
-# This prevents the implicit addition of -ppx options by ocamlfind
-<**/*>: predicate(custom_ppx)
-<as_ppx/ppx.{byte,native}>: predicate(ppx_driver)
-<src/*>: linkall
-# OASIS_START
-# OASIS_STOP

as_ppx/ppx.ml

@@ -1 +0,0 @@
-Ppx_driver.run_as_ppx_rewriter ()

configure

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# OASIS_START
-make configure CONFIGUREFLAGS="$*"
-# OASIS_STOP

descr

@@ -1,2 +0,0 @@
-Monadic let-bindings
-Part of the Jane Street's PPX rewriters collection.

install.ml

@@ -1,10 +0,0 @@
-#use "topfind";;
-#require "js-build-tools.oasis2opam_install";;
-
-open Oasis2opam_install;;
-
-generate ~package:"ppx_let"
-  [ oasis_lib "ppx_let"
-  ; file "META" ~section:"lib"
-  ; oasis_exe "ppx" ~dest:"../lib/ppx_let/ppx"
-  ]

myocamlbuild.ml

@@ -1,14 +0,0 @@
-(* OASIS_START *)
-(* OASIS_STOP *)
-# 3 "myocamlbuild.ml"
-
-module JS = Jane_street_ocamlbuild_goodies
-
-let dev_mode = true
-
-let () =
-  Ocamlbuild_plugin.dispatch (fun hook ->
-    JS.alt_cmxs_of_cmxa_rule hook;
-    JS.pass_predicates_to_ocamldep hook;
-    if dev_mode && not Sys.win32 then JS.track_external_deps hook;
-    dispatch_default hook)

ppx_let.opam

@@ -6,16 +6,16 @@ bug-reports: "https://github.com/janestreet/ppx_let/issues"
 dev-repo: "https://github.com/janestreet/ppx_let.git"
 license: "Apache-2.0"
 build: [
-  ["./configure" "--prefix" prefix]
+  ["jbuilder" "build-package" "ppx_let" "-j" jobs]
-  [make]
 ]
 depends: [
-  "ocamlbuild"     {build}
+  "jbuilder"
-  "oasis"          {build & >= "0.4"}
-  "ocamlfind"      {build & >= "1.3.2"}
-  "js-build-tools" {build}
   "ppx_core"
   "ppx_driver"
 ]
 available: [ ocaml-version >= "4.03.0" ]
-conflicts: [ "oasis" {= "0.4.7"} ]
+descr: "
+Monadic let-bindings
+
+Part of the Jane Street's PPX rewriters collection.
+"

setup.ml

@@ -1,6 +0,0 @@
-(* OASIS_START *)
-open OASISDynRun;;
-open OASISTypes;;
-(* OASIS_STOP *)
-
-let () = setup ()

src/jbuild

@@ -1,7 +1,6 @@
 (library
  ((name ppx_let)
   (public_name ppx_let)
-  (public_release ((kind ppx_rewriter)))
+  (kind ppx_rewriter)
-  (wrapped false)
+  (libraries (compiler-libs.common ppx_core ppx_driver))
-  (libraries (ocamlcommon ppx_core ppx_driver))
+  (preprocess no_preprocessing)))
-  (preprocess ((no_preprocessing All)))))

test/jbuild

@@ -1,6 +1,6 @@
 (executables
  ((names (test))
-  (preprocess (((pps (ppx_let)) All)))))
+  (preprocess (pps (ppx_let)))))
 
 (toplevel_expect_tests
  ((libraries (ppx_let))))