Skip to content

Commit fd0fd34

Browse files
committed
build script cleanup
1 parent 830740a commit fd0fd34

File tree

2 files changed

+2
-46
lines changed

2 files changed

+2
-46
lines changed

build.fsx

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -42,58 +42,13 @@ do xake {XakeOptions with FileLog = "build.log"; ConLogLevel = Verbosity.Chatty
4242
includes "Program.fs"
4343
}
4444

45-
let! options = getCtxOptions()
46-
let getFiles = toFileList options.ProjectRoot
47-
48-
let (Filelist sourceFiles) = sources |> toFileList options.ProjectRoot
49-
50-
do! needFiles (Filelist sourceFiles)
51-
52-
let (settings,files,refs) =
53-
(
54-
["--target:library"; "--define:TRACE"; "--optimize+"; "--warn:3"; "--warnaserror:76"; "--utf8output"],
55-
["Logging.fs"; "Pickler.fs"; "Fileset.fs"; "Types.fs"; "ArtifactUtil.fs"; "CommonLib.fs"; "Database.fs"; "Action.fs"; "WorkerPool.fs"; "Progress.fs"; "XakeScript.fs"; "CommonTasks.fs"; "FileTasks.fs"; "ResourceFileset.fs"; "DotNetFwk.fs"; "DotnetTasks.fs"; "VersionInfo.fs"; "AssemblyInfo.fs"; "Program.fs"],
56-
["System.dll"; "System.Core.dll"; "System.Windows.Forms.dll"]
57-
)
58-
59-
let! exitcode = system fsc <| ["-o:" + file.FullName; ""] @ settings @ (sourceFiles |> List.map (fun f -> f.FullName)) @ (refs |> List.map (fun n -> "/r:" + n))
60-
61-
do! writeLog Command "job done %A" exitcode
62-
}
63-
64-
"bin/Xake.Core1.dll" *> fun file -> action {
65-
66-
// TODO --doc:..\bin\Xake.Core.XML --- multitarget rule!
67-
68-
let sources = fileset {
69-
basedir "core"
70-
includes "Logging.fs"
71-
includes "Pickler.fs"
72-
includes "Fileset.fs"
73-
includes "Types.fs"
74-
includes "ArtifactUtil.fs"
75-
includes "CommonLib.fs"
76-
includes "Database.fs"
77-
includes "Action.fs"
78-
includes "WorkerPool.fs"
79-
includes "Progress.fs"
80-
includes "XakeScript.fs"
81-
includes "CommonTasks.fs"
82-
includes "FileTasks.fs"
83-
includes "ResourceFileset.fs"
84-
includes "DotNetFwk.fs"
85-
includes "DotnetTasks.fs"
86-
includes "VersionInfo.fs"
87-
includes "AssemblyInfo.fs"
88-
includes "Program.fs"
89-
}
90-
9145
do! Fsc {
9246
FscSettings with
9347
Out = file
9448
Src = sources
9549
RefGlobal = ["System.dll"; "System.Core.dll"; "System.Windows.Forms.dll"]
9650
Define = ["TRACE"]
51+
CommandArgs = ["--optimize+"; "--warn:3"; "--warnaserror:76"; "--utf8output"]
9752
}
9853

9954
}

core/DotNetFwk.fs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ module DotNetFwk =
126126
module internal MsImpl =
127127
open registry
128128

129+
// TODO drop Wow node lookup
129130
let fscTool =
130131
registry.open_subkey registry.HKLM @"SOFTWARE\Wow6432Node\Microsoft\FSharp\3.0\Runtime\v4.0"
131132
|> Option.bind (registry.get_value_str "")

0 commit comments

Comments
 (0)