From 241e11a58d16787e8a47b93bff570bb45e75459d Mon Sep 17 00:00:00 2001
From: Renaud Paquay <rpaquay@microsoft.com>
Date: Fri, 16 Jul 2010 12:56:10 -0700
Subject: [PATCH] Start work on creating proper MsDeploy package

SqlCe binaries uncluded properly
New MsDeploy staging directory
Modules are still not properly copied in the pacakge...

--HG--
branch : dev
---
 Orchard.proj                | 44 +++++++++++++++++++++++++++----------
 lib/msdeploy/manifest.xml   |  5 +++++
 lib/msdeploy/parameters.xml | 15 +++++++++++++
 3 files changed, 52 insertions(+), 12 deletions(-)
 create mode 100644 lib/msdeploy/manifest.xml
 create mode 100644 lib/msdeploy/parameters.xml

diff --git a/Orchard.proj b/Orchard.proj
index f8da1a4d4..46bbc1cd8 100644
--- a/Orchard.proj
+++ b/Orchard.proj
@@ -7,13 +7,13 @@
     <LibFolder>$(MSBuildProjectDirectory)\lib</LibFolder>
     <SrcFolder>$(MSBuildProjectDirectory)\src</SrcFolder>
     <BuildFolder>$(MSBuildProjectDirectory)\build</BuildFolder>
+    <SqlCeFolder>$(MSBuildProjectDirectory)\lib\sqlce</SqlCeFolder>
     <SourceFolder>$(MSBuildProjectDirectory)\artifacts\Source</SourceFolder>
-    <WebPIFolder>$(MSBuildProjectDirectory)\artifacts\WebPI</WebPIFolder>
 
     <CompileFolder>$(BuildFolder)\Compile</CompileFolder>
     <WebSitesFolder>$(CompileFolder)\_PublishedWebsites</WebSitesFolder>
     <StageFolder>$(BuildFolder)\Stage</StageFolder>
-    <StageFolderOrchard>$(StageFolder)\Orchard</StageFolderOrchard>
+    <MsDeployFolder>$(BuildFolder)\MsDeploy</MsDeployFolder>
     <ProfilingFolder>$(BuildFolder)\Profiling</ProfilingFolder>
 
     <BuildPlatform Condition="$(ProgramW6432) != ''">x64</BuildPlatform>
@@ -33,6 +33,7 @@
 
   <Target Name="Package">
     <CallTarget Targets="Package-Stage"/>
+    <CallTarget Targets="Package-MsDeploy"/>
     <CallTarget Targets="Package-Zip"/>
   </Target>
 
@@ -84,7 +85,7 @@
     <NUnit Assemblies="@(SpecAssemblies)" ToolPath="$(LibFolder)\nunit" />
   </Target>
 
-  <!-- Packaging -->
+  <!-- Packaging (Stage) -->
 
   <UsingTask AssemblyFile="$(CompileFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.StageProjectAlteration" />
 
@@ -96,15 +97,19 @@
       <Stage-Core Include="$(WebSitesFolder)\Orchard.Core\**\*" Exclude="@(Stage-Bin-Exclude)" />
       <Stage-Modules Include="$(WebSitesFolder)\**\*" Exclude="@(Stage-Web);@(Stage-Core);@(Stage-Bin-Exclude)" />
       <Stage-License Include="$(MSBuildProjectDirectory)\*.txt" />
+      <Stage-SqlCe-Native-Binaries-x86 Include="$(SqlCeFolder)\x86\*"/>
+      <Stage-SqlCe-Native-Binaries-amd64 Include="$(SqlCeFolder)\amd64\*"/>
     </ItemGroup>
 
-    <Copy SourceFiles="@(Stage-Web);@(Stage-License)" DestinationFolder="$(StageFolderOrchard)\%(RecursiveDir)" />
-    <Copy SourceFiles="@(Stage-Core)" DestinationFolder="$(StageFolderOrchard)\Core\%(RecursiveDir)" />
-    <Copy SourceFiles="@(Stage-Modules)" DestinationFolder="$(StageFolderOrchard)\Modules\%(RecursiveDir)" />
+    <Copy SourceFiles="@(Stage-Web);@(Stage-License)" DestinationFolder="$(StageFolder)\%(RecursiveDir)" />
+    <Copy SourceFiles="@(Stage-SqlCe-Native-Binaries-x86)" DestinationFolder="$(StageFolder)\bin\x86" />
+    <Copy SourceFiles="@(Stage-SqlCe-Native-Binaries-amd64)" DestinationFolder="$(StageFolder)\bin\amd64" />
+    <Copy SourceFiles="@(Stage-Core)" DestinationFolder="$(StageFolder)\Core\%(RecursiveDir)" />
+    <Copy SourceFiles="@(Stage-Modules)" DestinationFolder="$(StageFolder)\Modules\%(RecursiveDir)" />
 
 
     <!-- extra processing of the staged csproj file -->
