us1zcljz
/
mathnet-numerics
forked from tsai/mathnet-numerics
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Build: prefix all native targets with 'Native'

provider
Christoph Ruegg 12 years ago
parent
6be15f936c
commit
d5765d047d
3 changed files with 26 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      README.md
  2. 27
      build.fsx
  3. 12
      docs/content/index.fsx

12
README.md
View File

@ -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 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 NuGet signed # generate signed/strong named NuGet packages (.Net 4.0)
build.cmd BuildNativex86 # build native providers 32bit/x86 build.cmd Native32Build # build native providers 32bit/x86
build.cmd BuildNativex64 # build native providers 64bit/x64 build.cmd Native64Build # build native providers 64bit/x64
build.cmd BuildNative # build native providers for all platforms build.cmd NativeBuild # build native providers for all platforms
build.cmd TestNativex86 # test native providers 32bit/x86 build.cmd Native32Test # test native providers 32bit/x86
build.cmd TestNativex64 # test native providers 64bit/x64 build.cmd Native64Test # test native providers 64bit/x64
build.cmd TestNative # test native providers for all platforms build.cmd NativeTest # test native providers for all platforms
build.cmd All # build, test, docs, api reference (.Net 4.0) build.cmd All # build, test, docs, api reference (.Net 4.0)
build.cmd All release # release build build.cmd All release # release build

27
build.fsx
View File

@ -171,24 +171,25 @@ Target "Test" (fun _ -> test !! "out/test/**/*UnitTests*.dll")
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// Math.NET Numerics Native Providers // Math.NET Numerics Native Providers
// Requires a local installation of Intel MKL
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// BUILD // BUILD
let buildx86 subject = MSBuild "" (if hasBuildParam "incremental" then "Build" else "Rebuild") [("Configuration","Release"); ("Platform","Win32")] subject |> ignore let native32Build 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 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 "Native32Build" (fun _ -> native32Build !! "MathNet.Numerics.NativeProviders.sln")
Target "BuildNativex64" (fun _ -> buildx64 !! "MathNet.Numerics.NativeProviders.sln") Target "Native64Build" (fun _ -> native64Build !! "MathNet.Numerics.NativeProviders.sln")
Target "BuildNative" DoNothing Target "NativeBuild" DoNothing
"Prepare" ==> "BuildNativex86" ==> "BuildNative" "Prepare" ==> "Native32Build" ==> "NativeBuild"
"Prepare" ==> "BuildNativex64" ==> "BuildNative" "Prepare" ==> "Native64Build" ==> "NativeBuild"
// TEST // TEST
Target "TestNativex86" (fun _ -> Target "Native32Test" (fun _ ->
ActivateFinalTarget "CloseTestRunner" ActivateFinalTarget "CloseTestRunner"
!! "out/MKL/Windows/x86/*UnitTests*.dll" !! "out/MKL/Windows/x86/*UnitTests*.dll"
|> NUnit (fun p -> |> NUnit (fun p ->
@ -197,7 +198,7 @@ Target "TestNativex86" (fun _ ->
DisableShadowCopy = true DisableShadowCopy = true
TimeOut = TimeSpan.FromMinutes 30. TimeOut = TimeSpan.FromMinutes 30.
OutputFile = "TestResults.xml" })) OutputFile = "TestResults.xml" }))
Target "TestNativex64" (fun _ -> Target "Native64Test" (fun _ ->
ActivateFinalTarget "CloseTestRunner" ActivateFinalTarget "CloseTestRunner"
!! "out/MKL/Windows/x64/*UnitTests*.dll" !! "out/MKL/Windows/x64/*UnitTests*.dll"
|> NUnit (fun p -> |> NUnit (fun p ->
@ -206,15 +207,15 @@ Target "TestNativex64" (fun _ ->
DisableShadowCopy = true DisableShadowCopy = true
TimeOut = TimeSpan.FromMinutes 30. TimeOut = TimeSpan.FromMinutes 30.
OutputFile = "TestResults.xml" })) OutputFile = "TestResults.xml" }))
Target "TestNative" DoNothing Target "NativeTest" DoNothing
FinalTarget "CloseTestRunner" (fun _ -> FinalTarget "CloseTestRunner" (fun _ ->
ProcessHelper.killProcess "nunit-agent.exe" ProcessHelper.killProcess "nunit-agent.exe"
ProcessHelper.killProcess "nunit-agent-x86.exe" ProcessHelper.killProcess "nunit-agent-x86.exe"
) )
"BuildNativex86" ==> "TestNativex86" ==> "TestNative" "Native32Build" ==> "Native32Test" ==> "NativeTest"
"BuildNativex64" ==> "TestNativex64" ==> "TestNative" "Native64Build" ==> "Native64Test" ==> "NativeTest"
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
@ -327,7 +328,7 @@ Target "NuGet" (fun _ ->
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// Release/Publishing // Release/Publishing
// These targets are interesting only for maintainers and require write permissions // Requires permissions; intended only for maintainers
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
Target "PublishTag" (fun _ -> Target "PublishTag" (fun _ ->

12
docs/content/index.fsx
View File

@ -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 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 NuGet signed # generate signed/strong named NuGet packages (.Net 4.0)
build.cmd BuildNativex86 # build native providers 32bit/x86 build.cmd Native32Build # build native providers 32bit/x86
build.cmd BuildNativex64 # build native providers 64bit/x64 build.cmd Native64Build # build native providers 64bit/x64
build.cmd BuildNative # build native providers for all platforms build.cmd NativeBuild # build native providers for all platforms
build.cmd TestNativex86 # test native providers 32bit/x86 build.cmd Native32Test # test native providers 32bit/x86
build.cmd TestNativex64 # test native providers 64bit/x64 build.cmd Native64Test # test native providers 64bit/x64
build.cmd TestNative # test native providers for all platforms build.cmd NativeTest # test native providers for all platforms
build.cmd All # build, test, docs, api reference (.Net 4.0) build.cmd All # build, test, docs, api reference (.Net 4.0)
build.cmd All release # release build build.cmd All release # release build

Write Preview
Loading…
Cancel
Save