Merge pull request #25 from frenetic-lang/oasis

Oasis fixes

Author: reitblatt

_oasis

@@ -13,7 +13,7 @@ BuildTools:
 
 Flag quickcheck
   Description: build the packet.quickcheck library
-  Default: False
+  Default: false
 
 Library packet
   Path: lib
@@ -35,7 +35,7 @@ Library quickcheck
   Findlibparent: packet
   Findlibname: quickcheck
   Path: quickcheck
-  Build$: flag(quickcheck)
+  Build$: flag(tests) || flag(quickcheck)
   BuildDepends:
     packet,
     quickcheck
@@ -44,8 +44,8 @@ Library quickcheck
 
 Executable testtool
   Path: test
-  Install: False
-  Build$: flag(tests) && flag(quickcheck)
+  Install: false
+  Build$: flag(tests)
   MainIs: Test.ml
   BuildDepends:
     oUnit,

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.3.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 2b297a7276d20798789c6358cd5ac288) *)
+(* DO NOT EDIT (digest: ce1959053de2f5f88ac0db40b0c888f8) *)
 (*
    Regenerated by OASIS v0.4.1
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -1176,7 +1176,7 @@ module OASISTypes = struct
       {
         obj_modules:            string list;
         obj_findlib_fullname:   findlib_name list option;
-      }
+      } 
 
 
   type executable =
@@ -6265,7 +6265,7 @@ module OCamlbuildPlugin = struct
     {
       plugin_tags: string option;
       extra_args: string list;
-    }
+    } 
 
 
   let check_ocaml_version version pkg =
@@ -6886,7 +6886,10 @@ let setup_t =
                       bs_build =
                         [
                            (OASISExpr.EBool true, false);
-                           (OASISExpr.EFlag "quickcheck", true)
+                           (OASISExpr.EOr
+                              (OASISExpr.EFlag "tests",
+                                OASISExpr.EFlag "quickcheck"),
+                             true)
                         ];
                       bs_install = [(OASISExpr.EBool true, true)];
                       bs_path = "quickcheck";
@@ -6925,10 +6928,7 @@ let setup_t =
                       bs_build =
                         [
                            (OASISExpr.EBool true, false);
-                           (OASISExpr.EAnd
-                              (OASISExpr.EFlag "tests",
-                                OASISExpr.EFlag "quickcheck"),
-                             true)
+                           (OASISExpr.EFlag "tests", true)
                         ];
                       bs_install = [(OASISExpr.EBool true, false)];
                       bs_path = "test";
@@ -6999,14 +6999,15 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.1";
-     oasis_digest = Some "\244&E\239\131?#/k\139\148\226\000\184\211\175";
+     oasis_digest =
+       Some "\137\143]\202\128U\229w\236q\235\178\228\158\161\179";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7011 "setup.ml"
+# 7012 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;