Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

do not depend on dyntype.syntax in the test suite, to suppress a doub…

…le linking exception
  • Loading branch information...
commit eaba2f99a76f1dfe76e91f78f8035e6cf3f4600f 1 parent c6f6ec1
@avsm avsm authored
Showing with 7 additions and 14 deletions.
  1. +1 −1  _oasis
  2. +1 −7 _tags
  3. +2 −2 myocamlbuild.ml
  4. +3 −4 setup.ml
View
2  _oasis
@@ -38,7 +38,7 @@ Executable "suite"
Path: lib_test/
Install: false
MainIs: suite.ml
- BuildDepends: oUnit, dyntype, dyntype.syntax, type_conv
+ BuildDepends: oUnit, dyntype, type_conv
Test core
Run$: flag(tests)
View
8 _tags
@@ -1,5 +1,5 @@
# OASIS_START
-# DO NOT EDIT (digest: aff326e13fdb188f76323258f6f1637d)
+# DO NOT EDIT (digest: 17b203030e36f4413e8c2a2ab238b2c7)
# 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
@@ -30,17 +30,11 @@
<pa_lib/*.ml{,i}>: pkg_camlp4
<pa_lib/*.ml{,i}>: pkg_camlp4.quotations
# Executable suite
-"lib_test/suite.byte": use_pa_dyntype
"lib_test/suite.byte": use_dyntype
"lib_test/suite.byte": pkg_oUnit
"lib_test/suite.byte": pkg_type_conv
-"lib_test/suite.byte": pkg_camlp4
-"lib_test/suite.byte": pkg_camlp4.quotations
-<lib_test/*.ml{,i}>: use_pa_dyntype
<lib_test/*.ml{,i}>: use_dyntype
<lib_test/*.ml{,i}>: pkg_oUnit
<lib_test/*.ml{,i}>: pkg_type_conv
-<lib_test/*.ml{,i}>: pkg_camlp4
-<lib_test/*.ml{,i}>: pkg_camlp4.quotations
# OASIS_STOP
<**/*.ml{,i}>: syntax_camlp4o
View
4 myocamlbuild.ml
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 71e92af414b4fa568b9f6699efca25ac) *)
+(* DO NOT EDIT (digest: cd27d1904e2a31d98f2badf0b91b9a83) *)
module OASISGettext = struct
# 21 "/Users/avsm/.opam/system/build/oasis.0.3.0/src/oasis/OASISGettext.ml"
@@ -481,7 +481,7 @@ let package_default =
[("dyntype", ["lib"]); ("pa_dyntype", ["pa_lib"])];
lib_c = [];
flags = [];
- includes = [("pa_lib", ["lib"]); ("lib_test", ["lib"; "pa_lib"])];
+ includes = [("pa_lib", ["lib"]); ("lib_test", ["lib"])];
}
;;
View
7 setup.ml
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.3.0 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: ef7e592137f0a7f1d326b03fdbb8dd1f) *)
+(* DO NOT EDIT (digest: 460773d42394da18d1846efbb11716d5) *)
(*
Regenerated by OASIS v0.3.0
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5893,7 +5893,6 @@ let setup_t =
[
FindlibPackage ("oUnit", None);
InternalLibrary "dyntype";
- InternalLibrary "pa_dyntype";
FindlibPackage ("type_conv", None)
];
bs_build_tools =
@@ -5946,7 +5945,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.3.0";
- oasis_digest = Some "\150vöØ0ºÊb_í\017\015%\127\141^";
+ oasis_digest = Some "ip\136\151E@6>ÏÜ\nf\127VL×";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false;
@@ -5954,6 +5953,6 @@ let setup_t =
let setup () = BaseSetup.setup setup_t;;
-# 5958 "setup.ml"
+# 5957 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;
Please sign in to comment.
Something went wrong with that request. Please try again.