-
Notifications
You must be signed in to change notification settings - Fork 177
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Port to jbuilder #374
Port to jbuilder #374
Changes from 44 commits
dbb4963
0fa50d2
68b161f
30b8a80
de3d931
291f605
e721933
a988946
a384933
2da8764
e9f0907
512d277
e13bac7
7b6d9d0
94383e4
b28726b
b825120
d99fb6d
6c1705f
ffffdea
a926624
3b29534
49d909a
cd1e12c
5a044c6
a17ec27
c13e28a
20a979d
358f333
4973a51
353f501
b9ff5dc
890ccc2
d827388
ef6021c
b120197
ddc6330
b0551ea
67a34ac
455fe57
c075a63
dacbef8
0a33c49
7ca76aa
e0077c3
9fb2f5d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,15 @@ | ||
_build | ||
src/unix/lwt_config.ml | ||
src/unix/lwt_config.h | ||
src/unix/lwt_unix_jobs_generated.ml | ||
src/unix/jobs-unix/ | ||
setup.data | ||
setup.log | ||
setup.exe | ||
setup-dev.exe | ||
_opam | ||
src/unix/lwt_config | ||
src/jbuild-ignore | ||
|
||
# Coverage analysis. | ||
bisect*.out | ||
_coverage/ | ||
|
||
# For local work, tests, etc. | ||
scratch/ | ||
|
||
# Autogenerated by jbuider | ||
.merlin | ||
*.install | ||
|
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,8 +8,8 @@ matrix: | |
env: COMPILER=4.03 | ||
- os: linux | ||
env: COMPILER=4.04 | ||
- os: linux | ||
env: COMPILER=4.05 | ||
#- os: linux | ||
# env: COMPILER=4.05 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I didn't find any discussion in the jbuilder repo about 4.05. Do you or anyone have a link? This doesn't block the PR. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think the bug may actually be related to a problem with 4.05+beta3, and it will work with 4.05+trunk |
||
- os: linux | ||
env: COMPILER=4.04 FLAMBDA=yes | ||
- os: linux | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,135 @@ | ||
# | ||
# This file has been copied from _build/default/META.lwt then | ||
# modified to add exists_if clauses to support optional | ||
# compilation and the camlp4 syntax extension packages have | ||
# been given appropriate predicates. | ||
# | ||
|
||
version = "dev" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. version here should be removed I believe There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yup, and possibly substituted eventually by topkg or similar. |
||
description = "Monadic promises and concurrent I/O" | ||
requires = "bytes result" | ||
archive(byte) = "lwt.cma" | ||
archive(native) = "lwt.cmxa" | ||
plugin(byte) = "lwt.cma" | ||
plugin(native) = "lwt.cmxs" | ||
package "log" ( | ||
directory = "log" | ||
version = "dev" | ||
description = "Logger for Lwt" | ||
requires = "bytes lwt result" | ||
archive(byte) = "lwt_log.cma" | ||
archive(native) = "lwt_log.cmxa" | ||
plugin(byte) = "lwt_log.cma" | ||
plugin(native) = "lwt_log.cmxs" | ||
exists_if = "lwt_log.cma" | ||
) | ||
package "ppx" ( | ||
directory = "ppx" | ||
version = "dev" | ||
description = "Lwt PPX syntax extension" | ||
requires(ppx_driver) = "compiler-libs | ||
compiler-libs.common | ||
ocaml-migrate-parsetree | ||
ppx_tools_versioned" | ||
archive(ppx_driver,byte) = "ppx_lwt.cma" | ||
archive(ppx_driver,native) = "ppx_lwt.cmxa" | ||
plugin(ppx_driver,byte) = "ppx_lwt.cma" | ||
plugin(ppx_driver,native) = "ppx_lwt.cmxs" | ||
exists_if = "ppx_lwt.cma" | ||
# This is what jbuilder uses to find out the runtime dependencies of | ||
# a preprocessor | ||
ppx_runtime_deps = "bytes lwt result" | ||
# This line makes things transparent for people mixing preprocessors | ||
# and normal dependencies | ||
requires(-ppx_driver) = "lwt.ppx.deprecated-ppx-method" | ||
package "deprecated-ppx-method" ( | ||
version = "dev" | ||
description = "glue package for the deprecated method of using ppx" | ||
requires = "bytes lwt result" | ||
ppx(-ppx_driver,-custom_ppx) = "./ppx.exe --as-ppx" | ||
exists_if = "ppx_lwt.cma" | ||
) | ||
) | ||
package "preemptive" ( | ||
directory = "preemptive" | ||
version = "dev" | ||
description = "Preemptive thread support for Lwt" | ||
requires = "bigarray | ||
bytes | ||
lwt | ||
lwt.log | ||
lwt.unix | ||
result | ||
threads | ||
threads.posix | ||
unix" | ||
archive(byte) = "lwt_preemptive.cma" | ||
archive(native) = "lwt_preemptive.cmxa" | ||
plugin(byte) = "lwt_preemptive.cma" | ||
plugin(native) = "lwt_preemptive.cmxs" | ||
exists_if = "lwt_preemptive.cma" | ||
) | ||
package "simple-top" ( | ||
directory = "simple-top" | ||
version = "dev" | ||
description = "Lwt-OCaml top level integration (deprecated; use utop)" | ||
requires = "bigarray | ||
bytes | ||
compiler-libs | ||
compiler-libs.common | ||
lwt | ||
lwt.log | ||
lwt.unix | ||
result | ||
unix" | ||
archive(byte) = "lwt_simple_top.cma" | ||
archive(native) = "lwt_simple_top.cmxa" | ||
plugin(byte) = "lwt_simple_top.cma" | ||
plugin(native) = "lwt_simple_top.cmxs" | ||
exists_if = "lwt_simple_top.cma" | ||
) | ||
package "syntax" ( | ||
directory = "syntax" | ||
version = "dev" | ||
description = "Camlp4 syntax for Lwt (deprecated; use lwt.ppx)" | ||
requires = "camlp4 lwt.syntax.options" | ||
archive(syntax, preprocessor) = "lwt_syntax.cma" | ||
archive(syntax, toploop) = "lwt_syntax.cma" | ||
archive(syntax, preprocessor, native) = "lwt_syntax.cmxa" | ||
archive(syntax, preprocessor, native, plugin) = "lwt_syntax.cmxs" | ||
exists_if = "lwt_syntax.cma" | ||
package "log" ( | ||
directory = "log" | ||
version = "dev" | ||
description = "Camlp4 syntax for Lwt logging (deprecated; use lwt.ppx)" | ||
requires = "camlp4 lwt.syntax.options" | ||
archive(syntax, preprocessor) = "lwt_syntax_log.cma" | ||
archive(syntax, toploop) = "lwt_syntax_log.cma" | ||
archive(syntax, preprocessor, native) = "lwt_syntax_log.cmxa" | ||
archive(syntax, preprocessor, native, plugin) = "lwt_syntax_log.cmxs" | ||
exists_if = "lwt_syntax_log.cma" | ||
) | ||
package "options" ( | ||
directory = "options" | ||
version = "dev" | ||
description = "Options for Lwt Camlp4 syntax extension (deprecated; use lwt.ppx)" | ||
requires = "camlp4" | ||
archive(syntax, preprocessor) = "lwt_syntax_options.cma" | ||
archive(syntax, toploop) = "lwt_syntax_options.cma" | ||
archive(syntax, preprocessor, native) = "lwt_syntax_options.cmxa" | ||
archive(syntax, preprocessor, native, plugin) = "lwt_syntax_options.cmxs" | ||
exists_if = "lwt_syntax_options.cma" | ||
) | ||
) | ||
package "unix" ( | ||
directory = "unix" | ||
version = "dev" | ||
description = "Unix support for Lwt" | ||
requires = "bigarray bytes lwt lwt.log result unix" | ||
archive(byte) = "lwt_unix.cma" | ||
archive(native) = "lwt_unix.cmxa" | ||
plugin(byte) = "lwt_unix.cma" | ||
plugin(native) = "lwt_unix.cmxs" | ||
exists_if = "lwt_unix.cma" | ||
) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can also delete the root
.merlin
from the repo.