Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamltest: fix include native dynlink (#9791) 

Add "-I otherlibs/dynlink/native" when doing "include dynlink".
master
Nicolás Ojeda Bär 2020-07-23 09:47:03 +02:00 committed by GitHub
parent 6f2ee088ba
commit 4f31b10d66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
ocamltest/ocaml_modifiers.ml
View File

@ -18,51 +18,53 @@
open Ocamltest_stdlib open Ocamltest_stdlib
open Environments open Environments
let wrap sl = " " ^ String.concat " " sl ^ " "
let append var sl = Append (var, wrap sl)
let add var s = Add (var, s)
let principal = let principal =
[ [
Append (Ocaml_variables.flags, " -principal "); append Ocaml_variables.flags ["-principal"];
Add (Ocaml_variables.compiler_directory_suffix, ".principal"); add Ocaml_variables.compiler_directory_suffix ".principal";
Add (Ocaml_variables.compiler_reference_suffix, ".principal"); add Ocaml_variables.compiler_reference_suffix ".principal";
] ]
let latex = let latex =
[ [
Add (Ocaml_variables.ocamldoc_backend, "latex"); add Ocaml_variables.ocamldoc_backend "latex";
Append (Ocaml_variables.ocamldoc_flags, "-latex-type-prefix=TYP "); append Ocaml_variables.ocamldoc_flags ["-latex-type-prefix=TYP"];
Append (Ocaml_variables.ocamldoc_flags, "-latex-module-prefix= "); append Ocaml_variables.ocamldoc_flags ["-latex-module-prefix="];
Append (Ocaml_variables.ocamldoc_flags, "-latex-value-prefix= "); append Ocaml_variables.ocamldoc_flags ["-latex-value-prefix="];
Append (Ocaml_variables.ocamldoc_flags, "-latex-module-type-prefix= "); append Ocaml_variables.ocamldoc_flags ["-latex-module-type-prefix="];
Append (Ocaml_variables.ocamldoc_flags, "-latextitle=1,subsection* "); append Ocaml_variables.ocamldoc_flags ["-latextitle=1,subsection*"];
Append (Ocaml_variables.ocamldoc_flags, "-latextitle=2,subsubsection* "); append Ocaml_variables.ocamldoc_flags ["-latextitle=2,subsubsection*"];
Append (Ocaml_variables.ocamldoc_flags, "-latextitle=6,subsection* "); append Ocaml_variables.ocamldoc_flags ["-latextitle=6,subsection*"];
Append (Ocaml_variables.ocamldoc_flags, "-latextitle=7,subsubsection* "); append Ocaml_variables.ocamldoc_flags ["-latextitle=7,subsubsection*"];
] ]
let html = let html =
[ [
Add (Ocaml_variables.ocamldoc_backend, "html"); add Ocaml_variables.ocamldoc_backend "html";
Append (Ocaml_variables.ocamldoc_flags, "-colorize-code "); append Ocaml_variables.ocamldoc_flags ["-colorize-code"];
] ]
let man = let man =
[ [
Add (Ocaml_variables.ocamldoc_backend, "man"); add Ocaml_variables.ocamldoc_backend "man";
] ]
let wrap str = (" " ^ str ^ " ") let make_library_modifier library directories =
let make_library_modifier library directory =
[ [
Append (Ocaml_variables.directories, (wrap directory)); append Ocaml_variables.directories directories;
Append (Ocaml_variables.libraries, (wrap library)); append Ocaml_variables.libraries [library];
Append (Ocaml_variables.caml_ld_library_path, (wrap directory)); append Ocaml_variables.caml_ld_library_path directories;
] ]
let make_module_modifier unit_name directory = let make_module_modifier unit_name directory =
[ [
Append (Ocaml_variables.directories, (wrap directory)); append Ocaml_variables.directories [directory];
Append (Ocaml_variables.binary_modules, (wrap unit_name)); append Ocaml_variables.binary_modules [unit_name];
] ]
let compiler_subdir subdir = let compiler_subdir subdir =
@ -70,11 +72,11 @@ let compiler_subdir subdir =
let config = let config =
[ [
Append (Ocaml_variables.directories, (wrap (compiler_subdir ["utils"]))); append Ocaml_variables.directories [compiler_subdir ["utils"]];
] ]
let testing = make_library_modifier let testing = make_library_modifier
"testing" (compiler_subdir ["testsuite"; "lib"]) "testing" [compiler_subdir ["testsuite"; "lib"]]
let tool_ocaml_lib = make_module_modifier let tool_ocaml_lib = make_module_modifier
"lib" (compiler_subdir ["testsuite"; "lib"]) "lib" (compiler_subdir ["testsuite"; "lib"])
@ -82,18 +84,20 @@ let tool_ocaml_lib = make_module_modifier
let unixlibdir = if Sys.win32 then "win32unix" else "unix" let unixlibdir = if Sys.win32 then "win32unix" else "unix"
let unix = make_library_modifier let unix = make_library_modifier
"unix" (compiler_subdir ["otherlibs"; unixlibdir]) "unix" [compiler_subdir ["otherlibs"; unixlibdir]]
let dynlink = let dynlink =
make_library_modifier "dynlink" (compiler_subdir ["otherlibs"; "dynlink"]) make_library_modifier "dynlink"
[compiler_subdir ["otherlibs"; "dynlink"];
compiler_subdir ["otherlibs"; "dynlink"; "native"]]
let str = make_library_modifier let str = make_library_modifier
"str" (compiler_subdir ["otherlibs"; "str"]) "str" [compiler_subdir ["otherlibs"; "str"]]
let systhreads = let systhreads =
unix @ unix @
(make_library_modifier (make_library_modifier
"threads" (compiler_subdir ["otherlibs"; "systhreads"])) "threads" [compiler_subdir ["otherlibs"; "systhreads"]])
let compilerlibs_subdirs = let compilerlibs_subdirs =
[ [
@ -111,11 +115,11 @@ let compilerlibs_subdirs =
] ]
let add_compiler_subdir subdir = let add_compiler_subdir subdir =
Append (Ocaml_variables.directories, (wrap (compiler_subdir [subdir]))) append Ocaml_variables.directories [compiler_subdir [subdir]]
let compilerlibs_archive archive = let compilerlibs_archive archive =
(Append (Ocaml_variables.libraries, wrap archive)) :: append Ocaml_variables.libraries [archive] ::
(List.map add_compiler_subdir compilerlibs_subdirs) List.map add_compiler_subdir compilerlibs_subdirs
let debugger = [add_compiler_subdir "debugger"] let debugger = [add_compiler_subdir "debugger"]