From 6e023c01b368a7921274b31d795feacd90c37a55 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebros@microsoft.com>
Date: Fri, 14 May 2010 12:24:08 -0700
Subject: [PATCH] Changed build scripts

Separate Azure from WebPI
Relocate WebPI and Source in /artifacts for cohesion

--HG--
branch : dev
---
 ClickToBuildAzurePackage.cmd | 24 ++++++++++++++++++++++++
 Orchard.proj                 |  8 ++++++--
 build.cmd                    |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 ClickToBuildAzurePackage.cmd

diff --git a/ClickToBuildAzurePackage.cmd b/ClickToBuildAzurePackage.cmd
new file mode 100644
index 000000000..da1f7635a
--- /dev/null
+++ b/ClickToBuildAzurePackage.cmd
@@ -0,0 +1,24 @@
+
+if "%WindowsSdkDir%" neq "" goto build
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" goto initialize2k8on64
+if exist "%ProgramFiles%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" goto initialize2k8
+echo "Unable to detect suitable environment. Build may not succeed."
+goto build
+
+
+:initialize2k8
+call "%ProgramFiles%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
+goto build
+
+:initialize2k8on64
+call "%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
+goto build
+
+
+:build
+msbuild /t:Build AzurePackage.proj
+pause
+goto end
+
+
+:end
diff --git a/Orchard.proj b/Orchard.proj
index a39d9401b..6a2384a54 100644
--- a/Orchard.proj
+++ b/Orchard.proj
@@ -7,6 +7,8 @@
 		<LibFolder>$(MSBuildProjectDirectory)\lib</LibFolder>
 		<SrcFolder>$(MSBuildProjectDirectory)\src</SrcFolder>
 		<BuildFolder>$(MSBuildProjectDirectory)\build</BuildFolder>
+		<SourceFolder>$(MSBuildProjectDirectory)\artifacts\Source</SourceFolder>
+		<WebPIFolder>$(MSBuildProjectDirectory)\artifacts\WebPI</WebPIFolder>
 		
 		<CompileFolder>$(BuildFolder)\Compile</CompileFolder>
 		<WebSitesFolder>$(CompileFolder)\_PublishedWebsites</WebSitesFolder>
@@ -146,8 +148,10 @@
         
     </ItemGroup>
 
-		<Zip Files="@(Zip-Stage)" WorkingDirectory="$(StageFolder)" ZipFileName="$(BuildFolder)\Orchard.Web.zip" />
-		<Zip Files="@(Zip-Source)" WorkingDirectory="$(MSBuildProjectDirectory)" ZipFileName="$(BuildFolder)\Orchard.Source.zip" />
+    <MakeDir Directories="$(WebPIFolder);$(SourceFolder)"/>
+
+		<Zip Files="@(Zip-Stage)" WorkingDirectory="$(StageFolder)" ZipFileName="$(WebPIFolder)\Orchard.Web.zip" />
+		<Zip Files="@(Zip-Source)" WorkingDirectory="$(MSBuildProjectDirectory)" ZipFileName="$(SourceFolder)\Orchard.Source.zip" />
   </Target>
 
 <!-- Profiling -->
diff --git a/build.cmd b/build.cmd
index 1e1be68bc..eeddd1991 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,3 +1,3 @@
 if "%~1"=="" build Build
 msbuild /t:%~1 Orchard.proj
-msbuild /t:%~1 AzurePackage.proj
+