Skip to content

Commit

Permalink
Merge branch 'master' of github.com:fsharp/FAKE into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
forki committed Jan 23, 2014
2 parents 7d96484 + 7aecd4e commit 1b73f4e
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 0 deletions.
19 changes: 19 additions & 0 deletions src/app/FakeLib/MSBuildHelper.fs
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,25 @@ let private errorLoggerParam =
|> fun lst -> String.Join(" ", lst)

/// Runs a MSBuild project
/// ## Parameters
/// - `setParams` - A function that overwrites the default MsBuildParams
/// - `project` - A string with the path to the project file to build.
/// ## Sample
///
/// let buildMode = getBuildParamOrDefault "buildMode" "Release"
/// let setParams defaults =
/// { defaults with
/// Verbosity = Some(Quiet)
/// Targets = ["Build"]
/// Properties =
/// [
/// "Optimize", "True"
/// "DebugSymbols", "True"
/// "Configuration", buildMode
/// ]
/// }
/// build setParams "./MySolution.sln"
/// |> DoNothing
let build setParams project =
traceStartTask "MSBuild" project
let args = MSBuildDefaults |> setParams |> serializeMSBuildParams
Expand Down
8 changes: 8 additions & 0 deletions src/app/FakeLib/ProcessHelper.fs
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,14 @@ let execProcess3 configProcessStartInfoF timeOut = ExecProcessWithLambdas config
///
/// - `configProcessStartInfoF` - A function which overwrites the default ProcessStartInfo.
/// - `timeOut` - The timeout for the process.
/// ## Sample
///
/// let result = ExecProcess (fun info ->
/// info.FileName <- "c:/MyProc.exe"
/// info.WorkingDirectory <- "c:/workingDirectory"
/// info.Arguments <- "-v") (TimeSpan.FromMinutes 5.0)
///
/// if result <> 0 then failwithf "MyProc.exe returned with a non-zero exit code"
let ExecProcess configProcessStartInfoF timeOut = ExecProcessWithLambdas configProcessStartInfoF timeOut redirectOutputToTrace traceError trace

/// Runs the given process in an elevated context and returns the exit code.
Expand Down

0 comments on commit 1b73f4e

Please sign in to comment.