Another attempt to make pure build scripts (not using msbuild), rename cp function to copyFile, new copyFiles function (incomplete)

Author: OlegZee

XakeLibTests/ActionTests.fs

@@ -1,18 +1,14 @@
-namespace XakeLibTests
+module ``action block allows``
 
 open NUnit.Framework
-
 open Xake
 
-[<TestFixture>]
-type ``action block allows``() =
 
-  let makeStringList() = new System.Collections.Generic.List<string>()
-  let DebugOptions =
-    {ExecOptions.Default with FailOnError = true; FileLog = ""}
+let makeStringList() = new System.Collections.Generic.List<string>()
+let DebugOptions = {ExecOptions.Default with FailOnError = true; FileLog = ""}
 
-  [<Test>]
-  member __.``executes the body``() =
+[<Test>]
+let ``executes the body``() =
 
     let wasExecuted = ref false
 
@@ -24,8 +20,8 @@ type ``action block allows``() =
 
     Assert.IsTrue(!wasExecuted)
 
-  [<Test>]
-  member __.``execution is ordered``() =
+[<Test>]
+let ``execution is ordered``() =
 
     let wasExecuted = ref false
 
@@ -45,8 +41,8 @@ type ``action block allows``() =
     Assert.IsTrue(!wasExecuted)
     Assert.That(errorlist, Is.EquivalentTo(["1"; "2"; "3"]))
 
-  [<Test>]
-  member __.``allows async operations``() =
+[<Test>]
+let ``allows async operations``() =
 
     let wasExecuted = ref false
 
@@ -67,8 +63,8 @@ type ``action block allows``() =
     Assert.IsTrue(!wasExecuted)
     Assert.That(errorlist, Is.EqualTo(["1"; "2"; "3"; "4"]))
 
-  [<Test>]
-  member __.``do! action``() =
+[<Test>]
+let ``do! action``() =
 
     let wasExecuted = ref false
 
@@ -92,8 +88,8 @@ type ``action block allows``() =
     Assert.That(errorlist, Is.EqualTo(["1"; "2"; "3"; "4"]))
 
 
-  [<Test>]
-  member __.``do! action with result ignored``() =
+[<Test>]
+let ``do! action with result ignored``() =
 
     let wasExecuted = ref false
 
@@ -121,8 +117,8 @@ type ``action block allows``() =
     Assert.That(errorlist, Is.EqualTo(["1"; "2"; "3"; "4"] |> List.toArray))
 
 
-  [<Test>]
-  member __.``let! returning value``() =
+[<Test>]
+let ``let! returning value``() =
 
     let errorlist = makeStringList()
     let note = errorlist.Add
@@ -144,8 +140,8 @@ type ``action block allows``() =
 
     Assert.That(errorlist, Is.EqualTo(["1"; "2+1"; "3"] |> List.toArray))
 
-  [<Test>]
-  member __.``if of various kinds``() =
+[<Test>]
+let ``if of various kinds``() =
 
     let errorlist = makeStringList()
     let note = errorlist.Add
@@ -176,8 +172,8 @@ type ``action block allows``() =
 
     Assert.That(errorlist, Is.EqualTo(["i1-t"; "i2-f"; "2"; "3"] |> List.toArray))
 
-  [<Test>]
-  member __.``if without else``() =
+[<Test>]
+let ``if without else``() =
 
     let errorlist = makeStringList()
     let note = errorlist.Add
@@ -206,8 +202,8 @@ type ``action block allows``() =
 
     Assert.That(errorlist, Is.EqualTo(["i1-t"; "3"; "4"] |> List.toArray))
 
-  [<Test>]
-  member __.``for and while``() =
+[<Test>]
+let ``for and while``() =
 
     let errorlist = makeStringList()
     let note = errorlist.Add
@@ -235,8 +231,8 @@ type ``action block allows``() =
 
     Assert.That(errorlist, Is.EqualTo(["1"; "i=1"; "i=2"; "i=3"; "j=3"; "j=4"; "4"] |> List.toArray))
 
