114.20+69

This commit is contained in:
Jeremie Dimino 2016-12-15 11:20:46 +00:00
parent 66bdeab540
commit 61368ef5d3
14 changed files with 22 additions and 169 deletions

10
.gitignore vendored
View File

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

View File

@ -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"

View File

@ -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
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
install:
opam-installer -i --prefix $(PREFIX) $(NAME).install
uninstall: $(NAME).install
uninstall:
opam-installer -u --prefix $(PREFIX) $(NAME).install
reinstall: $(NAME).install
opam-installer -u --prefix $(PREFIX) $(NAME).install &> /dev/null || true
opam-installer -i --prefix $(PREFIX) $(NAME).install
reinstall: uninstall reinstall
bin.tar.gz: $(NAME).install
rm -rf _install
mkdir _install
opam-installer -i --prefix _install $(NAME).install
tar czf bin.tar.gz -C _install .
rm -rf _install
clean:
rm -rf _build
bin.lzo: $(NAME).install
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
.PHONY: default install uninstall reinstall clean

37
_oasis
View File

@ -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

8
_tags
View File

@ -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

View File

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

5
configure vendored
View File

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

2
descr
View File

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

View File

@ -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"
]

View File

@ -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)

View File

@ -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]
[make]
["jbuilder" "build-package" "ppx_let" "-j" jobs]
]
depends: [
"ocamlbuild" {build}
"oasis" {build & >= "0.4"}
"ocamlfind" {build & >= "1.3.2"}
"js-build-tools" {build}
"jbuilder"
"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.
"

View File

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

View File

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

View File

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