diff --git a/MAINTAINING.md b/MAINTAINING.md index 4aef65ab..ce218bed 100644 --- a/MAINTAINING.md +++ b/MAINTAINING.md @@ -10,13 +10,10 @@ Repository: - Update RELEASENOTES file with relevant changes, attributed by contributor (if external). Set date. - Update CONTRIBUTORS file (via `git shortlog -sn`) -- Create and publish a new annotated git tag for the release, e.g. `git tag -a v2.5.0 -m "v2.5.0"` - Consider to update the repository mirrors at codeplex, gitorious and google ([how to](http://christoph.ruegg.name/blog/2013/1/26/git-howto-mirror-a-github-repository-without-pull-refs.html)). Publish: -- Generate manual release build from internal TeamCity -- Update release notes in NuGet packages (using package explorer) - Upload NuGet packages to the NuGet Gallery - Create new Codeplex and GitHub release, attach Zip files @@ -25,6 +22,4 @@ Misc: - Consider a tweet via [@MathDotNet](https://twitter.com/MathDotNet) - Consider a post to the [Google+ site](https://plus.google.com/112484567926928665204) - Update Wikipedia release version+date for the [Math.NET Numerics](http://en.wikipedia.org/wiki/Math.NET_Numerics) and [Comparison of numerical analysis software](http://en.wikipedia.org/wiki/Comparison_of_numerical_analysis_software) articles. -- Regenerate api reference (at numerics.mathdotnet.com/api) using [docu](https://github.com/cdrnet/docu) and deploy to [website](http://numerics.mathdotnet.com/api/). -- Update documentation if necessary - Consider blog post about changes diff --git a/MathNet.Numerics.sln b/MathNet.Numerics.sln index 4add3886..4b42186d 100644 --- a/MathNet.Numerics.sln +++ b/MathNet.Numerics.sln @@ -26,8 +26,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{A4A66FA9-C00C-4D5C-A776-27516EA0C536}" ProjectSection(SolutionItems) = preProject build.fsx = build.fsx - build\MathNet.Numerics.Data.nuspec = build\MathNet.Numerics.Data.nuspec - build\MathNet.Numerics.Native.nuspec = build\MathNet.Numerics.Native.nuspec + build\MathNet.Numerics.Extension.nuspec = build\MathNet.Numerics.Extension.nuspec build\MathNet.Numerics.nuspec = build\MathNet.Numerics.nuspec build\packages.config = build\packages.config EndProjectSection diff --git a/README.md b/README.md index df09a7b0..0c172abf 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,6 @@ Quick Links * [Downloads](http://mathnetnumerics.codeplex.com/releases) * [Documentation](http://numerics.mathdotnet.com/docs/) * [API Reference](http://numerics.mathdotnet.com/api/) -* [Code Samples](http://github.com/mathnet/mathnet-numerics/tree/master/src/Examples) * [Discussions](http://mathnetnumerics.codeplex.com/discussions) * [Work Items and Bug Tracker](http://github.com/mathnet/mathnet-numerics/issues) * [Ideas & Feedback](http://feedback.mathdotnet.com/forums/2060-math-net-numerics) diff --git a/build.fsx b/build.fsx index 469345c2..76d9ab67 100644 --- a/build.fsx +++ b/build.fsx @@ -131,7 +131,7 @@ let nativeMKLWin32Pack = Summary = nativeSummary Description = nativeSummary ReleaseNotes = nativeReleaseNotes - Tags = "math numeric statistics probability integration interpolation linear algebra matrix fft native mkl x86" + Tags = "math numeric statistics probability integration interpolation linear algebra matrix fft native mkl" Authors = [ "Christoph Ruegg"; "Marcus Cuda"; "Jurgen Van Gael" ] Dependencies = [ "MathNet.Numerics", "2.4.0" ] Files = [ @"..\..\out\MKL\Windows\x86\libiomp5md.dll", Some "content", None; @@ -339,7 +339,6 @@ Target "Zip" (fun _ -> provideCoreFiles "obj/Zip/MathNet.Numerics.Signed" Zip "obj/Zip/" (sprintf "out/packages/Zip/MathNet.Numerics.Signed-%s.zip" packageVersion) !! "obj/Zip/MathNet.Numerics.Signed/**/*.*" CleanDir "obj/Zip") - "Build" ==> "Zip" Target "NativeZip" (fun _ -> @@ -349,7 +348,6 @@ Target "NativeZip" (fun _ -> provideNativeFiles "obj/Zip/MathNet.Numerics.MKL" Zip "obj/Zip/" (sprintf "out/MKL/packages/Zip/MathNet.Numerics.MKL-%s.zip" nativePackageVersion) !! "obj/Zip/MathNet.Numerics.MKL/**/*.*" CleanDir "obj/Zip") - "NativeBuild" ==> "NativeZip" Target "DataZip" (fun _ -> @@ -359,7 +357,6 @@ Target "DataZip" (fun _ -> provideDataFiles "obj/Zip/MathNet.Numerics.Data" Zip "obj/Zip/" (sprintf "out/Data/packages/Zip/MathNet.Numerics.Data-%s.zip" dataPackageVersion) !! "obj/Zip/MathNet.Numerics.Data/**/*.*" CleanDir "obj/Zip") - "DataBuild" ==> "DataZip" // NUGET @@ -393,6 +390,13 @@ let nugetPack pack outPath = NuGet (updateNuspec pack outPath NugetSymbolPackage.None (withLicenseReadme >> withoutSymbolsSources)) "build/MathNet.Numerics.nuspec" CleanDir "obj/NuGet" +let nugetPackExtension pack extraFiles outPath = + CleanDir "obj/NuGet" + extraFiles "obj/NuGet" + let withLicenseReadme f = [ "license.txt", None, None; "readme.txt", None, None; ] @ f + NuGet (updateNuspec pack outPath NugetSymbolPackage.None withLicenseReadme) "build/MathNet.Numerics.Extension.nuspec" + CleanDir "obj/NuGet" + Target "NuGet" (fun _ -> let outPath = "out/packages/NuGet" CleanDir outPath @@ -403,39 +407,22 @@ Target "NuGet" (fun _ -> nugetPack numericsPack outPath nugetPack fsharpPack outPath CleanDir "obj/NuGet") - "Build" ==> "NuGet" -let nativeNugetPack pack outPath = - CleanDir "obj/NuGet" - provideNativeFiles "obj/NuGet" - let withLicenseReadme f = [ "license.txt", None, None; "readme.txt", None, None; ] @ f - NuGet (updateNuspec pack outPath NugetSymbolPackage.None withLicenseReadme) "build/MathNet.Numerics.Native.nuspec" - CleanDir "obj/NuGet" - Target "NativeNuGet" (fun _ -> let outPath = "out/MKL/packages/NuGet" CleanDir outPath - nativeNugetPack nativeMKLWin32Pack outPath - nativeNugetPack nativeMKLWin64Pack outPath + nugetPackExtension nativeMKLWin32Pack provideNativeFiles outPath + nugetPackExtension nativeMKLWin64Pack provideNativeFiles outPath CleanDir "obj/NuGet") - "NativeBuild" ==> "NativeNuGet" -let dataNugetPack pack outPath = - CleanDir "obj/NuGet" - provideDataFiles "obj/NuGet" - let withLicenseReadme f = [ "license.txt", None, None; "readme.txt", None, None; ] @ f - NuGet (updateNuspec pack outPath NugetSymbolPackage.None withLicenseReadme) "build/MathNet.Numerics.Data.nuspec" - CleanDir "obj/NuGet" - Target "DataNuGet" (fun _ -> let outPath = "out/Data/packages/NuGet" CleanDir outPath - dataNugetPack dataTextPack outPath - dataNugetPack dataMatlabPack outPath + nugetPackExtension dataTextPack provideDataFiles outPath + nugetPackExtension dataMatlabPack provideDataFiles outPath CleanDir "obj/NuGet") - "DataBuild" ==> "DataNuGet" @@ -483,33 +470,20 @@ Target "Api" (fun _ -> // Requires permissions; intended only for maintainers // -------------------------------------------------------------------------------------- -let pushGitTag tag = - let _, remotes, _ = Git.CommandHelper.runGitCommand "." "remote -v" - let main = remotes |> Seq.find (fun s -> s.Contains("(push)") && s.Contains("mathnet/mathnet-numerics")) - let remoteName = main.Split('\t').[0] - Git.Branches.pushTag "." remoteName tag - -Target "PublishTag" (fun _ -> +let publishReleaseTag title prefix version notes = // inspired by Deedle/tpetricek - let tagName = "v" + packageVersion - let tagMessage = String.concat Environment.NewLine ["Math.NET Numerics v" + packageVersion; ""; releaseNotes ] + let tagName = prefix + "v" + version + let tagMessage = String.concat Environment.NewLine [title + " v" + version; ""; notes ] let cmd = sprintf """tag -a %s -m "%s" """ tagName tagMessage Git.CommandHelper.runSimpleGitCommand "." cmd |> printfn "%s" - pushGitTag tagName) - -Target "NativePublishTag" (fun _ -> - let tagName = "native-v" + nativePackageVersion - let tagMessage = String.concat Environment.NewLine ["Math.NET Numerics Native Providers v" + nativePackageVersion; ""; nativeReleaseNotes ] - let cmd = sprintf """tag -a %s -m "%s" """ tagName tagMessage - Git.CommandHelper.runSimpleGitCommand "." cmd |> printfn "%s" - pushGitTag tagName) + let _, remotes, _ = Git.CommandHelper.runGitCommand "." "remote -v" + let main = remotes |> Seq.find (fun s -> s.Contains("(push)") && s.Contains("mathnet/mathnet-numerics")) + let remoteName = main.Split('\t').[0] + Git.Branches.pushTag "." remoteName tagName -Target "DataPublishTag" (fun _ -> - let tagName = "data-v" + dataPackageVersion - let tagMessage = String.concat Environment.NewLine ["Math.NET Numerics Data Extensions v" + dataPackageVersion; ""; dataReleaseNotes ] - let cmd = sprintf """tag -a %s -m "%s" """ tagName tagMessage - Git.CommandHelper.runSimpleGitCommand "." cmd |> printfn "%s" - pushGitTag tagName) +Target "PublishTag" (fun _ -> publishReleaseTag "Math.NET Numerics" "" packageVersion releaseNotes) +Target "NativePublishTag" (fun _ -> publishReleaseTag "Math.NET Numerics Native Providers" "native-" nativePackageVersion nativeReleaseNotes) +Target "DataPublishTag" (fun _ -> publishReleaseTag "Math.NET Numerics Data Extensions" "data-" dataPackageVersion dataReleaseNotes) Target "PublishDocs" (fun _ -> let repo = "../mathnet-websites" diff --git a/build/MathNet.Numerics.Data.nuspec b/build/MathNet.Numerics.Extension.nuspec similarity index 100% rename from build/MathNet.Numerics.Data.nuspec rename to build/MathNet.Numerics.Extension.nuspec diff --git a/build/MathNet.Numerics.Native.nuspec b/build/MathNet.Numerics.Native.nuspec deleted file mode 100644 index 705d49dd..00000000 --- a/build/MathNet.Numerics.Native.nuspec +++ /dev/null @@ -1,19 +0,0 @@ - - - - @project@ - @build.number@ - @title@ - @summary@ - @description@ - @authors@ - http://numerics.mathdotnet.com/ - http://www.mathdotnet.com/images/MathNet128.png - http://numerics.mathdotnet.com/docs/License.html - false - @tags@ - @releaseNotes@ - @dependencies@ - - @files@ -