OASIS: Use the compiled_setup_ml AlphaFeature

Author: kit-ty-kate

Makefile

@@ -1,38 +1,46 @@
 # OASIS_START
-# DO NOT EDIT (digest: 7b2408909643717852b95f994b273fee)
+# DO NOT EDIT (digest: 9a60866e2fa295c5e33a3fe33b8f3a32)
 
-SETUP = ocaml setup.ml
+SETUP = ./setup.exe
 
-build: setup.data
+build: setup.data $(SETUP)
 	$(SETUP) -build $(BUILDFLAGS)
 
-doc: setup.data build
+doc: setup.data $(SETUP) build
 	$(SETUP) -doc $(DOCFLAGS)
 
-test: setup.data build
+test: setup.data $(SETUP) build
 	$(SETUP) -test $(TESTFLAGS)
 
-all:
+all: $(SETUP)
 	$(SETUP) -all $(ALLFLAGS)
 
-install: setup.data
+install: setup.data $(SETUP)
 	$(SETUP) -install $(INSTALLFLAGS)
 
-uninstall: setup.data
+uninstall: setup.data $(SETUP)
 	$(SETUP) -uninstall $(UNINSTALLFLAGS)
 
-reinstall: setup.data
+reinstall: setup.data $(SETUP)
 	$(SETUP) -reinstall $(REINSTALLFLAGS)
 
-clean:
+clean: $(SETUP)
 	$(SETUP) -clean $(CLEANFLAGS)
 
-distclean:
+distclean: $(SETUP)
 	$(SETUP) -distclean $(DISTCLEANFLAGS)
+	$(RM) $(SETUP)
 
-setup.data:
+setup.data: $(SETUP)
 	$(SETUP) -configure $(CONFIGUREFLAGS)
 
+configure: $(SETUP)
+	$(SETUP) -configure $(CONFIGUREFLAGS)
+
+setup.exe: setup.ml
+	ocamlfind ocamlopt -o $@ -linkpkg -package oasis.dynrun $< || ocamlfind ocamlc -o $@ -linkpkg -package oasis.dynrun $< || true
+	$(RM) setup.cmi setup.cmo setup.cmx setup.o
+
 .PHONY: build doc test all install uninstall reinstall clean distclean configure
 
 # OASIS_STOP

_oasis

@@ -1,12 +1,13 @@
-OASISFormat: 0.3
+OASISFormat: 0.4
 Name: macaque
 Version: 0.6.1
 Synopsis: MaCaQue (or macaque) is a DSL for SQL Queries in Caml
 Authors:
   Gabriel Scherer,
   Jérôme Vouillon
 License: LGPL-2 with OCaml linking exception
-Plugins: DevFiles (0.3), META (0.3)
+Plugins: DevFiles (0.4), META (0.4)
+AlphaFeatures: compiled_setup_ml
 BuildTools: ocamlbuild
 
 Library "macaque"

configure

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # OASIS_START
-# DO NOT EDIT (digest: dc86c2ad450f91ca10c931b6045d0499)
+# DO NOT EDIT (digest: 6f7b8221311e800a7093dc3b793f67ca)
 set -e
 
 FST=true
@@ -23,5 +23,5 @@ for i in "$@"; do
   esac
 done
 
-ocaml setup.ml -configure "$@"
+make configure CONFIGUREFLAGS="$*"
 # OASIS_STOP

setup.ml

@@ -1,12 +1,30 @@
 (* setup.ml generated for the first time by OASIS v0.3.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: a8ec13643733e93ac1ad6216802516bc) *)
-let () =
-  try Topdirs.dir_directory (Sys.getenv "OCAML_TOPLEVEL_PATH")
-  with Not_found -> ();;
-#use "topfind";;
-#require "oasis.dynrun";;
-open OASISDynRun;;
+(* DO NOT EDIT (digest: 172e37fc4b327922311f6cf9389bc560) *)
+(******************************************************************************)
+(* OASIS: architecture for building OCaml libraries and applications          *)
+(*                                                                            *)
+(* Copyright (C) 2011-2013, Sylvain Le Gall                                   *)
+(* Copyright (C) 2008-2011, OCamlCore SARL                                    *)
+(*                                                                            *)
+(* This library is free software; you can redistribute it and/or modify it    *)
+(* under the terms of the GNU Lesser General Public License as published by   *)
+(* the Free Software Foundation; either version 2.1 of the License, or (at    *)
+(* your option) any later version, with the OCaml static compilation          *)
+(* exception.                                                                 *)
+(*                                                                            *)
+(* This library is distributed in the hope that it will be useful, but        *)
+(* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *)
+(* or FITNESS FOR A PARTICULAR PURPOSE. See the file COPYING for more         *)
+(* details.                                                                   *)
+(*                                                                            *)
+(* You should have received a copy of the GNU Lesser General Public License   *)
+(* along with this library; if not, write to the Free Software Foundation,    *)
+(* Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA              *)
+(******************************************************************************)
+
+open OASISDynRun
+
 (* OASIS_STOP *)
 let () = setup ();;