Skip to content
This repository was archived by the owner on Nov 9, 2022. It is now read-only.

Commit fbedad5

Browse files
committed
bug fixed
1 parent 1332aa1 commit fbedad5

File tree

2 files changed

+25
-12
lines changed

2 files changed

+25
-12
lines changed

Bake/Program.fs

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ let processError fmt =
77
Console.Beep ()
88
printfn fmt
99

10+
exception BakeScriptNotFound
11+
1012
[<EntryPoint>]
1113
let main args =
1214
try
@@ -19,7 +21,10 @@ let main args =
1921
"Build.bake"
2022
"Publish.bake"
2123
]
22-
|> List.find System.IO.File.Exists
24+
|> List.tryFind System.IO.File.Exists
25+
|> function
26+
| Some x -> x
27+
| None -> raise BakeScriptNotFound
2328
| [|a|] -> [ a; a + ".bake" ] |> List.find System.IO.File.Exists
2429
| _ -> failwithf "Not support"
2530
|> System.IO.FileInfo
@@ -63,25 +68,29 @@ let main args =
6368
0
6469
with
6570
| Parser.ParsingError e ->
66-
processError "Parsing Error:%s" e
71+
processError "Parsing Error: %s" e
6772
Console.ResetColor ()
6873
-1
6974
| Action.ActionNotFound e ->
70-
processError "Action Not Found:%s" e
75+
processError "Action Not Found: %s" e
7176
Console.ResetColor ()
7277
-2
7378
| Action.ActionUsageError e ->
74-
processError "Action Usage Error:%s" e
79+
processError "Action Usage Error: %s" e
7580
Console.ResetColor ()
7681
-3
77-
| Action.ActionException (e, script, ctx) ->
78-
processError "Action Error:%s\n\n%A\n\n%A\n\n%A" e.Message e script ctx
82+
| Action.ActionException (e, _, ctx) ->
83+
processError "Action Error: %A\nContext: \n%A" e ctx
7984
Console.ResetColor ()
8085
-4
8186
| Task.TaskException (task, e) ->
82-
processError "Task Error:%s\n\n%A\n\n%A" e.Message e task
87+
processError "Task Error: %s\n\n%A\n\n%A" e.Message e task
8388
Console.ResetColor ()
8489
-5
90+
| BakeScriptNotFound ->
91+
processError "Bake script not found."
92+
Console.ResetColor ()
93+
-6
8594
| e ->
8695
processError "Error:%A" e
8796
Console.ResetColor ()

Publish.bake

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,13 @@ CreateDirectory {
2727
}
2828

2929
Action CopyProject projectName {
30-
Copy "$Output/src/projectName" {
31-
projectName/*.fs
32-
projectName/*.fsproj
33-
projectName/Properties
30+
Atomic {
31+
Copy "$Output/src/projectName" {
32+
projectName/*.fs
33+
projectName/*.fsproj
34+
}
35+
36+
Delete "$Output/src/projectName/obj"
3437
}
3538
}
3639

@@ -63,7 +66,8 @@ Parallel {
6366
Copy "$Output/src" {
6467
LICENSE
6568
Bake.sln
66-
Package.bake
69+
Clean.bake
70+
Publish.bake
6771
README.md
6872
}
6973
}

0 commit comments

Comments
 (0)