changed build script to install nuget packages if needed

DerAlbertCom · May 31, 2011 · fa5e29d · fa5e29d
1 parent ed1fe9d
commit fa5e29d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 14 deletions.
diff --git a/default.ps1 b/default.ps1
@@ -18,14 +18,14 @@ Task Clean {
 }
 
 
-Task BuildWithoutBump {
+Task BuildWithoutBump -Depends Clean {
     Write-Host "ApereaFramework.All.sln" -ForegroundColor Green
+	Install-Packages $src_dir "$src_dir\packages"
+
 	Exec { msbuild "$src_dir\ApereaFramework.All.sln" /t:Build /v:quiet /p:Configuration=Release /p:OutDir="$out_dir\" } 
 }
-Task Build -Depends BumpRevision,Clean {
+Task Build -Depends BumpRevision, BuildWithoutBump {
     Write-Host "ApereaFramework.All.sln" -ForegroundColor Green
-    BumpRevision $version_file
-	Exec { msbuild "$src_dir\ApereaFramework.All.sln" /t:Build /v:quiet /p:Configuration=Release /p:OutDir="$out_dir\" } 
 }
 
 Task BumpRevision {
@@ -59,6 +59,7 @@ Task SetPackageVersion {
 
 Task NuGet -Depends ConvertStart, BuildWithoutBump, SetPackageVersion  {
     Write-Host "Building NuGet-Packages" -ForegroundColor Green   
+	md $nupgk_dir -force
     Exec { .\tools\nuget.exe pack "$nuspec_dir\Aperea.Core.nuspec" /OutputDirectory "$nupgk_dir\" }    
     Exec { .\tools\nuget.exe pack "$nuspec_dir\Aperea.Mail.nuspec" /OutputDirectory "$nupgk_dir\" }    
     Exec { .\tools\nuget.exe pack "$nuspec_dir\Aperea.Membership.nuspec" /OutputDirectory "$nupgk_dir\" }    

diff --git a/installpackages.ps1 b/installpackages.ps1
@@ -1,9 +1,6 @@
 
-$solutionFolder  = ".\src"
-$packagesFolder = Join-Path $solutionFolder "packages"
-$configFilter = Join-Path $solutionFolder "**\packages.config"
+import-module .\tools\psake-nuget.psm1
 
-$packages = Get-ChildItem $configFilter
-foreach ($package in $packages) {
-   .\tools\nuget install $package.Fullname  /OutputDirectory $packagesFolder
-}
+Install-Packages ".\src" ".\src\packages"
+
+remove-module psake-nuget
diff --git a/src/FrameworkVersion.cs b/src/FrameworkVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.3.0.37")]
-[assembly: AssemblyFileVersion("0.3.0.37")]
+[assembly: AssemblyVersion("0.3.0.38")]
+[assembly: AssemblyFileVersion("0.3.0.38")]
diff --git a/tools/psake-nuget.psm1 b/tools/psake-nuget.psm1
@@ -14,6 +14,23 @@ function DontChangeFileName($name)
 	$name.EndsWith(".transform")
 }
 
+function Install-Packages {
+	param (
+		[Parameter(Position=0,Mandatory=1)]
+		[string]$solutionFolder,
+		[Parameter(Position=1,Mandatory=1)]
+		[string]$packagesFolder
+	)
+
+	$packagesFolder = Join-Path $solutionFolder "packages"
+	$configFilter = Join-Path $solutionFolder "**\packages.config"
+
+	$packages = Get-ChildItem $configFilter
+	foreach ($package in $packages) {
+	   .\tools\nuget install $package.Fullname  /OutputDirectory $packagesFolder
+	}
+}
+
 function ConvertMvcProject {
 	param (
 	[Parameter(Position=0,Mandatory=1)]
@@ -54,4 +71,4 @@ function ConvertMvcProject {
 	}
 }
 
-Export-ModuleMember "ConvertMvcProject"
+Export-ModuleMember "ConvertMvcProject", "Install-Packages"