Declare num ocamlfind dependency, call it 0.8.1

ocsigen · Feb 1, 2018 · d993edd · d993edd
1 parent 0021e02
commit d993edd
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+== 0.8.1
+
+  * Declare dependency on 'num'. Fixes build on OS X.
+
 == 0.8
 
   * Compatibility with OCaml 4.06 (-safe-string)

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 9a60866e2fa295c5e33a3fe33b8f3a32)
+# DO NOT EDIT (digest: 658582336b0f135eb71fa94307014b50)
 
 SETUP = ./setup.exe
 
@@ -37,9 +37,9 @@ setup.data: $(SETUP)
 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
+setup.exe: setup.ml _oasis
+	ocamlfind ocamlopt -o $@ -linkpkg -package oasis.dynrun setup.ml || ocamlfind ocamlc -o $@ -linkpkg -package oasis.dynrun setup.ml || true
+	$(RM) setup.cmi setup.cmo setup.cmx setup.o setup.cmt
 
 .PHONY: build doc test all install uninstall reinstall clean distclean configure
 

diff --git a/_oasis b/_oasis
@@ -1,7 +1,7 @@
 OASISFormat: 0.4
 Name:        deriving
 OCamlVersion: >= 4.03.0
-Version:     0.8
+Version:     0.8.1
 Synopsis:    Extension to OCaml for deriving functions from type declarations
 Authors:     Jeremy Yallop
 License:     MIT
@@ -30,7 +30,7 @@ Library "deriving_num"
   FindlibParent : deriving
   FindlibName   : num
   Modules       : Deriving_num
-  BuildDepends  : deriving
+  BuildDepends  : deriving,num
 
 Library "pa_deriving_classes"
   Path          : syntax/classes

diff --git a/configure b/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # OASIS_START
-# DO NOT EDIT (digest: 6f7b8221311e800a7093dc3b793f67ca)
+# DO NOT EDIT (digest: 43a4c04eb31d237f10fee79d293a406c)
 set -e
 
 FST=true
@@ -23,5 +23,9 @@ for i in "$@"; do
   esac
 done
 
-make configure CONFIGUREFLAGS="$*"
+if [ ! -e setup.exe ] || [ _oasis -nt setup.exe ] || [ setup.ml -nt setup.exe ] || [ configure -nt setup.exe ]; then
+  ocamlfind ocamlopt -o setup.exe -linkpkg -package oasis.dynrun setup.ml || ocamlfind ocamlc -o setup.exe -linkpkg -package oasis.dynrun setup.ml || exit 1
+  rm -f setup.cmi setup.cmo setup.cmx setup.o setup.cmt
+fi
+./setup.exe -configure "$@"
 # OASIS_STOP
diff --git a/setup.ml b/setup.ml
@@ -1,10 +1,10 @@
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 172e37fc4b327922311f6cf9389bc560) *)
+(* DO NOT EDIT (digest: 1bc19e72587da58c1e1f99f847b509aa) *)
 (******************************************************************************)
 (* 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    *)
@@ -25,6 +25,8 @@
 
 open OASISDynRun
 
+let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
+open BaseCompat.Compat_0_4
 (* OASIS_STOP *)
 
 let () = setup ();;