-  [<Test; Explicit>]
-  member __.``try catch finally``() =
+[<Test; Explicit>]
+let ``try catch finally``() =
 
     let errorlist = makeStringList()
     let note = errorlist.Add

XakeLibTests/FileTasksTests.fs

@@ -87,7 +87,7 @@ type ``File tasks module``() =
               "main" => action {
                   do! trace Error "Running inside 'main' rule"
                   do! need ["aaa"; "clean"]
-                  do! cp "aaa" "aaa-copy"
+                  do! copyFile "aaa" "aaa-copy"
               }
 
               "clean" => action {

XakeLibTests/XakeLibTests.fsproj

@@ -34,7 +34,7 @@
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

XakeLibTests/paket.references

@@ -1 +1 @@
-NUnit
+nunit

build.fsx

@@ -10,8 +10,8 @@ if not (System.IO.File.Exists file) then
     printfn ""
 
 // xake build file body
-#r @"packages/Xake.Core.dll"
-//#r @"bin/Debug/Xake.Core.dll"
+//#r @"packages/Xake.Core.dll"
+#r @"bin/Debug/Xake.Core.dll"
 
 open Xake
 
@@ -24,7 +24,7 @@ let systemClr cmd args =
     let cmd',args' = if Xake.Env.isUnix then "mono", cmd::args else cmd,args
     in system cmd' args'
 
-do xake {XakeOptions with FileLog = "build.log"; ConLogLevel = Verbosity.Chatty } {
+do xake {ExecOptions.Default with FileLog = "build.log"; ConLogLevel = Verbosity.Chatty } {
 
     rules [
         "all"  => action {
@@ -34,6 +34,7 @@ do xake {XakeOptions with FileLog = "build.log"; ConLogLevel = Verbosity.Chatty
             }
 
         "build" => (build "Build")
+        "bin" <== ["bin/XakeLibTests.dll"; "bin/FSharp.Core.dll"]
         "clean" => (build "Clean")
 
         "get-deps" => action {
@@ -50,6 +51,88 @@ do xake {XakeOptions with FileLog = "build.log"; ConLogLevel = Verbosity.Chatty
             if exit_code <> 0 then
                 failwith "Failed to test"
         }
+
+        ("bin/FSharp.Core.dll") *> fun outfile -> action {
+            do! copyFile @"packages\FSharp.Core\lib\net40\FSharp.Core.dll" outfile.FullName
+
+            let targetPath = "bin"
+            do! copyFiles [@"packages\FSharp.Core\lib\net40\FSharp.Core.*data"] targetPath
+        }
+
+        ("bin/nunit.framework.dll") *> fun outfile -> action {
+            do! copyFile @"packages\NUnit\lib\nunit.framework.dll" outfile.FullName
+        }
+
+        "bin/Xake.Core.dll" *> fun file -> action {
+
+            // TODO --doc:..\bin\Xake.Core.XML --- multitarget rule!
+            
+            let sources = fileset {
+                basedir "core"
+                includes "Logging.fs"
+                includes "Pickler.fs"
+                includes "Fileset.fs"
+                includes "Types.fs"
+                includes "ArtifactUtil.fs"
+                includes "CommonLib.fs"
+                includes "Database.fs"
+                includes "Action.fs"
+                includes "WorkerPool.fs"
+                includes "Progress.fs"
+                includes "XakeScript.fs"
+                includes "Env.fs"
+                includes "CommonTasks.fs"
+                includes "FileTasks.fs"
+                includes "ResourceFileset.fs"
+                includes "DotNetFwk.fs"
+                includes "DotnetTasks.fs"
+                includes "VersionInfo.fs"
+                includes "AssemblyInfo.fs"
+                includes "Program.fs"
+            }
+
+            do! Fsc {
+                FscSettings with
+                    Out = file
+                    Src = sources
+                    Ref = !! "bin/FSharp.Core.dll"
+                    TargetFramework = "4.0"
+                    RefGlobal = ["System.dll"; "System.Core.dll"; "System.Windows.Forms.dll"]
+                    Define = ["TRACE"]
+                    CommandArgs = ["--optimize+"; "--warn:3"; "--warnaserror:76"; "--utf8output"]
+            }
+
+        }
+
+        "bin/XakeLibTests.dll" *> fun file -> action {
+
+            // TODO --doc:..\bin\Xake.Core.XML --- multitarget rule!
+            
+            let sources = fileset {
+                basedir "XakeLibTests"
+                includes "ActionTests.fs"
+                includes "FilesetTests.fs"
+                includes "ScriptErrorTests.fs"
+                includes "XakeScriptTests.fs"
+                includes "MiscTests.fs"
+                includes "StorageTests.fs"
+                includes "FileTasksTests.fs"
+                includes "ProgressTests.fs"
+                includes "CommandLineTests.fs"
+            }
+
+            do! Fsc {
+                FscSettings with
+                    Out = file
+                    Src = sources
+                    Ref = !! "bin/FSharp.Core.dll" + "bin/nunit.framework.dll" + "bin/Xake.Core.dll"
+                    TargetFramework = "4.0"
+                    RefGlobal = ["System.dll"; "System.Core.dll"]
+                    Define = ["TRACE"]
+                    CommandArgs = ["--optimize+"; "--warn:3"; "--warnaserror:76"; "--utf8output"]
+            }
+
+        }
     ]
 
 }

core/DotnetTasks.fs

@@ -94,14 +94,14 @@ module DotNetTaskTypes =
         Resources: ResourceFileset list
         /// Defines conditional compilation symbols.
         Define: string list
-        /// Allows unsafe code.
-        Unsafe: bool
         /// Target .NET framework
         TargetFramework: string
         /// Custom command-line arguments
         CommandArgs: string list
         /// Build fails on compile error.
         FailOnError: bool
+        /// Do not reference the default CLI assemblies by default
+        NoFramework: bool
 
         Tailcalls: bool
     }
@@ -491,10 +491,10 @@ module DotnetTasks =
         RefGlobal = []
         Resources = []
         Define = []
-        Unsafe = false
         TargetFramework = null
         CommandArgs = []
         FailOnError = true
+        NoFramework = false
 
         Tailcalls = true
     }
@@ -530,35 +530,30 @@ module DotnetTasks =
                 | _, Some s when s <> "" -> s
                 | _ -> null
 
-            let (globalRefs,nostdlib,noconfig) =
+            let (globalRefs,noframework) =
                 match targetFramework with
                 | null ->
                     let mapfn = (+) "/r:"
                     // TODO provide an option for user to explicitly specify all grefs (currently csc.rsp is used)
-                    (settings.RefGlobal |> List.map mapfn), false, false
+                    (settings.RefGlobal |> List.map mapfn), false
                 | tgt ->
                     let fwk = Some tgt |> DotNetFwk.locateFramework in
                     let lookup = DotNetFwk.locateAssembly fwk
                     let mapfn = (fun name -> "/r:" + (lookup name))
 
                     //do! writeLog Info "Using libraries from %A" fwk.AssemblyDirs
 
-                    ("mscorlib.dll" :: settings.RefGlobal |> List.map mapfn), true, true
+                    ("mscorlib.dll" :: settings.RefGlobal |> List.map mapfn), true
 
             let args =
                 seq {
-                    if noconfig then
-                        yield "/noconfig"
                     yield "/nologo"
 
                     yield "/target:" + Impl.targetStr outFile.Name settings.Target
                     //yield "/platform:" + Impl.platformStr settings.Platform
 
-                    if settings.Unsafe then
-                        yield "/unsafe"
-
-                    if nostdlib then
-                        yield "/nostdlib+"
+                    if settings.NoFramework || noframework then
+                        yield "--noframework"
 
                     if not outFile.IsUndefined then
                         yield sprintf "/out:%s" outFile.FullName