diff --git a/MathNet.Numerics.Data.sln b/MathNet.Numerics.Data.sln index 1941f4a3..f1152537 100644 --- a/MathNet.Numerics.Data.sln +++ b/MathNet.Numerics.Data.sln @@ -11,6 +11,24 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Text", "src\Data\Text\Text. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics", "src\Numerics\Numerics.csproj", "{B7CAE5F4-A23F-4438-B5BE-41226618B695}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readme", "Readme", "{F510F04E-7503-4F87-A1EC-3A5FBA1DF7B8}" + ProjectSection(SolutionItems) = preProject + CONTRIBUTING.md = CONTRIBUTING.md + CONTRIBUTORS.md = CONTRIBUTORS.md + LICENSE.md = LICENSE.md + MAINTAINING.md = MAINTAINING.md + README.md = README.md + RELEASENOTES-Data.md = RELEASENOTES-Data.md + RELEASENOTES.md = RELEASENOTES.md + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{D954831A-F51A-436A-9F17-0DFC7AEC7113}" + ProjectSection(SolutionItems) = preProject + build.fsx = build.fsx + build\MathNet.Numerics.nuspec = build\MathNet.Numerics.nuspec + build\packages.config = build\packages.config + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/MathNet.Numerics.sln b/MathNet.Numerics.sln index b137c14f..4add3886 100644 --- a/MathNet.Numerics.sln +++ b/MathNet.Numerics.sln @@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readme", "Readme", "{C2F374 LICENSE.md = LICENSE.md MAINTAINING.md = MAINTAINING.md README.md = README.md + RELEASENOTES-Data.md = RELEASENOTES-Data.md RELEASENOTES-Native.md = RELEASENOTES-Native.md RELEASENOTES.md = RELEASENOTES.md EndProjectSection @@ -25,6 +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.nuspec = build\MathNet.Numerics.nuspec build\packages.config = build\packages.config diff --git a/RELEASENOTES-Data.md b/RELEASENOTES-Data.md new file mode 100644 index 00000000..62b078ba --- /dev/null +++ b/RELEASENOTES-Data.md @@ -0,0 +1,2 @@ +### 3.0.0-beta01 - 2014-04-23 +* First v3 beta release diff --git a/build.fsx b/build.fsx index 8cc0bd85..469345c2 100644 --- a/build.fsx +++ b/build.fsx @@ -53,7 +53,7 @@ let buildPart = "0" let assemblyVersion = release.AssemblyVersion + "." + buildPart let packageVersion = release.NugetVersion let releaseNotes = release.Notes |> List.map (fun l -> l.Replace("*","").Replace("`","")) |> toLines -trace (sprintf " Math.NET Numerics v%s" release.NugetVersion) +trace (sprintf " Math.NET Numerics v%s" packageVersion) let summary = "Math.NET Numerics, providing methods and algorithms for numerical computations in science, engineering and every day use." let description = "Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. " @@ -120,8 +120,7 @@ let nativeBuildPart = "0" let nativeAssemblyVersion = nativeRelease.AssemblyVersion + "." + nativeBuildPart let nativePackageVersion = nativeRelease.NugetVersion let nativeReleaseNotes = nativeRelease.Notes |> List.map (fun l -> l.Replace("*","").Replace("`","")) |> toLines -trace (sprintf " Math.NET Numerics Native Providers v%s" nativeRelease.NugetVersion) -trace "" +trace (sprintf " Math.NET Numerics Native Providers v%s" nativePackageVersion) let nativeSummary = "Intel MKL native libraries for Math.NET Numerics. Requires an Intel MKL license if redistributed." @@ -145,6 +144,46 @@ let nativeMKLWin64Pack = @"..\..\out\MKL\Windows\x64\MathNet.Numerics.MKL.dll", Some "content", None ] } +// DATA EXTENSION PACKAGES + +let dataRelease = LoadReleaseNotes "RELEASENOTES-Data.md" +let dataBuildPart = "0" +let dataAssemblyVersion = dataRelease.AssemblyVersion + "." + dataBuildPart +let dataPackageVersion = dataRelease.NugetVersion +let dataReleaseNotes = dataRelease.Notes |> List.map (fun l -> l.Replace("*","").Replace("`","")) |> toLines +trace (sprintf " Math.NET Numerics Data Extensions v%s" dataPackageVersion) +trace "" + +let dataTextSummary = "Text Data Input/Output Extensions for Math.NET Numerics, the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use." +let dataMatlabSummary = "MathWorks MATLAB Data Input/Output Extensions for Math.NET Numerics, the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use." + +let dataTextPack = + { Id = "MathNet.Numerics.Data.Text" + Version = dataPackageVersion + Title = "Math.NET Numerics - Text Data I/O Extensions" + Summary = dataTextSummary + Description = dataTextSummary + ReleaseNotes = dataReleaseNotes + Tags = "math numeric data text csv tsv json xml" + Authors = [ "Christoph Ruegg"; "Marcus Cuda" ] + Dependencies = [ "MathNet.Numerics", packageVersion ] + Files = [ @"..\..\out\Data\lib\Net40\MathNet.Numerics.Data.Text.dll", Some libnet40, None; + @"..\..\out\Data\lib\Net40\MathNet.Numerics.Data.Text.xml", Some libnet40, None ] } + +let dataMatlabPack = + { Id = "MathNet.Numerics.Data.Matlab" + Version = dataPackageVersion + Title = "Math.NET Numerics - MATLAB Data I/O Extensions" + Summary = dataMatlabSummary + Description = dataMatlabSummary + ReleaseNotes = dataReleaseNotes + Tags = "math numeric data matlab" + Authors = [ "Christoph Ruegg"; "Marcus Cuda" ] + Dependencies = [ "MathNet.Numerics", packageVersion ] + Files = [ @"..\..\out\Data\lib\Net40\MathNet.Numerics.Data.Matlab.dll", Some libnet40, None; + @"..\..\out\Data\lib\Net40\MathNet.Numerics.Data.Matlab.xml", Some libnet40, None ] } + + // -------------------------------------------------------------------------------------- // PREPARE // -------------------------------------------------------------------------------------- @@ -156,21 +195,28 @@ Target "Clean" (fun _ -> CleanDirs [ "out/api"; "out/docs"; "out/packages" ] CleanDirs [ "out/lib/Net35"; "out/lib/Net40"; "out/lib/Profile47"; "out/lib/Profile344" ] CleanDirs [ "out/test/Net35"; "out/test/Net40"; "out/test/Profile47"; "out/test/Profile344" ] - CleanDirs [ "out/lib-signed/Net40" ] - CleanDirs [ "out/test-signed/Net40" ] - CleanDirs [ "out/MKL"; "out/ATLAS" ]) + CleanDirs [ "out/lib-signed/Net40"; "out/test-signed/Net40" ] // Signed Build + CleanDirs [ "out/MKL"; "out/ATLAS" ] // Native Providers + CleanDirs [ "out/Data" ]) // Data Extensions Target "RestorePackages" RestorePackages Target "ApplyVersion" (fun _ -> - BulkReplaceAssemblyInfoVersions "src/" (fun f -> - { f with - AssemblyVersion = assemblyVersion - AssemblyFileVersion = assemblyVersion - AssemblyInformationalVersion = packageVersion }) + let patchAssemblyInfo path assemblyVersion packageVersion = + BulkReplaceAssemblyInfoVersions path (fun f -> + { f with + AssemblyVersion = assemblyVersion + AssemblyFileVersion = assemblyVersion + AssemblyInformationalVersion = packageVersion }) + patchAssemblyInfo "src/Numerics" assemblyVersion packageVersion + patchAssemblyInfo "src/FSharp" assemblyVersion packageVersion + patchAssemblyInfo "src/UnitTests" assemblyVersion packageVersion + patchAssemblyInfo "src/FSharpUnitTests" assemblyVersion packageVersion + patchAssemblyInfo "src/Data" dataAssemblyVersion dataPackageVersion + patchAssemblyInfo "src/DataUnitTests" dataAssemblyVersion dataPackageVersion ReplaceInFile - (regex_replace "\d+\.\d+\.\d+\.\d+" nativeAssemblyVersion - >> regex_replace "\d+,\d+,\d+,\d+" (replace "." "," nativeAssemblyVersion)) + (regex_replace @"\d+\.\d+\.\d+\.\d+" nativeAssemblyVersion + >> regex_replace @"\d+,\d+,\d+,\d+" (replace "." "," nativeAssemblyVersion)) "src/NativeProviders/Common/resource.rc") Target "Prepare" DoNothing @@ -211,6 +257,9 @@ Target "NativeBuild" DoNothing "Prepare" ==> "Native32Build" ==> "NativeBuild" "Prepare" ==> "Native64Build" ==> "NativeBuild" +Target "DataBuild" (fun _ -> build !! "MathNet.Numerics.Data.sln") +"Prepare" ==> "DataBuild" + // -------------------------------------------------------------------------------------- // TEST @@ -255,6 +304,9 @@ FinalTarget "CloseTestRunner" (fun _ -> "Native32Build" ==> "Native32Test" ==> "NativeTest" "Native64Build" ==> "Native64Test" ==> "NativeTest" +Target "DataTest" (fun _ -> test !! "out/Data/test/**/*UnitTests*.dll") +"DataBuild" ==> "DataTest" + // -------------------------------------------------------------------------------------- // PACKAGES @@ -271,6 +323,7 @@ let provideLicenseReadme title license releasenotes path = |> ReplaceFile readmePath let provideCoreFiles = provideLicenseReadme (sprintf "Math.NET Numerics v%s" packageVersion) "LICENSE.md" "RELEASENOTES.md" let provideNativeFiles = provideLicenseReadme (sprintf "Math.NET Numerics Native Providers v%s" nativePackageVersion) "LICENSE.md" "RELEASENOTES-Native.md" +let provideDataFiles = provideLicenseReadme (sprintf "Math.NET Numerics Data Extensions v%s" dataPackageVersion) "LICENSE.md" "RELEASENOTES-Data.md" // ZIP @@ -299,6 +352,16 @@ Target "NativeZip" (fun _ -> "NativeBuild" ==> "NativeZip" +Target "DataZip" (fun _ -> + CleanDir "out/Data/packages/Zip" + CleanDir "obj/Zip" + CopyDir "obj/Zip/MathNet.Numerics.Data" "out/Data/lib" (fun f -> f.Contains("MathNet.Numerics.Data.")) + 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 let updateNuspec pack outPath symbols updateFiles spec = @@ -359,6 +422,22 @@ Target "NativeNuGet" (fun _ -> "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 + CleanDir "obj/NuGet") + +"DataBuild" ==> "DataNuGet" + // -------------------------------------------------------------------------------------- // Documentation @@ -419,13 +498,19 @@ Target "PublishTag" (fun _ -> pushGitTag tagName) Target "NativePublishTag" (fun _ -> - // create tag with release notes 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) +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 "PublishDocs" (fun _ -> let repo = "../mathnet-websites" Git.Branches.pull repo "origin" "master" @@ -454,6 +539,11 @@ Target "NativePublish" DoNothing "PublishDocs" ==> "NativePublish" "PublishApi" ==> "NativePublish" +Target "DataPublish" DoNothing +"DataPublishTag" ==> "DataPublish" +"PublishDocs" ==> "DataPublish" +"PublishApi" ==> "DataPublish" + // -------------------------------------------------------------------------------------- // Default Targets @@ -473,8 +563,36 @@ Target "NativeAll" DoNothing "NativeNuGet" ==> "NativeAll" "NativeTest" ==> "NativeAll" +Target "DataAll" DoNothing +"DataBuild" ==> "DataAll" +"DataZip" ==> "DataAll" +"DataNuGet" ==> "DataAll" +"DataTest" ==> "DataAll" + +Target "UltimateBuild" DoNothing +"Build" ==> "UltimateBuild" +"NativeBuild" ==> "UltimateBuild" +"DataBuild" ==> "UltimateBuild" + +Target "UltimateTest" DoNothing +"UltimateBuild" ==> "UltimateTest" +"Test" ==> "UltimateTest" +"NativeTest" ==> "UltimateTest" +"DataTest" ==> "UltimateTest" + +Target "UltimatePack" DoNothing +"UltimateBuild" ==> "UltimatePack" +"Zip" ==> "UltimatePack" +"NuGet" ==> "UltimatePack" +"NativeZip" ==> "UltimatePack" +"NativeNuGet" ==> "UltimatePack" +"DataZip" ==> "UltimatePack" +"DataNuGet" ==> "UltimatePack" + Target "Ultimate" DoNothing "All" ==> "Ultimate" -"NativeAll" ==> "Ultimate" +"UltimateBuild" ==> "Ultimate" +"UltimatePack" ==> "Ultimate" +"UltimateTest" ==> "Ultimate" RunTargetOrDefault "Test" diff --git a/build/MathNet.Numerics.Data.nuspec b/build/MathNet.Numerics.Data.nuspec new file mode 100644 index 00000000..705d49dd --- /dev/null +++ b/build/MathNet.Numerics.Data.nuspec @@ -0,0 +1,19 @@ + + + + @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@ + diff --git a/src/Data/Matlab/Matlab.csproj b/src/Data/Matlab/Matlab.csproj index 037bb356..667742d3 100644 --- a/src/Data/Matlab/Matlab.csproj +++ b/src/Data/Matlab/Matlab.csproj @@ -16,9 +16,9 @@ true full false - ..\..\..\out\lib-debug\Net40\ - ..\..\..\obj\lib-debug\Net40\ - ..\..\..\obj\lib-debug\Net40\ + ..\..\..\out\Data\lib-debug\Net40\ + ..\..\..\obj\Data\lib-debug\Net40\ + ..\..\..\obj\Data\lib-debug\Net40\ DEBUG;TRACE prompt 4 @@ -26,10 +26,10 @@ pdbonly true - ..\..\..\out\lib\Net40\ - ..\..\..\obj\lib\Net40\ - ..\..\..\obj\lib\Net40\ - ..\..\..\out\lib\Net40\MathNet.Numerics.Data.Matlab.xml + ..\..\..\out\Data\lib\Net40\ + ..\..\..\obj\Data\lib\Net40\ + ..\..\..\obj\Data\lib\Net40\ + ..\..\..\out\Data\lib\Net40\MathNet.Numerics.Data.Matlab.xml TRACE prompt 4 diff --git a/src/Data/Matlab/Properties/AssemblyInfo.cs b/src/Data/Matlab/Properties/AssemblyInfo.cs index acf8fe80..f4b9797b 100644 --- a/src/Data/Matlab/Properties/AssemblyInfo.cs +++ b/src/Data/Matlab/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -// +// // Math.NET Numerics, part of the Math.NET Project // http://mathnet.opensourcedotnet.info // @@ -35,12 +35,13 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Marcus Cuda, Christoph Ruegg")] [assembly: AssemblyProduct("Math.NET Numerics")] -[assembly: AssemblyCopyright("Copyright © Math.NET Project")] +[assembly: AssemblyCopyright("Copyright © Math.NET Project")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: CLSCompliant(true)] [assembly: ComVisible(false)] [assembly: Guid("1a350030-3ad3-4e15-953d-33342a371aba")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyFileVersion("3.0.0.0")] +[assembly: AssemblyInformationalVersion("3.0.0-beta01")] diff --git a/src/Data/Text/Properties/AssemblyInfo.cs b/src/Data/Text/Properties/AssemblyInfo.cs index f45b9d41..f8b92b35 100644 --- a/src/Data/Text/Properties/AssemblyInfo.cs +++ b/src/Data/Text/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -// +// // Math.NET Numerics, part of the Math.NET Project // http://mathnet.opensourcedotnet.info // @@ -35,12 +35,13 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Marcus Cuda, Christoph Ruegg")] [assembly: AssemblyProduct("Math.NET Numerics")] -[assembly: AssemblyCopyright("Copyright © Math.NET Project")] +[assembly: AssemblyCopyright("Copyright © Math.NET Project")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: CLSCompliant(true)] [assembly: ComVisible(false)] [assembly: Guid("d9f6a513-7772-4a7d-a15e-668dfcdf5b00")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyFileVersion("3.0.0.0")] +[assembly: AssemblyInformationalVersion("3.0.0-beta01")] diff --git a/src/Data/Text/Text.csproj b/src/Data/Text/Text.csproj index d1606c57..2e2ac5fe 100644 --- a/src/Data/Text/Text.csproj +++ b/src/Data/Text/Text.csproj @@ -16,9 +16,9 @@ true full false - ..\..\..\out\lib-debug\Net40\ - ..\..\..\obj\lib-debug\Net40\ - ..\..\..\obj\lib-debug\Net40\ + ..\..\..\out\Data\lib-debug\Net40\ + ..\..\..\obj\Data\lib-debug\Net40\ + ..\..\..\obj\Data\lib-debug\Net40\ DEBUG;TRACE prompt 4 @@ -26,10 +26,10 @@ pdbonly true - ..\..\..\out\lib\Net40\ - ..\..\..\obj\lib\Net40\ - ..\..\..\obj\lib\Net40\ - ..\..\..\out\lib\Net40\MathNet.Numerics.Data.Text.xml + ..\..\..\out\Data\lib\Net40\ + ..\..\..\obj\Data\lib\Net40\ + ..\..\..\obj\Data\lib\Net40\ + ..\..\..\out\Data\lib\Net40\MathNet.Numerics.Data.Text.xml TRACE prompt 4 diff --git a/src/DataUnitTests/Properties/AssemblyInfo.cs b/src/DataUnitTests/Properties/AssemblyInfo.cs index 1062265f..13ae129a 100644 --- a/src/DataUnitTests/Properties/AssemblyInfo.cs +++ b/src/DataUnitTests/Properties/AssemblyInfo.cs @@ -1,36 +1,19 @@ -using System.Reflection; -using System.Runtime.CompilerServices; +using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. [assembly: AssemblyTitle("NUnitTests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("NUnitTests")] -[assembly: AssemblyCopyright("Copyright © 2013")] +[assembly: AssemblyCopyright("Copyright © 2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] -// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: ComVisible(false)] [assembly: Guid("bb41bee6-eb4c-48c9-8edd-7a5ae2422567")] -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyFileVersion("3.0.0.0")] +[assembly: AssemblyInformationalVersion("3.0.0-beta01")] diff --git a/src/DataUnitTests/UnitTests.csproj b/src/DataUnitTests/UnitTests.csproj index 206f09ea..aaaeaeba 100644 --- a/src/DataUnitTests/UnitTests.csproj +++ b/src/DataUnitTests/UnitTests.csproj @@ -16,9 +16,9 @@ true full false - ..\..\out\test-debug\Net40\ - ..\..\obj\test-debug\Net40\ - ..\..\obj\test-debug\Net40\ + ..\..\out\Data\test-debug\Net40\ + ..\..\obj\Data\test-debug\Net40\ + ..\..\obj\Data\test-debug\Net40\ DEBUG;TRACE prompt 4 @@ -26,9 +26,9 @@ pdbonly true - ..\..\out\test\Net40\ - ..\..\obj\test\Net40\ - ..\..\obj\test\Net40\ + ..\..\out\Data\test\Net40\ + ..\..\obj\Data\test\Net40\ + ..\..\obj\Data\test\Net40\ TRACE prompt 4