Skip to content

Commit

Permalink
remove references to build package dir which was causing build breaks (
Browse files Browse the repository at this point in the history
  • Loading branch information
baronfel authored and ReedCopsey committed Oct 13, 2017
1 parent e43a8b8 commit 7f5e0d0
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions build.cmd
Expand Up @@ -13,6 +13,6 @@ if errorlevel 1 (

IF NOT EXIST build.fsx (
.paket\paket.exe update
packages\build\FAKE\tools\FAKE.exe init.fsx
packages\FAKE\tools\FAKE.exe init.fsx
)
packages\build\FAKE\tools\FAKE.exe build.fsx %*
packages\FAKE\tools\FAKE.exe build.fsx %*
8 changes: 4 additions & 4 deletions build.fsx
Expand Up @@ -2,7 +2,7 @@
// FAKE build script
// --------------------------------------------------------------------------------------

#r @"packages/build/FAKE/tools/FakeLib.dll"
#r @"packages/FAKE/tools/FakeLib.dll"
open Fake
open Fake.Git
open Fake.AssemblyInfoFile
Expand All @@ -12,7 +12,7 @@ open System
open System.IO
#if MONO
#else
#load "packages/build/SourceLink.Fake/tools/Fake.fsx"
#load "packages/SourceLink.Fake/tools/Fake.fsx"
open SourceLink
#endif

Expand Down Expand Up @@ -196,7 +196,7 @@ Target "PublishNuget" (fun _ ->
// Generate the documentation


let fakePath = "packages" </> "build" </> "FAKE" </> "tools" </> "FAKE.exe"
let fakePath = "packages" </> "FAKE" </> "tools" </> "FAKE.exe"
let fakeStartInfo script workingDirectory args fsiargs environmentVars =
(fun (info: System.Diagnostics.ProcessStartInfo) ->
info.FileName <- System.IO.Path.GetFullPath fakePath
Expand Down Expand Up @@ -337,7 +337,7 @@ Target "ReleaseDocs" (fun _ ->
Branches.push tempDocsDir
)

#load "paket-files/build/fsharp/FAKE/modules/Octokit/Octokit.fsx"
#load "paket-files/fsharp/FAKE/modules/Octokit/Octokit.fsx"
open Octokit

Target "Release" (fun _ ->
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Expand Up @@ -33,5 +33,5 @@ run .paket/paket.exe restore

[ ! -e build.fsx ] && run .paket/paket.exe update
[ ! -e build.fsx ] && run packages/FAKE/tools/FAKE.exe init.fsx
run packages/build/FAKE/tools/FAKE.exe "$@" $FSIARGS build.fsx
run packages/FAKE/tools/FAKE.exe "$@" $FSIARGS build.fsx

6 changes: 3 additions & 3 deletions docs/tools/generate.fsx
Expand Up @@ -32,8 +32,8 @@ let info =
// For typical project, no changes are needed below
// --------------------------------------------------------------------------------------

#load "../../packages/build/FSharp.Formatting/FSharp.Formatting.fsx"
#I "../../packages/build/FAKE/tools/"
#load "../../packages/FSharp.Formatting/FSharp.Formatting.fsx"
#I "../../packages/FAKE/tools/"
#r "NuGet.Core.dll"
#r "FakeLib.dll"
open Fake
Expand All @@ -56,7 +56,7 @@ let content = __SOURCE_DIRECTORY__ @@ "../content"
let output = __SOURCE_DIRECTORY__ @@ "../output"
let files = __SOURCE_DIRECTORY__ @@ "../files"
let templates = __SOURCE_DIRECTORY__ @@ "templates"
let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/build/FSharp.Formatting/"
let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting/"
let docTemplate = "docpage.cshtml"

// Where to look for *.csproj templates (in this order)
Expand Down

0 comments on commit 7f5e0d0

Please sign in to comment.