Skip to content

Removed local build restriction #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsyme merged 1 commit into from
Apr 24, 2016
+2 −3
Merged

Removed local build restriction #559

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,14 +216,12 @@ Target "GitHubRelease" (fun _ ->
// --------------------------------------------------------------------------------------
// .NET CLI and .NET Core

// TODO: rework next line when workaround is available
let isDotnetCliInstalled = (try buildServer = BuildServer.LocalBuild && Shell.Exec("dotnet", "--info") = 0 with _ -> false)
let isDotnetCliInstalled = (try Shell.Exec("dotnet", "--info") = 0 with _ -> false)
let assertExitCodeZero x = if x = 0 then () else failwithf "Command failed with exit code %i" x

Target "DotnetCliBuild" (fun _ ->
let fsLex = @"lib/bootstrap/4.0/fslex.exe"
let fsYacc = @"lib/bootstrap/4.0/fsyacc.exe"
let outPath = @"src/fsharp/FSharp.Compiler.Service.netcore/"
let lexArgs = @" --lexlib Internal.Utilities.Text.Lexing"
let yaccArgs = @" --internal --parslib Internal.Utilities.Text.Parsing"
let module1 = @" --module Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser"
Expand All @@ -234,6 +232,7 @@ Target "DotnetCliBuild" (fun _ ->
let open3 = @" --open Microsoft.FSharp.Compiler"
let options = " --configuration Release"

let outPath = @"src/fsharp/FSharp.Compiler.Service.netcore/"
Shell.Exec("dotnet", "restore", outPath) |> ignore //assertExitCodeZero

Shell.Exec("dotnet", "fssrgen ../FSComp.txt ./FSComp.fs ./FSComp.resx", outPath) |> assertExitCodeZero
Expand Down