Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into config_and_color

Conflicts:
	psake.psm1
  • Loading branch information...
commit 86e57b87fa54bf5ceb0cb0a8ceeba243a3d6439c 2 parents d706e52 + 3e69c07
Steve Wagner lanwin authored
Showing with 29 additions and 5 deletions.
  1. +16 −0 en-US/psake.psm1-help.xml
  2. +9 −3 psake.ps1
  3. +4 −2 psake.psm1
16 en-US/psake.psm1-help.xml
View
@@ -43,6 +43,10 @@
<maml:name>properties</maml:name>
<command:parameterValue required="false" variableLength="false">Hashtable</command:parameterValue>
</command:parameter>
+ <command:parameter require="false" variableLength="false" globbing="false" pipelineInput="false" postion="0">
+ <maml:name>nologo</maml:name>
+ <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
+ </command:parameter>
</command:syntaxItem>
</command:syntax>
<command:parameters>
@@ -120,6 +124,18 @@ Possible values: '1.0', '1.1', '2.0', '2.0x86', '2.0x64', '3.0', '3.0x86', '3.0x
</dev:type>
<dev:defaultValue />
</command:parameter>
+ <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false (ByValue)" position="6">
+ <maml:name>nologo</maml:name>
+ <maml:description>
+ <maml:para>Do not display the startup banner and copyright message.</maml:para>
+ </maml:description>
+ <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
+ <dev:type>
+ <maml:name>SwitchParameter</maml:name>
+ <maml:uri />
+ </dev:type>
+ <dev:defaultValue />
+ </command:parameter>
</command:parameters>
<command:inputTypes>
<command:inputType>
12 psake.ps1
View
@@ -18,14 +18,20 @@ param(
[Parameter(Position=5, Mandatory=0)]
[System.Collections.Hashtable]$properties = @{},
[Parameter(Position=6, Mandatory=0)]
- [string]$scriptPath = $(Split-Path -parent $MyInvocation.MyCommand.path)
+ [string]$scriptPath = $(Split-Path -parent $MyInvocation.MyCommand.path),
+ [Parameter(Position=7, Mandatory=0)]
+ [switch]$nologo = $false
)
remove-module psake -ea 'SilentlyContinue'
import-module (join-path $scriptPath psake.psm1)
if (-not(test-path $buildFile))
{
- $buildFile = (join-path $scriptPath $buildFile)
+ $absoluteBuildFile = (join-path $scriptPath $buildFile)
+ if (test-path $absoluteBuildFile)
+ {
+ $buildFile = $absoluteBuildFile
+ }
}
-invoke-psake $buildFile $taskList $framework $docs $parameters $properties
+invoke-psake $buildFile $taskList $framework $docs $parameters $properties $nologo
exit $lastexitcode
6 psake.psm1
View
@@ -247,11 +247,13 @@ function Invoke-psake {
[Parameter(Position = 2, Mandatory = 0)][string] $framework,
[Parameter(Position = 3, Mandatory = 0)][switch] $docs = $false,
[Parameter(Position = 4, Mandatory = 0)][hashtable] $parameters = @{},
- [Parameter(Position = 5, Mandatory = 0)][hashtable] $properties = @{}
+ [Parameter(Position = 5, Mandatory = 0)][hashtable] $properties = @{},
+ [Parameter(Position = 6, Mandatory = 0)][switch] $nologo = $false
)
try {
+ if (-not $nologo) {
"psake version {0}`nCopyright (c) 2010 James Kovacs`n" -f $psake.version
-
+ }
<#
If the default.ps1 file exists and the given "buildfile" isn 't found assume that the given
$buildFile is actually the target Tasks to execute in the default.ps1 script.
Please sign in to comment.
Something went wrong with that request. Please try again.