diff options
Diffstat (limited to 'stdlib/source/program/aedifex/profile.lux')
| -rw-r--r-- | stdlib/source/program/aedifex/profile.lux | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux index 592e221fd..98eb1c43e 100644 --- a/stdlib/source/program/aedifex/profile.lux +++ b/stdlib/source/program/aedifex/profile.lux @@ -8,7 +8,7 @@ [data ["." product] ["." maybe ("#\." monoid)] - ["." text] + ["." text ("#\." equivalence)] [collection ["." dictionary (#+ Dictionary)] ["." list ("#\." monoid)] @@ -150,7 +150,7 @@ #repositories (Set Address) #dependencies (Set dependency.Dependency) #sources (Set Source) - #target (Maybe Target) + #target Target #program (Maybe Module) #test (Maybe Module) #deploy_repositories (Dictionary Text Address)}) @@ -171,7 +171,7 @@ ## #sources set.equivalence ## #target - (maybe.equivalence text.equivalence) + text.equivalence ## #program (maybe.equivalence text.equivalence) ## #test @@ -189,7 +189,7 @@ #repositories (set.new text.hash) #dependencies (set.new dependency.hash) #sources (set.new text.hash) - #target #.None + #target ..default_target #program #.None #test #.None #deploy_repositories (dictionary.new text.hash)}) @@ -201,7 +201,9 @@ #repositories (set.union (get@ #repositories baseline) (get@ #repositories override)) #dependencies (set.union (get@ #dependencies baseline) (get@ #dependencies override)) #sources (set.union (get@ #sources baseline) (get@ #sources override)) - #target (maybe\compose (get@ #target override) (get@ #target baseline)) + #target (if (text\= ..default_target (get@ #target baseline)) + (get@ #target override) + (get@ #target baseline)) #program (maybe\compose (get@ #program override) (get@ #program baseline)) #test (maybe\compose (get@ #test override) (get@ #test baseline)) #deploy_repositories (dictionary.merge (get@ #deploy_repositories override) (get@ #deploy_repositories baseline))})) |