diff --git a/dune-project b/dune-project index 782590fc2..41f55cfaa 100644 --- a/dune-project +++ b/dune-project @@ -1,4 +1,4 @@ -(lang dune 1.12) +(lang dune 2.0) (name lwt) diff --git a/lwt.opam b/lwt.opam index cb65673fe..9b091440d 100644 --- a/lwt.opam +++ b/lwt.opam @@ -20,7 +20,7 @@ homepage: "https://github.com/ocsigen/lwt" doc: "https://ocsigen.org/lwt" bug-reports: "https://github.com/ocsigen/lwt/issues" depends: [ - "dune" {>= "1.12"} + "dune" {>= "2.0"} "ocaml" {>= "4.08"} "cppo" {build & >= "1.1.0"} "ocamlfind" {dev & >= "1.7.3-1"} diff --git a/lwt_ppx.opam b/lwt_ppx.opam index b4a6b08fd..e12253630 100644 --- a/lwt_ppx.opam +++ b/lwt_ppx.opam @@ -11,7 +11,7 @@ homepage: "https://github.com/ocsigen/lwt" doc: "https://ocsigen.org/lwt" bug-reports: "https://github.com/ocsigen/lwt/issues" depends: [ - "dune" {>= "1.12"} + "dune" {>= "2.0"} "ocaml" {>= "4.08"} "ppxlib" {>= "0.16.0"} "lwt" diff --git a/lwt_ppx_let.opam b/lwt_ppx_let.opam index 7ce9fe37e..4d5e92375 100644 --- a/lwt_ppx_let.opam +++ b/lwt_ppx_let.opam @@ -11,7 +11,7 @@ homepage: "https://github.com/ocsigen/lwt" doc: "https://ocsigen.org/lwt" bug-reports: "https://github.com/ocsigen/lwt/issues" depends: [ - "dune" {>= "1.12"} + "dune" {>= "2.0"} "ocaml" {>= "4.08"} "ppx_let" {with-test} "lwt" diff --git a/lwt_react.opam b/lwt_react.opam index 236db54bb..bb73d0460 100644 --- a/lwt_react.opam +++ b/lwt_react.opam @@ -10,7 +10,7 @@ homepage: "https://github.com/ocsigen/lwt" doc: "https://ocsigen.org/lwt" bug-reports: "https://github.com/ocsigen/lwt/issues" depends: [ - "dune" {>= "1.12"} + "dune" {>= "2.0"} "ocaml" {>= "4.08"} "cppo" {build & >= "1.1.0"} "lwt" {>= "3.0.0"} diff --git a/src/unix/dune b/src/unix/dune index d5ce0459d..830eb256a 100644 --- a/src/unix/dune +++ b/src/unix/dune @@ -51,139 +51,139 @@ let () = Jbuild_plugin.V1.send @@ {| (wrapped false) (libraries bigarray lwt ocplib-endian.bigstring threads unix) |} ^ preprocess ^ {| - (c_names - lwt_unix_stubs - lwt_libev_stubs - lwt_process_stubs - unix_readable - unix_writable - unix_madvise - unix_get_page_size - windows_get_page_size - unix_mincore - unix_read - unix_pread - windows_read - windows_pread - unix_bytes_read - windows_bytes_read - unix_write - unix_pwrite - windows_write - windows_pwrite - unix_bytes_write - windows_bytes_write - unix_readv_writev_utils - unix_iov_max - unix_writev - unix_writev_job - unix_readv - unix_readv_job - unix_send - unix_bytes_send - unix_recv - unix_bytes_recv - unix_recvfrom - unix_bytes_recvfrom - unix_sendto - unix_sendto_byte - unix_bytes_sendto - unix_bytes_sendto_byte - unix_recv_send_utils - unix_recv_msg - unix_send_msg - unix_send_msg_byte - unix_get_credentials - unix_mcast_utils - unix_mcast_set_loop - unix_mcast_set_ttl - unix_mcast_modify_membership - unix_wait4 - unix_get_cpu - unix_get_affinity - unix_set_affinity - unix_guess_blocking_job - unix_wait_mincore_job - unix_open_job - unix_read_job - unix_pread_job - windows_read_job - windows_pread_job - unix_bytes_read_job - windows_bytes_read_job - unix_write_job - windows_write_job - unix_pwrite_job - windows_pwrite_job - unix_bytes_write_job - windows_bytes_write_job - unix_stat_job_utils - unix_stat_job - unix_stat_64_job - unix_lstat_job - unix_lstat_64_job - unix_fstat_job - unix_fstat_64_job - unix_utimes_job - unix_isatty_job - unix_opendir_job - unix_closedir_job - unix_valid_dir - unix_invalidate_dir - unix_rewinddir_job - unix_readdir_job - unix_readdir_n_job - unix_readlink_job - unix_lockf_job - unix_getlogin_job - unix_get_pw_gr_nam_id_job - unix_get_network_information_utils - unix_gethostname_job - unix_gethostbyname_job - unix_gethostbyaddr_job - unix_getprotoby_getservby_job - unix_getaddrinfo_job - unix_getnameinfo_job - unix_bind_job - unix_getcwd_job - unix_termios_conversion - unix_tcgetattr_job - unix_tcsetattr_job - windows_is_socket - windows_fsync_job - windows_system_job - windows_not_available - unix_not_available - unix_access_job - unix_chdir_job - unix_chmod_job - unix_chown_job - unix_chroot_job - unix_close_job - unix_fchmod_job - unix_fchown_job - unix_fdatasync_job - unix_fsync_job - unix_ftruncate_job - unix_link_job - unix_lseek_job - unix_mkdir_job - unix_mkfifo_job - unix_rename_job - unix_rmdir_job - unix_symlink_job - unix_tcdrain_job - unix_tcflow_job - unix_tcflush_job - unix_tcsendbreak_job - unix_truncate_job - unix_unlink_job - unix_somaxconn - windows_somaxconn - unix_accept4 - ) (install_c_headers lwt_features lwt_config lwt_unix) - (c_flags -I. (:include unix_c_flags.sexp)) + (foreign_stubs + (language c) + (names + lwt_unix_stubs + lwt_libev_stubs + lwt_process_stubs + unix_readable + unix_writable + unix_madvise + unix_get_page_size + windows_get_page_size + unix_mincore + unix_read + unix_pread + windows_read + windows_pread + unix_bytes_read + windows_bytes_read + unix_write + unix_pwrite + windows_write + windows_pwrite + unix_bytes_write + windows_bytes_write + unix_readv_writev_utils + unix_iov_max + unix_writev + unix_writev_job + unix_readv + unix_readv_job + unix_send + unix_bytes_send + unix_recv + unix_bytes_recv + unix_recvfrom + unix_bytes_recvfrom + unix_sendto + unix_sendto_byte + unix_bytes_sendto + unix_bytes_sendto_byte + unix_recv_send_utils + unix_recv_msg + unix_send_msg + unix_send_msg_byte + unix_get_credentials + unix_mcast_utils + unix_mcast_set_loop + unix_mcast_set_ttl + unix_mcast_modify_membership + unix_wait4 + unix_get_cpu + unix_get_affinity + unix_set_affinity + unix_guess_blocking_job + unix_wait_mincore_job + unix_open_job + unix_read_job + unix_pread_job + windows_read_job + windows_pread_job + unix_bytes_read_job + windows_bytes_read_job + unix_write_job + windows_write_job + unix_pwrite_job + windows_pwrite_job + unix_bytes_write_job + windows_bytes_write_job + unix_stat_job_utils + unix_stat_job + unix_stat_64_job + unix_lstat_job + unix_lstat_64_job + unix_fstat_job + unix_fstat_64_job + unix_utimes_job + unix_isatty_job + unix_opendir_job + unix_closedir_job + unix_valid_dir + unix_invalidate_dir + unix_rewinddir_job + unix_readdir_job + unix_readdir_n_job + unix_readlink_job + unix_lockf_job + unix_getlogin_job + unix_get_pw_gr_nam_id_job + unix_get_network_information_utils + unix_gethostname_job + unix_gethostbyname_job + unix_gethostbyaddr_job + unix_getprotoby_getservby_job + unix_getaddrinfo_job + unix_getnameinfo_job + unix_bind_job + unix_getcwd_job + unix_termios_conversion + unix_tcgetattr_job + unix_tcsetattr_job + windows_is_socket + windows_fsync_job + windows_system_job + windows_not_available + unix_not_available + unix_access_job + unix_chdir_job + unix_chmod_job + unix_chown_job + unix_chroot_job + unix_close_job + unix_fchmod_job + unix_fchown_job + unix_fdatasync_job + unix_fsync_job + unix_ftruncate_job + unix_link_job + unix_lseek_job + unix_mkdir_job + unix_mkfifo_job + unix_rename_job + unix_rmdir_job + unix_symlink_job + unix_tcdrain_job + unix_tcflow_job + unix_tcflush_job + unix_tcsendbreak_job + unix_truncate_job + unix_unlink_job + unix_somaxconn + windows_somaxconn + unix_accept4) + (flags (:include unix_c_flags.sexp))) (c_library_flags (:include unix_c_library_flags.sexp))) - |} diff --git a/test/core/dune b/test/core/dune index e5e0e8c45..5e16a1ecc 100644 --- a/test/core/dune +++ b/test/core/dune @@ -4,7 +4,7 @@ (preprocess (future_syntax)) (flags (:standard -w +A-40-42))) -(alias - (name runtest) +(rule + (alias runtest) (package lwt) (action (run %{exe:main.exe}))) diff --git a/test/ppx/dune b/test/ppx/dune index c90d44953..cb125f466 100644 --- a/test/ppx/dune +++ b/test/ppx/dune @@ -4,7 +4,7 @@ (preprocess (pps lwt_ppx)) (flags (:standard -warn-error -22))) -(alias - (name runtest) +(rule + (alias runtest) (package lwt_ppx) (action (run %{exe:main.exe}))) diff --git a/test/ppx_let/dune b/test/ppx_let/dune index 71b4e5c5b..b4147a508 100644 --- a/test/ppx_let/dune +++ b/test/ppx_let/dune @@ -3,7 +3,7 @@ (preprocess (pps ppx_let)) (libraries lwt lwt.unix)) -(alias - (name runtest) +(rule + (alias runtest) (package lwt_ppx_let) (action (run %{exe:test.exe}))) diff --git a/test/react/dune b/test/react/dune index 7d236bf6b..e8b678b04 100644 --- a/test/react/dune +++ b/test/react/dune @@ -2,7 +2,7 @@ (name main) (libraries lwt_react lwttester)) -(alias - (name runtest) +(rule + (alias runtest) (package lwt_react) (action (run %{exe:main.exe}))) diff --git a/test/unix/dune b/test/unix/dune index a918f6bb7..4b307aeb1 100644 --- a/test/unix/dune +++ b/test/unix/dune @@ -53,8 +53,8 @@ (libraries lwt lwt.unix) (modules ocaml_runtime_exc_6)) -(alias - (name runtest) +(rule + (alias runtest) (package lwt) (action (run %{exe:main.exe})) (deps bytes_io_data %{exe:dummy.exe})