renaming back to system in the Xake.SystemTasks

Author: OlegZee

build.fsx

@@ -14,6 +14,8 @@ if not (System.IO.File.Exists file) then
 
 open Xake
 
+let TestsAssembly = "bin/XakeLibTests.dll"
+
 let systemClr cmd args =
     let cmd',args' = if Xake.Env.isUnix then "mono", cmd::args else cmd,args
     in system cmd' args'
@@ -27,7 +29,7 @@ do xake {ExecOptions.Default with Vars = ["NETFX-TARGET", "4.5"]; FileLog = "bui
             do! need ["test"]
             }
 
-        "build" <== ["bin/XakeLibTests.dll"; "bin/Xake.Core.dll"]
+        "build" <== [TestsAssembly; "bin/Xake.Core.dll"]
         "clean" => action {
             do! rm ["bin/*.*"]
         }
@@ -41,8 +43,8 @@ do xake {ExecOptions.Default with Vars = ["NETFX-TARGET", "4.5"]; FileLog = "bui
         }
 
         "test" => action {
-
-            let! exit_code = systemClr "packages/NUnit.Runners/tools/nunit-console.exe" ["./bin/XakeLibTests.dll"]
+            do! need[TestsAssembly]
+            let! exit_code = systemClr "packages/NUnit.Runners/tools/nunit-console.exe" [TestsAssembly]
             if exit_code <> 0 then
                 failwith "Failed to test"
         }
@@ -101,7 +103,7 @@ do xake {ExecOptions.Default with Vars = ["NETFX-TARGET", "4.5"]; FileLog = "bui
 
         }
 
-        "bin/XakeLibTests.dll" *> fun file -> action {
+        TestsAssembly *> fun file -> action {
 
             // TODO --doc:..\bin\Xake.Core.XML --- multitarget rule!
 

core/DotnetTasks.fs

@@ -327,7 +327,7 @@ module DotnetTasks =
             do! trace Debug "Command line: '%s %s'" fwkInfo.CscTool (args |> Seq.map Impl.escapeArgument |> String.concat "\r\n\t")
 
             let options = {
-                SystemTasks.Options.Default with
+                SystemTasks.SysOptions.Default with
                     LogPrefix = "[CSC] "
                     StdOutLevel = fun _ -> Level.Verbose
                     ErrOutLevel = Impl.levelFromString Level.Verbose
@@ -477,7 +477,7 @@ module DotnetTasks =
             do! trace Debug "Command line: '%s'" args
 
             let options = {
-                SystemTasks.Options.Default with
+                SystemTasks.SysOptions.Default with
                     LogPrefix = pfx
                     StdOutLevel = fun _ -> Level.Info
                     ErrOutLevel = Impl.levelFromString Level.Verbose
@@ -595,7 +595,7 @@ module DotnetTasks =
             do! trace Debug "Command line: '%s %s'" fsc (args |> Seq.map Impl.escapeArgument |> String.concat "\r\n\t")
 
             let options = {
-                SystemTasks.Options.Default with
+                SystemTasks.SysOptions.Default with
                     LogPrefix = "[FSC] "
                     StdOutLevel = fun _ -> Level.Verbose
                     ErrOutLevel = Impl.levelFromString Level.Verbose

core/SystemTasks.fs

@@ -40,7 +40,7 @@ module SystemTasks =
                 return proc.ExitCode
         }
 
-    type Options = {
+    type SysOptions = {
         LogPrefix:string;
         StdOutLevel: string -> Level; ErrOutLevel: string -> Level;
         EnvVars: (string * string) list
@@ -85,25 +85,25 @@ module SystemTasks =
         return errorlevel
     }
 
-    type OptionsFn = Options -> Options
+    type ExecOptionsFn = SysOptions -> SysOptions
 
     /// <summary>
     /// Executes external process and waits until it completes
     /// </summary>
     /// <param name="opts">Options setters</param>
     /// <param name="cmd">Command or executable name.</param>
     /// <param name="args">Command arguments.</param>
-    let system (opts: OptionsFn) (cmd: string) (args: string seq) =
+    let system (opts: ExecOptionsFn) (cmd: string) (args: string seq) =
       action {
         do! trace Info "[shell.run] starting '%s'" cmd
-        let! exitCode = _system (opts Options.Default) cmd (args |> String.concat " ")
+        let! exitCode = _system (opts SysOptions.Default) cmd (args |> String.concat " ")
         do! trace Info "[shell.run] completed '%s' exitcode: %d" cmd exitCode
 
         return exitCode
       }
 
-    let useClr: OptionsFn = fun o -> {o with UseClr = true}
-    let checkErrorLevel: OptionsFn = fun o -> {o with FailOnErrorLevel = true}
+    let useClr: ExecOptionsFn = fun o -> {o with UseClr = true}
+    let checkErrorLevel: ExecOptionsFn = fun o -> {o with FailOnErrorLevel = true}
 
 [<AutoOpen>]
 module CommonTasks =
@@ -112,5 +112,5 @@ module CommonTasks =
     /// </summary>
     /// <param name="cmd">Command or executable name.</param>
     /// <param name="args">Command arguments.</param>
-    [<System.Obsolete("Use shell id... instead")>]
+    [<System.Obsolete("Use Xake.SystemTasks.system id cmd... instead")>]
     let system cmd args = SystemTasks.system id cmd args

core/Xake.Core.fsproj

@@ -74,7 +74,7 @@
     <Compile Include="WorkerPool.fs" />
     <Compile Include="Progress.fs" />
     <Compile Include="XakeScript.fs" />
-    <Compile Include="CommonTasks.fs" />
+    <Compile Include="SystemTasks.fs" />
     <Compile Include="FileTasks.fs" />
     <Compile Include="ResourceFileset.fs" />
     <Compile Include="DotNetFwk.fs" />