Skip to content

Commit

Permalink
Get common buils scripts from build-script repo
Browse files Browse the repository at this point in the history
  • Loading branch information
Jand42 committed Jan 29, 2018
1 parent b0f8992 commit 3b574ff
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ if errorlevel 1 exit /b %errorlevel%
.paket\paket.exe update -g wsbuild
if errorlevel 1 exit /b %errorlevel%

paket-files\wsbuild\intellifactory\websharper\tools\WebSharper.Fake.cmd %*
call paket-files\wsbuild\github.com\dotnet-websharper\build-script\WebSharper.Fake.cmd %*
2 changes: 1 addition & 1 deletion build.fsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#load "paket-files/wsbuild/intellifactory/websharper/tools/WebSharper.Fake.fsx"
#load "paket-files/wsbuild/github.com/dotnet-websharper/build-script/WebSharper.Fake.fsx"
open Fake
open WebSharper.Fake

Expand Down
4 changes: 1 addition & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ set -e
if [ "$OS" = "Windows_NT" ]; then
.paket/paket.exe restore -g build
.paket/paket.exe update -g wsbuild
.paket/paket.exe restore -g build
else
mono .paket/paket.exe restore -g build
mono .paket/paket.exe update -g wsbuild
mono .paket/paket.exe restore -g build
fi

paket-files/wsbuild/intellifactory/websharper/tools/WebSharper.Fake.sh "$@"
exec paket-files/wsbuild/github.com/dotnet-websharper/build-script/WebSharper.Fake.sh "$@"
4 changes: 1 addition & 3 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,4 @@ group build
nuget Paket.Core 5.122.3

group wsbuild
github intellifactory/websharper tools/WebSharper.Fake.fsx
github intellifactory/websharper tools/WebSharper.Fake.cmd
github intellifactory/websharper tools/WebSharper.Fake.sh
git https://github.com/dotnet-websharper/build-script
13 changes: 7 additions & 6 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ NUGET
FSharp.Core
FAKE (4.64.4)
FSharp.Compiler.Tools (4.1.29)
FSharp.Core (4.2.3)
FSharp.Core (4.3.2)
Mono.Cecil (0.10.0-beta7)
Newtonsoft.Json (10.0.3)
Paket.Core (5.122.3)
Expand All @@ -213,8 +213,9 @@ NUGET
FSharp.Core
Mono.Cecil (>= 0.10.0-beta6)
Newtonsoft.Json
GITHUB
remote: intellifactory/websharper
tools/WebSharper.Fake.cmd (f4cbdc4b8c4be3250b25b23d65e6a0c5ab199650)
tools/WebSharper.Fake.fsx (f4cbdc4b8c4be3250b25b23d65e6a0c5ab199650)
tools/WebSharper.Fake.sh (f4cbdc4b8c4be3250b25b23d65e6a0c5ab199650)

GROUP wsbuild

GIT
remote: https://github.com/dotnet-websharper/build-script
(0ffbf6a797788d426225eda88d461940cb95be1d)

0 comments on commit 3b574ff

Please sign in to comment.