Rename base to common
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
This commit is contained in:
parent
14030a8ad5
commit
1f0bee0cf7
|
@ -40,7 +40,7 @@ module Context = struct
|
||||||
name)
|
name)
|
||||||
end
|
end
|
||||||
|
|
||||||
module Base = struct
|
module Common = struct
|
||||||
type t =
|
type t =
|
||||||
{ loc : Loc.t
|
{ loc : Loc.t
|
||||||
; profile : string
|
; profile : string
|
||||||
|
@ -65,7 +65,7 @@ module Context = struct
|
||||||
|
|
||||||
module Opam = struct
|
module Opam = struct
|
||||||
type t =
|
type t =
|
||||||
{ base : Base.t
|
{ base : Common.t
|
||||||
; name : string
|
; name : string
|
||||||
; switch : string
|
; switch : string
|
||||||
; root : string option
|
; root : string option
|
||||||
|
@ -73,7 +73,7 @@ module Context = struct
|
||||||
}
|
}
|
||||||
|
|
||||||
let t ~profile ~x =
|
let t ~profile ~x =
|
||||||
Base.t ~profile >>= fun base ->
|
Common.t ~profile >>= fun base ->
|
||||||
field "switch" string >>= fun switch ->
|
field "switch" string >>= fun switch ->
|
||||||
field "name" Name.t ~default:switch >>= fun name ->
|
field "name" Name.t ~default:switch >>= fun name ->
|
||||||
field_o "root" string >>= fun root ->
|
field_o "root" string >>= fun root ->
|
||||||
|
@ -88,10 +88,10 @@ module Context = struct
|
||||||
end
|
end
|
||||||
|
|
||||||
module Default = struct
|
module Default = struct
|
||||||
type t = Base.t
|
type t = Common.t
|
||||||
|
|
||||||
let t ~profile ~x =
|
let t ~profile ~x =
|
||||||
Base.t ~profile >>= fun t ->
|
Common.t ~profile >>= fun t ->
|
||||||
return { t with targets = Target.add t.targets x }
|
return { t with targets = Target.add t.targets x }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ module Context : sig
|
||||||
| Native
|
| Native
|
||||||
| Named of string
|
| Named of string
|
||||||
end
|
end
|
||||||
module Base : sig
|
module Common : sig
|
||||||
type t =
|
type t =
|
||||||
{ loc : Loc.t
|
{ loc : Loc.t
|
||||||
; profile : string
|
; profile : string
|
||||||
|
@ -18,7 +18,7 @@ module Context : sig
|
||||||
end
|
end
|
||||||
module Opam : sig
|
module Opam : sig
|
||||||
type t =
|
type t =
|
||||||
{ base : Base.t
|
{ base : Common.t
|
||||||
; name : string
|
; name : string
|
||||||
; switch : string
|
; switch : string
|
||||||
; root : string option
|
; root : string option
|
||||||
|
@ -27,7 +27,7 @@ module Context : sig
|
||||||
end
|
end
|
||||||
|
|
||||||
module Default : sig
|
module Default : sig
|
||||||
type t = Base.t
|
type t = Common.t
|
||||||
end
|
end
|
||||||
|
|
||||||
type t = Default of Default.t | Opam of Opam.t
|
type t = Default of Default.t | Opam of Opam.t
|
||||||
|
|
Loading…
Reference in New Issue