Skip to content
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.

Sign up for GitHub

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

Ensure compatibility with camlzip versions before 1.12 #1610

Merged
merged 1 commit into from
Aug 2, 2024
Merged

Ensure compatibility with camlzip versions before 1.12 #1610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bap-byteweight.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ depends: [
"dune" {>= "3.1"}
"bap-signatures" {= version}
"bap-std" {= version}
"camlzip" {>= "1.12" & < "2.0"}
"camlzip" {>= "1.0" & < "2.0"}
"core_kernel" {>= "v0.14" & < "v0.16"}
"bap-common" {= version}
"ppx_bap" {= version}
Expand Down
2 changes: 1 addition & 1 deletion dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@
(depends
(bap-signatures (= :version))
(bap-std (= :version))
(camlzip (and (>= 1.12) (< 2.0)))
(camlzip (and (>= 1.0) (< 2.0)))
(core_kernel (and (>= v0.14) (< v0.16)))
(bap-common (= :version))
(ppx_bap (= :version))
Expand Down
2 changes: 1 addition & 1 deletion lib/bap_byteweight/bap_byteweight_signatures.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ let update_or_fail ?compiler target data payload path =
let path = make_entry ?compiler target data in
let data = Bytes.unsafe_to_string (data.save payload) in
Zip.add_entry data zip path;
List.iter entries ~f:(fun ({Zip.filename; comment; mtime},data) ->
List.iter entries ~f:(fun ({Zip.filename; comment; mtime; _},data) ->
Zip.add_entry data zip filename ~comment ~mtime)

let copy input output =
Expand Down
Loading