Skip to content

refactor(pkg): share lock package basename #75

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

Draft
anmonteiro wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor(pkg): share lock package basename #75

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
37 changes: 13 additions & 24 deletions src/dune_pkg/lock_dir.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,14 @@ let in_source_tree path =
| External e -> Workspace.dev_tool_path_to_source_dir e
;;

let package_basename package_name maybe_package_version =
let package_name = Package_name.to_string package_name in
match maybe_package_version with
| None -> package_name
| Some package_version ->
sprintf "%s.%s" package_name (Package_version.to_string package_version)
;;

module Pkg = struct
type t =
{ build_command : Build_command.t Conditional_choice.t
Expand Down Expand Up @@ -906,27 +914,14 @@ module Pkg = struct
let files_dir package_name maybe_package_version ~lock_dir =
(* TODO(steve): Once portable lockdirs are enabled by default, make the
package version non-optional *)
let extension = ".files" in
match maybe_package_version with
| None -> Path.relative lock_dir (Package_name.to_string package_name ^ extension)
| Some package_version ->
Path.relative
lock_dir
(Package_name.to_string package_name
^ "."
^ Package_version.to_string package_version
^ extension)
let basename = package_basename package_name maybe_package_version in
Path.relative lock_dir (basename ^ ".files")
;;

let source_files_dir package_name maybe_package_version ~lock_dir =
let source = in_source_tree lock_dir in
let package_name = Package_name.to_string package_name in
match maybe_package_version with
| Some package_version ->
Path.Source.relative
source
(sprintf "%s.%s.files" package_name (Package_version.to_string package_version))
| None -> Path.Source.relative source (sprintf "%s.files" package_name)
let basename = package_basename package_name maybe_package_version in
Path.Source.relative source (basename ^ ".files")
;;

(* Combine the platform-specific parts of a pair of [t]s, raising a code
Expand Down Expand Up @@ -1334,13 +1329,7 @@ module Package_filename = struct
because if portable lockdirs is not enabled then we want to fall back to
the behaviour where version numbers are not included in lockfile names.
Make it non-optional when lockdirs become portable by default. *)
(match maybe_package_version with
| None -> Package_name.to_string package_name ^ file_extension_string
| Some package_version ->
Package_name.to_string package_name
^ "."
^ Package_version.to_string package_version
^ file_extension_string)
package_basename package_name maybe_package_version ^ file_extension_string
|> Filename.of_string_exn
;;

Expand Down
Loading