From 7d16a744140a0304253e28f41115f542ec0b66ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= Date: Fri, 3 Jan 2025 16:42:01 +0100 Subject: [PATCH 1/2] add version numbers to opam files so that they appear in META files see https://github.com/ocsigen/lwt/issues/1042 --- lwt.opam | 1 + lwt_ppx.opam | 1 + 2 files changed, 2 insertions(+) diff --git a/lwt.opam b/lwt.opam index cb65673fe..84eac3254 100644 --- a/lwt.opam +++ b/lwt.opam @@ -16,6 +16,7 @@ maintainer: [ ] authors: ["Jérôme Vouillon" "Jérémie Dimino"] license: "MIT" +version: "5.8.1" homepage: "https://github.com/ocsigen/lwt" doc: "https://ocsigen.org/lwt" bug-reports: "https://github.com/ocsigen/lwt/issues" diff --git a/lwt_ppx.opam b/lwt_ppx.opam index b4a6b08fd..a5e8f4b2c 100644 --- a/lwt_ppx.opam +++ b/lwt_ppx.opam @@ -6,6 +6,7 @@ maintainer: [ "Raphaël Proust " "Anton Bachin " ] authors: ["Jérôme Vouillon" "Jérémie Dimino"] +version: "5.8.1" license: "MIT" homepage: "https://github.com/ocsigen/lwt" doc: "https://ocsigen.org/lwt" From 69eff1fc2cf8dbd7a63c04723612f6afea09316c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= Date: Mon, 6 Jan 2025 08:41:40 +0100 Subject: [PATCH 2/2] add package version to dune-project requires dune version bump and further changes --- dune-project | 4 +- lwt.opam | 5 +- lwt_ppx.opam | 5 +- lwt_ppx_let.opam | 3 +- lwt_react.opam | 3 +- src/unix/dune | 266 +++++++++++++++++++++++----------------------- test/core/dune | 8 +- test/ppx/dune | 8 +- test/ppx_let/dune | 8 +- test/react/dune | 8 +- test/unix/dune | 12 +-- 11 files changed, 156 insertions(+), 174 deletions(-) diff --git a/dune-project b/dune-project index 782590fc2..20647fdf8 100644 --- a/dune-project +++ b/dune-project @@ -1,4 +1,4 @@ -(lang dune 1.12) +(lang dune 2.7) (name lwt) @@ -23,6 +23,7 @@ (package (name lwt_ppx) + (version 5.8.1) (synopsis "PPX syntax for Lwt, providing something similar to async/await from JavaScript") (depends (ocaml (>= 4.08)) @@ -40,6 +41,7 @@ (package (name lwt) + (version 5.8.1) (synopsis "Promises and event-driven I/O") (description "A promise is a value that may become determined in the future. diff --git a/lwt.opam b/lwt.opam index 84eac3254..ea1545c2d 100644 --- a/lwt.opam +++ b/lwt.opam @@ -1,5 +1,6 @@ # This file is generated by dune, edit dune-project instead opam-version: "2.0" +version: "5.8.1" synopsis: "Promises and event-driven I/O" description: """ A promise is a value that may become determined in the future. @@ -16,12 +17,11 @@ maintainer: [ ] authors: ["Jérôme Vouillon" "Jérémie Dimino"] license: "MIT" -version: "5.8.1" 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.7"} "ocaml" {>= "4.08"} "cppo" {build & >= "1.1.0"} "ocamlfind" {dev & >= "1.7.3-1"} @@ -55,4 +55,3 @@ build: [ "@doc" {with-doc} ] ] -available: os-family != "windows" | "ocaml-version" < "5.2" diff --git a/lwt_ppx.opam b/lwt_ppx.opam index a5e8f4b2c..a07b335e9 100644 --- a/lwt_ppx.opam +++ b/lwt_ppx.opam @@ -1,21 +1,22 @@ # This file is generated by dune, edit dune-project instead opam-version: "2.0" +version: "5.8.1" synopsis: "PPX syntax for Lwt, providing something similar to async/await from JavaScript" maintainer: [ "Raphaël Proust " "Anton Bachin " ] authors: ["Jérôme Vouillon" "Jérémie Dimino"] -version: "5.8.1" license: "MIT" 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.7"} "ocaml" {>= "4.08"} "ppxlib" {>= "0.16.0"} "lwt" + "odoc" {with-doc} ] build: [ ["dune" "subst"] {dev} diff --git a/lwt_ppx_let.opam b/lwt_ppx_let.opam index 7ce9fe37e..f45dc63a4 100644 --- a/lwt_ppx_let.opam +++ b/lwt_ppx_let.opam @@ -11,10 +11,11 @@ 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.7"} "ocaml" {>= "4.08"} "ppx_let" {with-test} "lwt" + "odoc" {with-doc} ] build: [ ["dune" "subst"] {dev} diff --git a/lwt_react.opam b/lwt_react.opam index 236db54bb..975424697 100644 --- a/lwt_react.opam +++ b/lwt_react.opam @@ -10,11 +10,12 @@ 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.7"} "ocaml" {>= "4.08"} "cppo" {build & >= "1.1.0"} "lwt" {>= "3.0.0"} "react" {>= "1.0.0"} + "odoc" {with-doc} ] build: [ ["dune" "subst"] {dev} 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..1c9c4c8ab 100644 --- a/test/core/dune +++ b/test/core/dune @@ -1,10 +1,6 @@ -(executable +(test + (package lwt) (name main) (libraries lwttester) (preprocess (future_syntax)) (flags (:standard -w +A-40-42))) - -(alias - (name runtest) - (package lwt) - (action (run %{exe:main.exe}))) diff --git a/test/ppx/dune b/test/ppx/dune index c90d44953..e80664abb 100644 --- a/test/ppx/dune +++ b/test/ppx/dune @@ -1,10 +1,6 @@ -(executable +(test + (package lwt_ppx) (name main) (libraries lwttester) (preprocess (pps lwt_ppx)) (flags (:standard -warn-error -22))) - -(alias - (name runtest) - (package lwt_ppx) - (action (run %{exe:main.exe}))) diff --git a/test/ppx_let/dune b/test/ppx_let/dune index 71b4e5c5b..7502ae368 100644 --- a/test/ppx_let/dune +++ b/test/ppx_let/dune @@ -1,9 +1,5 @@ -(executable +(test + (package lwt_ppx_let) (name test) (preprocess (pps ppx_let)) (libraries lwt lwt.unix)) - -(alias - (name runtest) - (package lwt_ppx_let) - (action (run %{exe:test.exe}))) diff --git a/test/react/dune b/test/react/dune index 7d236bf6b..5005e1101 100644 --- a/test/react/dune +++ b/test/react/dune @@ -1,8 +1,4 @@ -(executable +(test + (package lwt_react) (name main) (libraries lwt_react lwttester)) - -(alias - (name runtest) - (package lwt_react) - (action (run %{exe:main.exe}))) diff --git a/test/unix/dune b/test/unix/dune index a918f6bb7..653a1c279 100644 --- a/test/unix/dune +++ b/test/unix/dune @@ -18,10 +18,11 @@ (modules dummy) (libraries unix)) -(executable +(test (name main) (libraries lwttester tester) - (modules main)) + (modules main) + (deps %{exe:dummy.exe})) (executable (name ocaml_runtime_exc_1) @@ -52,10 +53,3 @@ (name ocaml_runtime_exc_6) (libraries lwt lwt.unix) (modules ocaml_runtime_exc_6)) - -(alias - (name runtest) - (package lwt) - (action (run %{exe:main.exe})) - (deps bytes_io_data %{exe:dummy.exe}) -)