Skip to content

Commit

Permalink
relying on paket.bootstrapper.exe and the new paket groups for build …
Browse files Browse the repository at this point in the history
…deps
  • Loading branch information
Mpdreamz committed Oct 12, 2015
1 parent 41f856f commit 57764db
Show file tree
Hide file tree
Showing 17 changed files with 109 additions and 132 deletions.
Binary file added .paket/paket.exe
Binary file not shown.
30 changes: 7 additions & 23 deletions build.bat
Original file line number Diff line number Diff line change
@@ -1,30 +1,14 @@
@echo off
REM we need nuget to install tools locally
if not exist build\tools\nuget\nuget.exe (
ECHO Nuget not found.. Downloading..
mkdir build\tools\nuget
PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& 'build\download-nuget.ps1'"
)

REM we need FAKE to process our build scripts
if not exist build\tools\FAKE\tools\Fake.exe (
ECHO FAKE not found.. Installing..
"build\tools\nuget\nuget.exe" "install" "FAKE" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
.paket\paket.bootstrapper.exe
if errorlevel 1 (
exit /b %errorlevel%
)

REM we need FSharp.Data so we can use type providers in our build scripts
if not exist build\tools\FSharp.Data\lib\net40\Fsharp.Data.dll (
ECHO FSharp.Data not found.. Installing..
"build\tools\nuget\nuget.exe" "install" "FSharp.Data" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
.paket\paket.exe install
if errorlevel 1 (
exit /b %errorlevel%
)

REM we need Microsoft.CodeAnalysis.CSharp so we can use type providers in our build scripts
if not exist build\tools\FAKE\tools\Microsoft.CodeAnalysis.CSharp (
ECHO Microsoft.CodeAnalysis.CSharp not found.. Installing..
"build\tools\nuget\nuget.exe" "install" "Microsoft.CodeAnalysis.CSharp" "-OutputDirectory" "build\tools\FAKE\tools" "-ExcludeVersion" "-Prerelease"
)


SET TARGET="build"
SET VERSION=
SET ESVERSIONS=
Expand All @@ -42,4 +26,4 @@ IF "%1%"=="integrate" (
shift
shift

"build\tools\FAKE\tools\Fake.exe" "build\\scripts\\Targets.fsx" "target=%TARGET%" "version=%VERSION%" esversions=%ESVERSIONS%
"packages\build\FAKE\tools\Fake.exe" "build\\scripts\\Targets.fsx" "target=%TARGET%" "version=%VERSION%" esversions=%ESVERSIONS%
5 changes: 0 additions & 5 deletions build/download-nuget.ps1

This file was deleted.

2 changes: 1 addition & 1 deletion build/scripts/Building.fsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#I @"../tools/FAKE/tools"
#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
#load @"Paths.fsx"
#load @"Projects.fsx"
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Documentation.fsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#I @"../tools/FAKE/tools"
#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
#load @"Paths.fsx"
open System
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/InheritDoc.fsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#I @"../tools/FAKE/tools"
#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
open System.Xml
open System.Xml.XPath
Expand Down
20 changes: 2 additions & 18 deletions build/scripts/Paths.fsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#I @"../tools/FAKE/tools"
#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
open Fake

Expand All @@ -11,7 +11,7 @@ module Paths =
let BuildFolder = "build"

let BuildOutput = sprintf "%s/output" BuildFolder
let ToolsFolder = sprintf "%s/tools" BuildFolder
let ToolsFolder = "packages/build"
let KeysFolder = sprintf "%s/keys" BuildFolder
let NugetOutput = sprintf "%s/_packages" BuildOutput
let SourceFolder = "src"
Expand Down Expand Up @@ -69,23 +69,7 @@ module Tooling =

let private exec = execAt Environment.CurrentDirectory

let private nuget nugetId location =
let path = "build/tools/nuget/nuget.exe"
if doesNotExist path then
printf "Downloading NuGet..."
use webClient = new System.Net.WebClient()
path |> Path.GetDirectoryName |> Directory.CreateDirectory |> ignore
webClient.DownloadFile("https://nuget.org/nuget.exe", path |> Path.GetFullPath)
printfn "Done."
let fullTargetPath = sprintf "%s/%s" Paths.ToolsFolder location
if doesNotExist fullTargetPath then
traceFAKE "Tool %s not found installing in %s" nugetId fullTargetPath
exec path ["install"; nugetId; "-OutputDirectory build/tools"; "-ExcludeVersion"]

type NugetTooling(nugetId, path) =
do
//bootstrap nuget installation when needed
nuget nugetId path
member this.Path = sprintf "%s/%s" Paths.ToolsFolder path
member this.Exec arguments =
exec this.Path arguments
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Projects.fsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#I @"../tools/FAKE/tools"
#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
open Fake

Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Releasing.fsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#I @"../tools/FAKE/tools"
#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
#load @"Paths.fsx"
#load @"Projects.fsx"
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Signing.fsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#I @"../tools/FAKE/tools"
#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
#load @"Paths.fsx"
#load @"Projects.fsx"
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Targets.fsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// include Fake lib
#I @"../tools/FAKE/tools"
#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
open Fake

Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Testing.fsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#I @"../tools/FAKE/tools"
#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
#r "System.Xml.Linq.dll"

Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Versioning.fsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#I @"../tools/FAKE/tools"
#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
#load @"Projects.fsx"
open System
Expand Down
1 change: 0 additions & 1 deletion build/scripts/scripts.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
<None Include="Signing.fsx" />
<None Include="Testing.fsx" />
<None Include="Documentation.fsx" />
<None Include="build.fsx" />
<None Include="Targets.fsx" />
</ItemGroup>
<ItemGroup>
Expand Down
15 changes: 4 additions & 11 deletions paket.bat
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
@echo off
REM we need nuget to install tools locally
if not exist build\tools\nuget\nuget.exe (
ECHO Nuget not found.. Downloading..
mkdir build\tools\nuget
PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& 'build\download-nuget.ps1'"
.paket\paket.bootstrapper.exe
if errorlevel 1 (
exit /b %errorlevel%
)

REM we need paket to call paket doh
if not exist build\tools\Paket\tools\paket.exe (
ECHO Paket not found.. Installing..
"build\tools\nuget\nuget.exe" "install" "Paket" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
)

build\tools\Paket\tools\paket.exe %*
.paket\paket.exe %*
10 changes: 10 additions & 0 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,13 @@ nuget Rx-Interfaces
nuget Rx-Linq
nuget Rx-Main
nuget Rx-PlatformServices

group build

source https://www.nuget.org/api/v2

nuget FAKE
nuget FSharp.Data
nuget GitLink
nuget node.js
nuget xunit.runner.console
142 changes: 77 additions & 65 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -31,34 +31,34 @@ NUGET
Rx-Interfaces (>= 2.2.5)
ShellProgressBar (1.0.0.0)
System.Collections (4.0.10) - framework: dnxcore50
System.Diagnostics.Debug (>= 4.0.0) - framework: dnxcore50
System.Resources.ResourceManager (>= 4.0.0) - framework: dnxcore50
System.Diagnostics.Debug (>= 4.0.0)
System.Resources.ResourceManager (>= 4.0.0)
System.Runtime (>= 4.0.0)
System.Runtime (>= 4.0.20) - framework: dnxcore50
System.Runtime.Extensions (>= 4.0.0) - framework: dnxcore50
System.Threading (>= 4.0.0) - framework: dnxcore50
System.Runtime (>= 4.0.20)
System.Runtime.Extensions (>= 4.0.0)
System.Threading (>= 4.0.0)
System.Collections.Immutable (1.1.37)
System.Collections (>= 4.0.0) - framework: dnxcore50
System.Diagnostics.Debug (>= 4.0.0) - framework: dnxcore50
System.Globalization (>= 4.0.0) - framework: dnxcore50
System.Linq (>= 4.0.0) - framework: dnxcore50
System.Resources.ResourceManager (>= 4.0.0) - framework: dnxcore50
System.Runtime (>= 4.0.0) - framework: dnxcore50
System.Runtime.Extensions (>= 4.0.0) - framework: dnxcore50
System.Threading (>= 4.0.0) - framework: dnxcore50
System.Collections (>= 4.0.0)
System.Diagnostics.Debug (>= 4.0.0)
System.Globalization (>= 4.0.0)
System.Linq (>= 4.0.0)
System.Resources.ResourceManager (>= 4.0.0)
System.Runtime (>= 4.0.0)
System.Runtime.Extensions (>= 4.0.0)
System.Threading (>= 4.0.0)
System.Diagnostics.Contracts (4.0.0) - framework: dnxcore50
System.Runtime (>= 4.0.0)
System.Diagnostics.Debug (4.0.10) - framework: dnxcore50
System.Runtime (>= 4.0.0)
System.Globalization (4.0.10) - framework: dnxcore50
System.Runtime (>= 4.0.0)
System.IO (4.0.10) - framework: dnxcore50
System.Globalization (>= 4.0.0) - framework: dnxcore50
System.Globalization (>= 4.0.0)
System.Runtime (>= 4.0.20)
System.Text.Encoding (>= 4.0.0)
System.Text.Encoding (>= 4.0.10) - framework: dnxcore50
System.Text.Encoding.Extensions (>= 4.0.0) - framework: dnxcore50
System.Threading (>= 4.0.0) - framework: dnxcore50
System.Text.Encoding (>= 4.0.10)
System.Text.Encoding.Extensions (>= 4.0.0)
System.Threading (>= 4.0.0)
System.Threading.Tasks (>= 4.0.0)
System.Linq (4.0.0) - framework: dnxcore50
System.Collections (>= 4.0.10)
Expand All @@ -67,22 +67,22 @@ NUGET
System.Runtime (>= 4.0.20)
System.Runtime.Extensions (>= 4.0.10)
System.Linq.Expressions (4.0.10)
System.Collections (>= 4.0.0) - framework: dnxcore50
System.Diagnostics.Debug (>= 4.0.0) - framework: dnxcore50
System.Globalization (>= 4.0.0) - framework: dnxcore50
System.IO (>= 4.0.0) - framework: dnxcore50
System.Linq (>= 4.0.0) - framework: dnxcore50
System.ObjectModel (>= 4.0.0) - framework: dnxcore50
System.Collections (>= 4.0.0)
System.Diagnostics.Debug (>= 4.0.0)
System.Globalization (>= 4.0.0)
System.IO (>= 4.0.0)
System.Linq (>= 4.0.0)
System.ObjectModel (>= 4.0.0)
System.Reflection (>= 4.0.0)
System.Reflection.Emit (>= 4.0.0) - framework: dnxcore50
System.Reflection.Extensions (>= 4.0.0) - framework: dnxcore50
System.Reflection.Primitives (>= 4.0.0) - framework: dnxcore50
System.Reflection.TypeExtensions (>= 4.0.0) - framework: dnxcore50
System.Resources.ResourceManager (>= 4.0.0) - framework: dnxcore50
System.Runtime (>= 4.0.0)
System.Runtime (>= 4.0.20) - framework: dnxcore50
System.Runtime.Extensions (>= 4.0.0) - framework: dnxcore50
System.Threading (>= 4.0.0) - framework: dnxcore50
System.Reflection.Emit (>= 4.0.0)
System.Reflection.Extensions (>= 4.0.0)
System.Reflection.Primitives (>= 4.0.0)
System.Reflection.TypeExtensions (>= 4.0.0)
System.Resources.ResourceManager (>= 4.0.0)
System.Runtime (>= 4.0.0)
System.Runtime (>= 4.0.20)
System.Runtime.Extensions (>= 4.0.0)
System.Threading (>= 4.0.0)
System.ObjectModel (4.0.10)
System.Collections (>= 4.0.10)
System.Diagnostics.Debug (>= 4.0.10)
Expand All @@ -105,52 +105,52 @@ NUGET
System.Reflection.Primitives (>= 4.0.0)
System.Runtime (>= 4.0.0)
System.Reflection.Extensions (4.0.0) - framework: dnxcore50
System.Diagnostics.Debug (>= 4.0.10) - framework: dnxcore50
System.Diagnostics.Debug (>= 4.0.10)
System.Reflection (>= 4.0.0)
System.Reflection (>= 4.0.10) - framework: dnxcore50
System.Reflection.Primitives (>= 4.0.0) - framework: dnxcore50
System.Reflection.TypeExtensions (>= 4.0.0) - framework: dnxcore50
System.Resources.ResourceManager (>= 4.0.0) - framework: dnxcore50
System.Reflection (>= 4.0.10)
System.Reflection.Primitives (>= 4.0.0)
System.Reflection.TypeExtensions (>= 4.0.0)
System.Resources.ResourceManager (>= 4.0.0)
System.Runtime (>= 4.0.0)
System.Runtime (>= 4.0.20) - framework: dnxcore50
System.Runtime.Extensions (>= 4.0.10) - framework: dnxcore50
System.Runtime (>= 4.0.20)
System.Runtime.Extensions (>= 4.0.10)
System.Reflection.Metadata (1.0.22)
System.Collections (>= 4.0.0) - framework: dnxcore50
System.Collections.Immutable (>= 1.1.37) - framework: dnxcore50, portable-net45+win80
System.Diagnostics.Debug (>= 4.0.0) - framework: dnxcore50
System.IO (>= 4.0.0) - framework: dnxcore50
System.Reflection (>= 4.0.0) - framework: dnxcore50
System.Reflection.Extensions (>= 4.0.0) - framework: dnxcore50
System.Reflection.Primitives (>= 4.0.0) - framework: dnxcore50
System.Resources.ResourceManager (>= 4.0.0) - framework: dnxcore50
System.Runtime (>= 4.0.0) - framework: dnxcore50
System.Runtime.Extensions (>= 4.0.0) - framework: dnxcore50
System.Runtime.InteropServices (>= 4.0.0) - framework: dnxcore50
System.Text.Encoding (>= 4.0.0) - framework: dnxcore50
System.Text.Encoding.Extensions (>= 4.0.0) - framework: dnxcore50
System.Threading (>= 4.0.0) - framework: dnxcore50
System.Collections (>= 4.0.0)
System.Collections.Immutable (>= 1.1.37)
System.Diagnostics.Debug (>= 4.0.0)
System.IO (>= 4.0.0)
System.Reflection (>= 4.0.0)
System.Reflection.Extensions (>= 4.0.0)
System.Reflection.Primitives (>= 4.0.0)
System.Resources.ResourceManager (>= 4.0.0)
System.Runtime (>= 4.0.0)
System.Runtime.Extensions (>= 4.0.0)
System.Runtime.InteropServices (>= 4.0.0)
System.Text.Encoding (>= 4.0.0)
System.Text.Encoding.Extensions (>= 4.0.0)
System.Threading (>= 4.0.0)
System.Reflection.Primitives (4.0.0) - framework: dnxcore50
System.Runtime (>= 4.0.0)
System.Threading (>= 4.0.0) - framework: dnxcore50
System.Threading (>= 4.0.0)
System.Reflection.TypeExtensions (4.0.0) - framework: dnxcore50
System.Diagnostics.Contracts (>= 4.0.0) - framework: dnxcore50
System.Diagnostics.Debug (>= 4.0.10) - framework: dnxcore50
System.Linq (>= 4.0.0) - framework: dnxcore50
System.Diagnostics.Contracts (>= 4.0.0)
System.Diagnostics.Debug (>= 4.0.10)
System.Linq (>= 4.0.0)
System.Reflection (>= 4.0.0)
System.Reflection (>= 4.0.10) - framework: dnxcore50
System.Reflection.Primitives (>= 4.0.0) - framework: dnxcore50
System.Resources.ResourceManager (>= 4.0.0) - framework: dnxcore50
System.Reflection (>= 4.0.10)
System.Reflection.Primitives (>= 4.0.0)
System.Resources.ResourceManager (>= 4.0.0)
System.Runtime (>= 4.0.0)
System.Runtime (>= 4.0.20) - framework: dnxcore50
System.Runtime.Extensions (>= 4.0.10) - framework: dnxcore50
System.Runtime (>= 4.0.20)
System.Runtime.Extensions (>= 4.0.10)
System.Resources.ResourceManager (4.0.0) - framework: dnxcore50
System.Globalization (>= 4.0.0)
System.Reflection (>= 4.0.0)
System.Reflection (>= 4.0.10) - framework: dnxcore50
System.Reflection (>= 4.0.10)
System.Runtime (>= 4.0.0)
System.Runtime (>= 4.0.20) - framework: dnxcore50
System.Runtime (>= 4.0.20)
System.Runtime (4.0.20) - framework: dnxcore50
System.Private.Uri (>= 4.0.0) - framework: dnxcore50
System.Private.Uri (>= 4.0.0)
System.Runtime.Extensions (4.0.10) - framework: dnxcore50
System.Runtime (>= 4.0.20)
System.Runtime.Handles (4.0.0) - framework: dnxcore50
Expand Down Expand Up @@ -224,3 +224,15 @@ NUGET
System.Threading.Tasks (>= 4.0.0)
xunit.abstractions (>= 2.0.0)
xunit.extensibility.core (2.1.0)

GROUP build
NUGET
remote: https://nuget.org/api/v2
specs:
FAKE (4.5.6)
FSharp.Data (2.2.5)
Zlib.Portable (>= 1.10.0)
gitlink (2.1.0)
Node.js (4.0.0)
xunit.runner.console (2.1.0)
Zlib.Portable (1.11.0) - framework: portable-net40+sl50+wp80+win80

0 comments on commit 57764db

Please sign in to comment.