From d5765d047db6ee659e8a8d8dc335533651a87c2c Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Fri, 13 Jun 2014 17:17:52 +0200 Subject: [PATCH] Build: prefix all native targets with 'Native' --- README.md | 12 ++++++------ build.fsx | 27 ++++++++++++++------------- docs/content/index.fsx | 12 ++++++------ 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 2081e6f1..01eff203 100644 --- a/README.md +++ b/README.md @@ -83,12 +83,12 @@ If you do not want to use the official binaries, or if you like to modify, debug build.cmd NuGet all # generate normal NuGet packages (.Net 4.0, 3.5, PCL) build.cmd NuGet signed # generate signed/strong named NuGet packages (.Net 4.0) - build.cmd BuildNativex86 # build native providers 32bit/x86 - build.cmd BuildNativex64 # build native providers 64bit/x64 - build.cmd BuildNative # build native providers for all platforms - build.cmd TestNativex86 # test native providers 32bit/x86 - build.cmd TestNativex64 # test native providers 64bit/x64 - build.cmd TestNative # test native providers for all platforms + build.cmd Native32Build # build native providers 32bit/x86 + build.cmd Native64Build # build native providers 64bit/x64 + build.cmd NativeBuild # build native providers for all platforms + build.cmd Native32Test # test native providers 32bit/x86 + build.cmd Native64Test # test native providers 64bit/x64 + build.cmd NativeTest # test native providers for all platforms build.cmd All # build, test, docs, api reference (.Net 4.0) build.cmd All release # release build diff --git a/build.fsx b/build.fsx index 2d0c3f36..3f351e4d 100644 --- a/build.fsx +++ b/build.fsx @@ -171,24 +171,25 @@ Target "Test" (fun _ -> test !! "out/test/**/*UnitTests*.dll") // -------------------------------------------------------------------------------------- // Math.NET Numerics Native Providers +// Requires a local installation of Intel MKL // -------------------------------------------------------------------------------------- // BUILD -let buildx86 subject = MSBuild "" (if hasBuildParam "incremental" then "Build" else "Rebuild") [("Configuration","Release"); ("Platform","Win32")] subject |> ignore -let buildx64 subject = MSBuild "" (if hasBuildParam "incremental" then "Build" else "Rebuild") [("Configuration","Release"); ("Platform","x64")] subject |> ignore +let native32Build subject = MSBuild "" (if hasBuildParam "incremental" then "Build" else "Rebuild") [("Configuration","Release"); ("Platform","Win32")] subject |> ignore +let native64Build subject = MSBuild "" (if hasBuildParam "incremental" then "Build" else "Rebuild") [("Configuration","Release"); ("Platform","x64")] subject |> ignore -Target "BuildNativex86" (fun _ -> buildx86 !! "MathNet.Numerics.NativeProviders.sln") -Target "BuildNativex64" (fun _ -> buildx64 !! "MathNet.Numerics.NativeProviders.sln") -Target "BuildNative" DoNothing +Target "Native32Build" (fun _ -> native32Build !! "MathNet.Numerics.NativeProviders.sln") +Target "Native64Build" (fun _ -> native64Build !! "MathNet.Numerics.NativeProviders.sln") +Target "NativeBuild" DoNothing -"Prepare" ==> "BuildNativex86" ==> "BuildNative" -"Prepare" ==> "BuildNativex64" ==> "BuildNative" +"Prepare" ==> "Native32Build" ==> "NativeBuild" +"Prepare" ==> "Native64Build" ==> "NativeBuild" // TEST -Target "TestNativex86" (fun _ -> +Target "Native32Test" (fun _ -> ActivateFinalTarget "CloseTestRunner" !! "out/MKL/Windows/x86/*UnitTests*.dll" |> NUnit (fun p -> @@ -197,7 +198,7 @@ Target "TestNativex86" (fun _ -> DisableShadowCopy = true TimeOut = TimeSpan.FromMinutes 30. OutputFile = "TestResults.xml" })) -Target "TestNativex64" (fun _ -> +Target "Native64Test" (fun _ -> ActivateFinalTarget "CloseTestRunner" !! "out/MKL/Windows/x64/*UnitTests*.dll" |> NUnit (fun p -> @@ -206,15 +207,15 @@ Target "TestNativex64" (fun _ -> DisableShadowCopy = true TimeOut = TimeSpan.FromMinutes 30. OutputFile = "TestResults.xml" })) -Target "TestNative" DoNothing +Target "NativeTest" DoNothing FinalTarget "CloseTestRunner" (fun _ -> ProcessHelper.killProcess "nunit-agent.exe" ProcessHelper.killProcess "nunit-agent-x86.exe" ) -"BuildNativex86" ==> "TestNativex86" ==> "TestNative" -"BuildNativex64" ==> "TestNativex64" ==> "TestNative" +"Native32Build" ==> "Native32Test" ==> "NativeTest" +"Native64Build" ==> "Native64Test" ==> "NativeTest" // -------------------------------------------------------------------------------------- @@ -327,7 +328,7 @@ Target "NuGet" (fun _ -> // -------------------------------------------------------------------------------------- // Release/Publishing -// These targets are interesting only for maintainers and require write permissions +// Requires permissions; intended only for maintainers // -------------------------------------------------------------------------------------- Target "PublishTag" (fun _ -> diff --git a/docs/content/index.fsx b/docs/content/index.fsx index 37f01e04..1c77b66b 100644 --- a/docs/content/index.fsx +++ b/docs/content/index.fsx @@ -223,12 +223,12 @@ If you do not want to use the official binaries, or if you like to modify, debug build.cmd NuGet all # generate normal NuGet packages (.Net 4.0, 3.5, PCL) build.cmd NuGet signed # generate signed/strong named NuGet packages (.Net 4.0) - build.cmd BuildNativex86 # build native providers 32bit/x86 - build.cmd BuildNativex64 # build native providers 64bit/x64 - build.cmd BuildNative # build native providers for all platforms - build.cmd TestNativex86 # test native providers 32bit/x86 - build.cmd TestNativex64 # test native providers 64bit/x64 - build.cmd TestNative # test native providers for all platforms + build.cmd Native32Build # build native providers 32bit/x86 + build.cmd Native64Build # build native providers 64bit/x64 + build.cmd NativeBuild # build native providers for all platforms + build.cmd Native32Test # test native providers 32bit/x86 + build.cmd Native64Test # test native providers 64bit/x64 + build.cmd NativeTest # test native providers for all platforms build.cmd All # build, test, docs, api reference (.Net 4.0) build.cmd All release # release build