Merge branch 'dev'

Author: OlegZee

XakeLibTests/CommandLineTests.fs

@@ -0,0 +1,95 @@
+namespace XakeLibTests
+
+open System.IO
+open NUnit.Framework
+
+open Xake
+
+[<TestFixture (Description = "Command line tests")>]
+type CommandLineTests() =
+
+    let currentDir = Path.Combine (__SOURCE_DIRECTORY__, "..")
+
+    [<Test (Description = "Verifies reading common switches")>]
+    member test.AcceptKnownSwitches() =
+
+        let scriptOptions = ref XakeOptions
+        let args =
+            ["/t"; "33"; "/R"; currentDir; "/LL"; "Loud";
+            "/FL"; "aaaaa"; "/D"; "AA=BBB"; "/D"; "AA1=CCC"; "/FLL"; "Silent"]
+    
+        do xakeArgs args XakeOptions {
+            wantOverride (["test"])
+
+            rules [
+              "test" => action {
+                  let! opts = getCtxOptions()
+                  scriptOptions := opts
+              }
+            ]
+        }
+
+        let finalOptions = !scriptOptions
+        Assert.AreEqual(33, finalOptions.Threads)
+        Assert.AreEqual(currentDir, finalOptions.ProjectRoot)
+        Assert.AreEqual("aaaaa", finalOptions.FileLog)
+        Assert.AreEqual(Verbosity.Silent, finalOptions.FileLogLevel)
+        Assert.AreEqual(Verbosity.Loud, finalOptions.ConLogLevel)
+        Assert.AreEqual([("AA", "BBB"); ("AA1", "CCC")], finalOptions.Vars)
+
+    [<Test (Description = "Verifies reading target list")>]
+    member test.ReadsTargets() =
+
+        let scriptOptions = ref XakeOptions
+        let executed2 = ref false
+        let args = ["/t"; "31"; "target1"; "target2"]
+    
+        do xakeArgs args XakeOptions {
+
+            rules [
+              "target1" => action {
+                  let! opts = getCtxOptions()
+                  scriptOptions := opts
+              }
+              "target2" => action {
+                  executed2 := true
+              }
+            ]
+        }
+
+        let finalOptions = !scriptOptions
+        Assert.AreEqual(31, finalOptions.Threads)
+        Assert.AreEqual(["target1"; "target2"], finalOptions.Targets)
+        Assert.IsTrue !executed2
+
+
+    [<Test (Description = "Verifies reading incorrect"); Ignore>]
+    member test.WarnsOnIncorrectSwitch() =
+
+        do xakeArgs ["/xxx"] XakeOptions {
+            want ["ss"]
+        }
+
+        //raise <| new System.NotImplementedException()
+
+    [<Test (Description = "Verifies that command line is ignored when Ignore option is set")>]
+    member test.IgnoresCommandLine() =
+
+        let scriptOptions = ref XakeOptions
+        let args =
+            ["/t"; "33"; "/R"; currentDir; "/LL"; "Loud";
+            "/FL"; "aaaaa"; "target"]
+    
+        do xakeArgs args {XakeOptions with IgnoreCommandLine = true; Threads = 2; FileLog = "ss"; Targets = ["main"]} {
+            rules [
+              "main" => action {
+                  let! opts = getCtxOptions()
+                  scriptOptions := opts
+              }
+            ]
+        }
+
+        let finalOptions = !scriptOptions
+        Assert.AreEqual(2, finalOptions.Threads)
+        Assert.AreEqual("ss", finalOptions.FileLog)
+        Assert.AreEqual(["main"], finalOptions.Targets)

XakeLibTests/FileTasksTests.fs

@@ -12,7 +12,7 @@ open Xake.Storage
 [<TestFixture>]
 type FileTasksTests() = 
 
-    let TestOptions = {XakeOptions with Threads = 1; Want = ["main"]; ConLogLevel = Chatty; FileLogLevel = Silent}
+    let TestOptions = {XakeOptions with Threads = 1; Targets = ["main"]; ConLogLevel = Chatty; FileLogLevel = Silent}
 
     [<Test>]
     member this.DeleteSimple() =

XakeLibTests/MiscTests.fs

