Preparing intermediate release for using in build

Author: OlegZee

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 {ExecOptions.Default with FileLog = "build.log"; ConLogLevel = Verbosity.Chatty } {
+do xake {XakeOptions with FileLog = "build.log"; ConLogLevel = Verbosity.Chatty } {
 
     rules [
         "all"  => action {
@@ -34,7 +34,6 @@ do xake {ExecOptions.Default with FileLog = "build.log"; ConLogLevel = Verbosity
             }
 
         "build" => (build "Build")
-        "bin" <== ["bin/XakeLibTests.dll"; "bin/FSharp.Core.dll"]
         "clean" => (build "Clean")
 
         "get-deps" => action {
@@ -51,88 +50,6 @@ do xake {ExecOptions.Default with FileLog = "build.log"; ConLogLevel = Verbosity
             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/FileTasks.fs

@@ -29,16 +29,23 @@ let rm (names : string list) =
 /// <param name="tgt">Target file location and name.</param>
 let copyFile (src: string) tgt =
     action {
-        // TODO fail on error, normalize names, accept array/mask
+        // TODO fail on error, normalize names
         do! need [src]
         do! trace Level.Info "[copyFile] '%A' -> '%s'" src tgt
 
         File.Copy(src, tgt, true)
-    } 
+    }
+
+/// <summary>
+/// Copies single file.
+/// </summary>
+[<System.Obsolete("Use copyFile instead. `cp` is reserved for future flexible and powerful solution.")>]
+let cp = copyFile
 
 /// <summary>
 /// Copies multiple files specified by a mask to another location.
 /// </summary>
+[<System.Obsolete("Use with caution, the implementation is incomplete")>]
 let copyFiles (src: string list) tgt_folder =
 
     // TODO check how should it process dependencies

docs/todo.md

@@ -6,6 +6,12 @@
   * detect changes in build script (internal changes), e.g. new target added that was not in .xake database
   * dependencies tracking mode: automatically rebuild when dependency is changed, execute triggers allowing to start/stop the processes which lock/hold artifacts
 
+### Tasks
+
+  * complete new build script
+  * gracefully switch to new version (push new code but old build script, provide cp fallback)
+  * complete copyFiles method
+
 ### Refactorings
   * Artifact -> FileName of string, relative path