-    <StageProjectAlteration ProjectFileName="$(StageFolderOrchard)\Orchard.Web.csproj" AddContentFiles="
+    <StageProjectAlteration ProjectFileName="$(StageFolder)\Orchard.Web.csproj" AddContentFiles="
         @(Stage-Modules->'Modules\%(RecursiveDir)%(Filename)%(Extension)');
         @(Stage-Core->'Core\%(RecursiveDir)%(Filename)%(Extension)')">
       <Output TaskParameter="ExtraFiles" ItemName="StageProjectAlteration-ExtraFiles"/>
@@ -112,24 +117,37 @@
 
     <!-- extra processing of the staged config files -->
 
-    <XmlUpdate XmlFileName="$(StageFolderOrchard)\web.config"
+    <XmlUpdate XmlFileName="$(StageFolder)\web.config"
       XPath="/configuration/system.web/compilation/@debug"
       Value="false" />
 
-    <XmlUpdate XmlFileName="$(StageFolderOrchard)\Config\Diagnostics.config"
+    <XmlUpdate XmlFileName="$(StageFolder)\Config\Diagnostics.config"
       XPath="/system.diagnostics/trace/@autoflush"
       Value="false" />
 
-    <XmlUpdate XmlFileName="$(StageFolderOrchard)\Config\Diagnostics.config"
+    <XmlUpdate XmlFileName="$(StageFolder)\Config\Diagnostics.config"
       XPath="/system.diagnostics/sources/source/@switchValue"
       Value="Error" />
 
     <!-- move over extra non-content files the csproj referenced -->
     <Copy SourceFiles="@(StageProjectAlteration-ExtraFiles->'$(SrcFolder)\Orchard.Web\%(Identity)')"
-        DestinationFolder="$(StageFolderOrchard)\%(RecursiveDir)"/>
+        DestinationFolder="$(StageFolder)\%(RecursiveDir)"/>
 
   </Target>
 
+  <!-- Packaging (MsDeploy) -->
+  <Target Name="Package-MsDeploy">
+    <ItemGroup>
+      <MsDeploy-Folder-Input Include="$(StageFolder)\**\*" Exclude="$(StageFolder)\**\*.pdb" />
+      <MsDeploy-Parameters Include="$(LibFolder)\msdeploy\*.xml"/>
+    </ItemGroup>
+
+    <Copy SourceFiles="@(MsDeploy-Folder-Input)"
+        DestinationFolder="$(MsDeployFolder)\Orchard\%(RecursiveDir)"/>
+    <Copy SourceFiles="@(MsDeploy-Parameters)"
+        DestinationFolder="$(MsDeployFolder)"/>
+  </Target>
+
   <Target Name="Package-Zip">
     <ItemGroup>
       <Zip-Exclude Include="
@@ -146,6 +164,8 @@
 
       <Zip-Stage Include="$(StageFolder)\**\*" />
 
+      <Zip-MsDeploy Include="$(MsDeployFolder)\**\*" />
+
       <Zip-Source Include="
         $(MSBuildProjectDirectory)\lib\**\*;
         $(MSBuildProjectDirectory)\src\**\*;
@@ -164,7 +184,7 @@
 
   <Target Name="Profiling-Stage">
     <ItemGroup>
-      <Profiling-Web Include="$(StageFolderOrchard)\**\*" />
+      <Profiling-Web Include="$(StageFolder)\**\*" />
     </ItemGroup>
 
     <Copy SourceFiles="@(Profiling-Web)" DestinationFolder="$(ProfilingFolder)\%(RecursiveDir)"/>
diff --git a/lib/msdeploy/manifest.xml b/lib/msdeploy/manifest.xml
new file mode 100644
index 000000000..d4db9582a
--- /dev/null
+++ b/lib/msdeploy/manifest.xml
@@ -0,0 +1,5 @@
+<MSDeploy.iisApp>
+	<iisapp path="Orchard" />
+	<setAcl path="Orchard/App_Data" setAclAccess="ReadAndExecute,Write" />
+	<setAcl path="Orchard/Media" setAclAccess="ReadAndExecute,Write" />
+</MSDeploy.iisApp>
diff --git a/lib/msdeploy/parameters.xml b/lib/msdeploy/parameters.xml
new file mode 100644
index 000000000..0253c8c6b
--- /dev/null
+++ b/lib/msdeploy/parameters.xml
@@ -0,0 +1,15 @@
+<parameters>
+
+	<parameter name="Application Path" description="Full site path where you would like to install your application (i.e., Default Web Site/orchard)" defaultValue="Default Web Site/orchard" tags="iisapp">
+		<parameterEntry type="ProviderPath" scope="iisapp" match="Orchard" />
+	</parameter>
+
+	<parameter name="SetAclParameter1" description="Hidden - automatically sets write access for the app" defaultValue="{Application Path}/App_Data" tags="Hidden, NoDatabase">
+		<parameterEntry type="ProviderPath" scope="setAcl" match="Orchard/App_Data" /> 
+	</parameter>
+
+	<parameter name="SetAclParameter2" description="Hidden - automatically sets write access for the app" defaultValue="{Application Path}/Media" tags="Hidden, NoDatabase">
+		<parameterEntry type="ProviderPath" scope="setAcl" match="Orchard/Media" /> 
+	</parameter>
+
+</parameters>