From 9f8d67723cfd58ad00cccd4393bf6211baf92ad6 Mon Sep 17 00:00:00 2001 From: ygrek Date: Wed, 12 Jul 2017 18:58:10 -0700 Subject: [PATCH] make oasis --- Makefile | 6 +++++- _tags | 43 +++++++++++++++++++++++++++++++++++++++++++ setup.ml | 6 ++++-- 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3951867..e857a11 100644 --- a/Makefile +++ b/Makefile @@ -60,5 +60,9 @@ release: gpg -a -b $(NAME).tar.gz .PHONY: oasis +# partially dynamic setup +# needed to have clean builds because of modifications to _tags oasis: - oasis setup -setup-update dynamic + oasis setup + git checkout setup.ml + rm -f **/*.clib **/*.mllib **/*.mldylib **/*.mlpack **/*.odocl **/META myocamlbuild.ml diff --git a/_tags b/_tags index 6f659c6..ff8fa53 100644 --- a/_tags +++ b/_tags @@ -1,4 +1,47 @@ # OASIS_START +# DO NOT EDIT (digest: 8ab06ee0b3001b2b21a3e3de45fd123d) +# Ignore VCS directories, you can use the same kind of rule outside +# OASIS_START/STOP if you want to exclude directories that contains +# useless stuff for the build process +true: annot, bin_annot +<**/.svn>: -traverse +<**/.svn>: not_hygienic +".bzr": -traverse +".bzr": not_hygienic +".hg": -traverse +".hg": not_hygienic +".git": -traverse +".git": not_hygienic +"_darcs": -traverse +"_darcs": not_hygienic +# Library sqlgg +"lib/sqlgg.cmxs": use_sqlgg +"lib/props.cmx": for-pack(Sqlgg) +"lib/sql.cmx": for-pack(Sqlgg) +"lib/stmt.cmx": for-pack(Sqlgg) +"lib/tables.cmx": for-pack(Sqlgg) +"lib/syntax.cmx": for-pack(Sqlgg) +"lib/prelude.cmx": for-pack(Sqlgg) +: package(deriving) +: package(extlib) +# Executable sqlgg +: package(deriving) +: package(extlib) +: package(oUnit) +: use_sqlgg +: package(deriving) +: package(extlib) +: package(oUnit) +: use_sqlgg +# Library sqlgg_traits +"impl/sqlgg_traits.cmxs": use_sqlgg_traits +# Library sqlgg_mysql +"impl/sqlgg_mysql.cmxs": use_sqlgg_mysql +: package(mysql) +# Library sqlgg_sqlite3 +"impl/sqlgg_sqlite3.cmxs": use_sqlgg_sqlite3 +: package(sqlite3) +: use_sqlgg_traits # OASIS_STOP true: annot, warn(+A-e-40-41-42-44-45) true: use_menhir diff --git a/setup.ml b/setup.ml index fe8169f..a0e92ea 100644 --- a/setup.ml +++ b/setup.ml @@ -1,11 +1,11 @@ (* setup.ml generated for the first time by OASIS v0.4.4 *) (* OASIS_START *) -(* DO NOT EDIT (digest: 9852805d5c19ca1cb6abefde2dcea323) *) +(* DO NOT EDIT (digest: a426e2d026defb34183b787d31fbdcff) *) (******************************************************************************) (* OASIS: architecture for building OCaml libraries and applications *) (* *) -(* Copyright (C) 2011-2013, Sylvain Le Gall *) +(* Copyright (C) 2011-2016, Sylvain Le Gall *) (* Copyright (C) 2008-2011, OCamlCore SARL *) (* *) (* This library is free software; you can redistribute it and/or modify it *) @@ -33,5 +33,7 @@ let () = #require "oasis.dynrun";; open OASISDynRun;; +let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t +open BaseCompat.Compat_0_4 (* OASIS_STOP *) let () = setup ();;