Skip to content
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.

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

Fix for chocolateyInstall and version bump to 4.2 #40

Merged
merged 5 commits into from Sep 3, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added NuGet.exe
Binary file not shown.
27 changes: 0 additions & 27 deletions NuGetPackageBuilder.cmd

This file was deleted.

13 changes: 13 additions & 0 deletions NuGetPackageBuilder.ps1
@@ -0,0 +1,13 @@
# Assumes robocopy on the path

$scriptpath = $MyInvocation.MyCommand.Path
$dir = Split-Path $scriptpath
$destDir = "$dir\bin"
if(Test-Path $destDir -PathType container){
Remove-Item $destDir -Recurse -Force
}

robocopy $dir "$destDir\tools" /E /B /NP /R:0 /W:0 /NJH /NJS /NS /NFL /NDL /XF ".git*" "Nuget*" "*.nupkg" /XD "$dir\nuget" "$dir\.git" "$destDir" "$dir\nuget.exe"
robocopy "$dir\nuget" $destDir /E /B /NP /R:0 /W:0 /NJH /NJS /NS /NFL /NDL

.\nuget pack "$destDir\psake.nuspec"
2 changes: 1 addition & 1 deletion nuget/psake.nuspec
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>psake</id>
<version>4.1.0</version>
<version>4.2.0.1</version>
<authors>James Kovacs</authors>
<owners>James Kovacs, Damian Hickey, Rob Reynolds</owners>
<projectUrl>https://github.com/psake/psake</projectUrl>
Expand Down
27 changes: 16 additions & 11 deletions nuget/tools/chocolateyInstall.ps1
@@ -1,14 +1,19 @@
$nugetPath = 'C:\NuGet'
$nugetExePath = Join-Path $nuGetPath 'bin'
$packageBatchFileName = Join-Path $nugetExePath "psake.bat"
try {
$nugetPath = $env:ChocolateyInstall
$nugetExePath = Join-Path $nuGetPath 'bin'
$packageBatchFileName = Join-Path $nugetExePath "psake.bat"

$psakeDir = (Split-Path -parent $MyInvocation.MyCommand.Definition)
#$path = ($psakeDir | Split-Path | Join-Path -ChildPath 'psake.cmd')
$path = Join-Path $psakeDir 'psake.cmd'
Write-Host "Adding $packageBatchFileName and pointing to $path"
"@echo off
""$path"" %*" | Out-File $packageBatchFileName -encoding ASCII
$psakeDir = (Split-Path -parent $MyInvocation.MyCommand.Definition)
#$path = ($psakeDir | Split-Path | Join-Path -ChildPath 'psake.cmd')
$path = Join-Path $psakeDir 'psake.cmd'
Write-Host "Adding $packageBatchFileName and pointing to $path"
"@echo off
""$path"" %*" | Out-File $packageBatchFileName -encoding ASCII

write-host "PSake is now ready. You can type 'psake' from any command line at any path. Get started by typing 'psake /?'"

write-host "PSake is now ready. You can type 'psake' from any command line at any path. Get started by typing 'psake /?'"
Start-Sleep 6
Write-ChocolateySuccess 'psake'
} catch {
Write-ChocolateyFailure 'psake' "$($_.Exception.Message)"
throw
}
2 changes: 1 addition & 1 deletion psake.psm1
Expand Up @@ -681,7 +681,7 @@ convertfrom-stringdata @'
import-localizeddata -bindingvariable msgs -erroraction silentlycontinue

$script:psake = @{}
$psake.version = "4.1.0" # contains the current version of psake
$psake.version = "4.2.0" # contains the current version of psake
$psake.context = new-object system.collections.stack # holds onto the current state of all variables
$psake.run_by_psake_build_tester = $false # indicates that build is being run by psake-BuildTester
$psake.config_default = new-object psobject -property @{
Expand Down