diff --git a/.gitignore b/.gitignore index 00c7a87f..5b0bcd1b 100644 --- a/.gitignore +++ b/.gitignore @@ -57,11 +57,11 @@ Desktop.ini # NOTE: we do NOT use package restore in the core projects, but do use it with FAKE builds. packages/* !packages/.gitattributes -!packages/repositories.config -!packages/NUnit -!packages/FsUnit !packages/TaskParallelLibrary !packages/FSharp.Core +!packages/test/NUnit +!packages/test/FsUnit +!packages/test/FSharp.Core # FAKE & Paket packages/FAKE diff --git a/build.cmd b/build.cmd index 40aff456..cd4d1669 100644 --- a/build.cmd +++ b/build.cmd @@ -11,4 +11,4 @@ if errorlevel 1 ( exit /b %errorlevel% ) -packages\FAKE\tools\FAKE.exe build.fsx %* +packages\build\FAKE\tools\FAKE.exe build.fsx %* diff --git a/build.fsx b/build.fsx index 328c816c..7242ce8c 100644 --- a/build.fsx +++ b/build.fsx @@ -15,8 +15,8 @@ // PRELUDE // -------------------------------------------------------------------------------------- -#I "packages/FAKE/tools" -#r "packages/FAKE/tools/FakeLib.dll" +#I "packages/build/FAKE/tools" +#r "packages/build/FAKE/tools/FakeLib.dll" open Fake open Fake.DocuHelper @@ -123,7 +123,7 @@ let numericsPack = Authors = [ "Christoph Ruegg"; "Marcus Cuda"; "Jurgen Van Gael" ] Dependencies = [ { FrameworkVersion="net35" - Dependencies=[ "TaskParallelLibrary", GetPackageVersion "packages" "TaskParallelLibrary" ] } + Dependencies=[ "TaskParallelLibrary", GetPackageVersion "./packages/" "TaskParallelLibrary" ] } { FrameworkVersion="net40" Dependencies=[] } ] Files = @@ -146,7 +146,7 @@ let fsharpPack = Dependencies = [ { FrameworkVersion="" Dependencies=[ "MathNet.Numerics", RequireExactly packageVersion - "FSharp.Core", GetPackageVersion "packages" "FSharp.Core" ] } ] + "FSharp.Core", GetPackageVersion "./packages/" "FSharp.Core" ] } ] Files = [ @"..\..\out\lib\Net35\MathNet.Numerics.FSharp.*", Some libnet35, None; @"..\..\out\lib\Net40\MathNet.Numerics.FSharp.*", Some libnet40, None; @@ -175,7 +175,7 @@ let fsharpSignedPack = Dependencies = [ { FrameworkVersion="" Dependencies=[ "MathNet.Numerics.Signed", RequireExactly packageVersion - "FSharp.Core", GetPackageVersion "packages" "FSharp.Core" ] } ] + "FSharp.Core", GetPackageVersion "./packages/" "FSharp.Core" ] } ] Files = [ @"..\..\out\lib-signed\Net40\MathNet.Numerics.FSharp.*", Some libnet40, None; @"MathNet.Numerics.fsx", None, None; @@ -363,7 +363,7 @@ let dataTextPack = Authors = [ "Christoph Ruegg"; "Marcus Cuda" ] Dependencies = [ { FrameworkVersion="" - Dependencies=[ "MathNet.Numerics", GetPackageVersion "packages" "MathNet.Numerics" ] } ] + Dependencies=[ "MathNet.Numerics", GetPackageVersion "./packages/data/" "MathNet.Numerics" ] } ] 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 ] } @@ -379,7 +379,7 @@ let dataMatlabPack = Authors = [ "Christoph Ruegg"; "Marcus Cuda" ] Dependencies = [ { FrameworkVersion="" - Dependencies=[ "MathNet.Numerics", GetPackageVersion "packages" "MathNet.Numerics" ] } ] + Dependencies=[ "MathNet.Numerics", GetPackageVersion "./packages/data/" "MathNet.Numerics" ] } ] 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 ] } @@ -653,7 +653,7 @@ Target "DataZip" (fun _ -> // NUGET let updateNuspec (pack:Package) outPath symbols updateFiles spec = - { spec with ToolPath = "packages/NuGet.CommandLine/tools/NuGet.exe" + { spec with ToolPath = "packages/build/NuGet.CommandLine/tools/NuGet.exe" OutputPath = outPath WorkingDir = "obj/NuGet" Version = pack.Version @@ -881,7 +881,7 @@ let publishNuGet packageFiles = let args = sprintf "push \"%s\"" (FullName file) let result = ExecProcess (fun info -> - info.FileName <- "packages/NuGet.CommandLine/tools/NuGet.exe" + info.FileName <- "packages/tools/NuGet.CommandLine/tools/NuGet.exe" info.WorkingDirectory <- FullName "obj/NuGet" info.Arguments <- args) (TimeSpan.FromMinutes 10.) if result <> 0 then failwith "Error during NuGet push." diff --git a/build.sh b/build.sh index 659c1a67..af6a467c 100755 --- a/build.sh +++ b/build.sh @@ -28,4 +28,4 @@ fi run .paket/paket.bootstrapper.exe run .paket/paket.exe restore -run packages/FAKE/tools/FAKE.exe "$@" $FSIARGS build.fsx +run packages/build/FAKE/tools/FAKE.exe "$@" $FSIARGS build.fsx diff --git a/docs/tools/build-docs.fsx b/docs/tools/build-docs.fsx index 9540a5b0..63f6b2cf 100644 --- a/docs/tools/build-docs.fsx +++ b/docs/tools/build-docs.fsx @@ -21,9 +21,9 @@ let info = // For typical project, no changes are needed below // -------------------------------------------------------------------------------------- -#load "../../packages/FSharp.Formatting/FSharp.Formatting.fsx" -#r "../../packages/FAKE/tools/NuGet.Core.dll" -#r "../../packages/FAKE/tools/FakeLib.dll" +#load "../../packages/build/FSharp.Formatting/FSharp.Formatting.fsx" +#r "../../packages/build/FAKE/tools/NuGet.Core.dll" +#r "../../packages/build/FAKE/tools/FakeLib.dll" open Fake open System @@ -47,7 +47,7 @@ let content = __SOURCE_DIRECTORY__ @@ "../content" let output = __SOURCE_DIRECTORY__ @@ "../../out/docs" let files = __SOURCE_DIRECTORY__ @@ "../files" let templates = __SOURCE_DIRECTORY__ @@ "templates" -let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting/" +let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/build/FSharp.Formatting/" let docTemplate = formatting @@ "templates/docpage.cshtml" // Where to look for *.csproj templates (in this order) diff --git a/docs/tools/paket.references b/docs/tools/paket.references index 5d1ce53e..a5be1eb2 100644 --- a/docs/tools/paket.references +++ b/docs/tools/paket.references @@ -1,4 +1,5 @@ -FSharp.Formatting -Microsoft.AspNet.Razor -RazorEngine -FSharp.Compiler.Service +group Build + FSharp.Formatting + Microsoft.AspNet.Razor + RazorEngine + FSharp.Compiler.Service diff --git a/packages/.gitattributes b/packages/.gitattributes index 06a58639..62544950 100644 --- a/packages/.gitattributes +++ b/packages/.gitattributes @@ -1,2 +1 @@ -repositories.config text * -text diff --git a/packages/FSharp.Core/license.html b/packages/FSharp.Core/license.html index 194448a1..a029d82c 100644 --- a/packages/FSharp.Core/license.html +++ b/packages/FSharp.Core/license.html @@ -33,13 +33,19 @@ - + + + + + + + + + + + + - - - - - @@ -47,17 +53,18 @@ - - + + - - + + + - + @@ -69,7 +76,7 @@ - + Skip to content @@ -153,7 +160,7 @@ Watch - 150 + 155 @@ -167,7 +174,7 @@ - 1,003 + 1,016 @@ -181,7 +188,7 @@ - 212 + 216 @@ -255,9 +262,9 @@
-

HTTPS clone URL

+

HTTPS clone URL

- @@ -268,9 +275,9 @@
-

Subversion checkout URL

+

Subversion checkout URL

- @@ -280,8 +287,8 @@ -
You can clone with -
or
. +
You can clone with +
or
. @@ -301,7 +308,7 @@ - + @@ -309,7 +316,6 @@
Branch: @@ -1164,8 +1170,8 @@ compiler/2.0/Nov2010 folder on http://fsharppowerpack.codeplex.com">Clean source