Skip to content

Commit

Permalink
split header, fix fenv cutom values
Browse files Browse the repository at this point in the history
  • Loading branch information
mwweissmann committed Sep 28, 2015
1 parent ab81afb commit bf7d622
Show file tree
Hide file tree
Showing 11 changed files with 407 additions and 342 deletions.
2 changes: 1 addition & 1 deletion _oasis
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Library "posix-math"
Path: src/
BuildTools: ocamlbuild
Modules: Posix_math
CSources: ocaml_posix_math.h, math.c
CSources: ocaml-posix-math-complex.h, ocaml-posix-math-fenv.h, math.c, fenv.c
CCLib: -lm
CCOpt: -O2 -Wall -Wextra -Wno-unused-parameter
BuildDepends: result
Expand Down
4 changes: 3 additions & 1 deletion _tags
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: b31275cd2f263acc57bf6686a34d90b8)
# DO NOT EDIT (digest: 8410825dbcd81d21f1c2d33fbca555c0)
# 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
Expand All @@ -18,6 +18,7 @@ true: annot, bin_annot
"src/posix-math.cmxs": use_posix-math
<src/*.ml{,i,y}>: oasis_library_posix_math_ccopt
"src/math.c": oasis_library_posix_math_ccopt
"src/fenv.c": oasis_library_posix_math_ccopt
<src/posix-math.{cma,cmxa}>: oasis_library_posix_math_cclib
"src/libposix-math_stubs.lib": oasis_library_posix_math_cclib
"src/dllposix-math_stubs.dll": oasis_library_posix_math_cclib
Expand All @@ -26,6 +27,7 @@ true: annot, bin_annot
<src/posix-math.{cma,cmxa}>: use_libposix-math_stubs
<src/*.ml{,i,y}>: pkg_result
"src/math.c": pkg_result
"src/fenv.c": pkg_result
# Executable test
<test/test.{native,byte}>: pkg_result
<test/test.{native,byte}>: use_posix-math
Expand Down
11 changes: 8 additions & 3 deletions myocamlbuild.ml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(* OASIS_START *)
(* DO NOT EDIT (digest: fa5f43ef078f1b28a7c1e41b1e5519aa) *)
(* DO NOT EDIT (digest: 3c141b12513c0d5c59292020a24499ad) *)
module OASISGettext = struct
(* # 22 "src/oasis/OASISGettext.ml" *)

Expand Down Expand Up @@ -608,7 +608,12 @@ open Ocamlbuild_plugin;;
let package_default =
{
MyOCamlbuildBase.lib_ocaml = [("posix-math", ["src"], [])];
lib_c = [("posix-math", "src/", ["src/ocaml_posix_math.h"])];
lib_c =
[
("posix-math",
"src/",
["src/ocaml-posix-math-complex.h"; "src/ocaml-posix-math-fenv.h"])
];
flags =
[
(["oasis_library_posix_math_ccopt"; "compile"],
Expand Down Expand Up @@ -639,6 +644,6 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}

let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;

# 643 "myocamlbuild.ml"
# 648 "myocamlbuild.ml"
(* OASIS_STOP *)
Ocamlbuild_plugin.dispatch dispatch_default;;
14 changes: 10 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: 2365c5afc402c7227fc25f82faf946e4) *)
(* DO NOT EDIT (digest: c25d0883a94278c57e6c17a9231bc668) *)
(*
Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -6749,7 +6749,13 @@ let setup_t =
bs_compiled_object = Best;
bs_build_depends = [FindlibPackage ("result", None)];
bs_build_tools = [ExternalTool "ocamlbuild"];
bs_c_sources = ["ocaml_posix_math.h"; "math.c"];
bs_c_sources =
[
"ocaml-posix-math-complex.h";
"ocaml-posix-math-fenv.h";
"math.c";
"fenv.c"
];
bs_data_files = [];
bs_ccopt =
[
Expand Down Expand Up @@ -6834,14 +6840,14 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
oasis_digest = Some "'%\133\242\253\220\187\140\027\184B\231\133\179:\\";
oasis_digest = Some "ujj\155\182\030\193V\240\136\223\214\018\1316D";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
};;

let setup () = BaseSetup.setup setup_t;;

# 6846 "setup.ml"
# 6852 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;
Loading

0 comments on commit bf7d622

Please sign in to comment.