Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d50013f
update to picosat-960
maelvls May 24, 2017
2eb74fb
update to quantor-3.2
maelvls May 24, 2017
ead5991
quantor: fix configure script so that x86_64-w64-mingw32-gcc.exe is u…
maelvls May 25, 2017
4532cf6
updated _oasis,Makefile for updated picosat,quantor
maelvls May 9, 2017
72606cb
oasis: avoid linker message 'ld: -L../libs/quantor/ not found' and ad…
maelvls May 24, 2017
b4985a5
oasis: name the ocamlfind package 'qbf', added Simon C. as maintainer
maelvls May 24, 2017
9cda037
oasis: install 'quantor' by default as it has no dependency
maelvls May 24, 2017
3bada8f
oasis: 'make clean' also cleans the libs/ folder
maelvls May 24, 2017
54ae799
oasis: fixed SourceRepository field (added ending .git)
maelvls May 27, 2017
ccc12b8
tests: use oUnit2 and only run the tests for enabled libs
maelvls May 24, 2017
68bf028
tests: use -custom with ocamlc so that tests use the static stubs
maelvls May 25, 2017
e769477
makefile: ./configure only compiles picosat and quantor if needed
maelvls May 24, 2017
eb0a89e
makefile: added -fPIC so that a shared stub can be created
maelvls May 24, 2017
aa1dd76
makefile: also run 'ranlib' for mingw compatibility
maelvls May 24, 2017
adc3f14
makefile: fix build order: picosat before quantor (only bugs on mingw)
maelvls May 25, 2017
74cce7f
makefile: add -fPIC to configured CFLAGS
maelvls May 25, 2017
ef458c7
makefile,oasis: move pre/post commands to makefile
maelvls May 28, 2017
3ace7fa
travis,appveyor: add continuous integration (linux, macos, windows)
maelvls May 27, 2017
2d480f1
readme: added CI badges
maelvls May 24, 2017
868a05b
readme: detail the tested architectures
maelvls May 31, 2017
97c0bb5
bump to version 0.2
maelvls May 24, 2017
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
oasis: 'make clean' also cleans the libs/ folder
  • Loading branch information
maelvls committed May 31, 2017
commit 3bada8f83e5fbdfa81ddf57bc13177343d981ec9
1 change: 1 addition & 0 deletions _oasis
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Library "qbf"

if flag(quantor)
PostConfCommand: make deps
PostDistcleanCommand: make clean-deps

Library "qbf-quantor"
Path: src/quantor/
Expand Down
13 changes: 9 additions & 4 deletions setup.ml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.4.5 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: ee6c7a20601e394a946712a773e78fed) *)
(* DO NOT EDIT (digest: 1a344dae605227df461fc63c0bdf2378) *)
(*
Regenerated by OASIS v0.4.9~HEAD
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -7704,7 +7704,12 @@ let setup_t =
distclean_custom =
{
pre_command = [(OASISExpr.EBool true, None)];
post_command = [(OASISExpr.EBool true, None)]
post_command =
[
(OASISExpr.EBool true, None);
(OASISExpr.EFlag "quantor",
Some (("make", ["clean-deps"])))
]
};
plugins =
[(`Extra, "META", Some "0.4"); (`Extra, "DevFiles", Some "0.4")];
Expand All @@ -7713,15 +7718,15 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.9~HEAD";
oasis_digest = Some "$G\143\213\193\200\225\130\137\229F\153'\232\2017";
oasis_digest = Some "&%C\017H!e\019\027y\203\243NR\2018";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
};;

let setup () = BaseSetup.setup setup_t;;

# 7725 "setup.ml"
# 7730 "setup.ml"
let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
open BaseCompat.Compat_0_4
(* OASIS_STOP *)
Expand Down