@@ -7,7 +7,7 @@ open Xake
 open Storage
 open BuildLog
 
-[<TestFixture (Description = "Verious tests")>]
+[<TestFixture (Description = "Various tests")>]
 type MiscTests() =
 
     [<SetUp>]
@@ -326,7 +326,7 @@ type MiscTests() =
 
         let count = ref 0
 
-        do xake {XakeOptions with Want = ["xxx"]; Threads = 1; FileLog=""} {  // one thread to avoid simultaneous access to 'wasExecuted'
+        do xake {XakeOptions with Targets = ["xxx"]; Threads = 1; FileLog=""} {  // one thread to avoid simultaneous access to 'wasExecuted'
             rules [
               "main" => action {
                   count := !count + 1

XakeLibTests/XakeLibTests.fsproj

@@ -48,8 +48,9 @@
     <Compile Include="MiscTests.fs" />
     <Compile Include="StorageTests.fs" />
     <Compile Include="FileTasksTests.fs" />
-    <None Include="packages.config" />
     <Compile Include="ProgressTests.fs" />
+    <Compile Include="CommandLineTests.fs" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\core\Xake.Core.fsproj">

build.fsx

@@ -0,0 +1,57 @@
+// xake build file
+#r @"bin/Debug/Xake.Core.dll"
+
+open Xake
+
+let fsc = """C:\Program Files (x86)\Microsoft SDKs\F#\3.0\Framework\v4.0\fsc.exe"""
+
+do xake {XakeOptions with FileLog = "build.log"; ConLogLevel = Verbosity.Chatty } {
+
+    rules [
+        "main"  <== ["build"]
+        "build" <== ["bin/Xake.Core.dll"]
+
+        "clean" => action {
+            do! rm ["bin/Xake.Core.dll"]
+        }
+
+        "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 "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
+                    RefGlobal = ["System.dll"; "System.Core.dll"; "System.Windows.Forms.dll"]
+                    Define = ["TRACE"]
+                    CommandArgs = ["--optimize+"; "--warn:3"; "--warnaserror:76"; "--utf8output"]
+                }
+
+        }
+    ]
+
+}

core/CommonTasks.fs

@@ -91,6 +91,7 @@ let system cmd args =
     do! writeLog Info "[system] starting '%s'" cmd
     let! exitCode = _system SystemOptions cmd (args |> String.concat " ")
     do! writeLog Info "[system] сompleted '%s' exitcode: %d" cmd exitCode
+
     return exitCode
   }
 

core/DotNetFwk.fs

@@ -44,6 +44,7 @@ module DotNetFwk =
         AssemblyDirs: string list
         ToolDir: string
         CscTool: string
+        FscTool: string option
         MsbuildTool: string
         EnvVars: (string* string) list
         }
@@ -107,6 +108,7 @@ module DotNetFwk =
                         ToolDir = libdir </> "mono" </> libpath
                         Version = ver
                         CscTool = csc_tool
+                        FscTool = Some "fsharpi"
                         MsbuildTool = "xbuild"
                         EnvVars =["PATH", sdkroot </> "bin" + ";" + (%"PATH")]
                     }
@@ -124,6 +126,12 @@ module DotNetFwk =
     module internal MsImpl =
         open registry
 
+        // TODO drop Wow node lookup
+        let fscTool =
+            registry.open_subkey registry.HKLM @"SOFTWARE\Wow6432Node\Microsoft\FSharp\3.0\Runtime\v4.0"
+            |> Option.bind (registry.get_value_str "")
+            |> Option.bind (fun p -> System.IO.Path.Combine (p, "fsc.exe") |> Some)
+
         let tryLocateFwk fwk =
             let fwkKey = open_subkey HKLM @"SOFTWARE\Microsoft\.NETFramework"
             let installRoot_ = fwkKey |> Option.bind (get_value_str "InstallRoot")
@@ -163,6 +171,7 @@ module DotNetFwk =
                     Version = version
                     AssemblyDirs = asmpaths
                     CscTool = fwkdir </> "csc.exe"
+                    FscTool = fscTool
                     MsbuildTool = fwkdir </> "msbuild.exe"
                     EnvVars = vars
                 }, null