Remove tabs and format file

--HG--
branch : dev
This commit is contained in:
Renaud Paquay 2010-07-12 20:16:34 -07:00
parent 23b101a644
commit 6d082f2ce3

View File

@ -1,27 +1,27 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Initialization --> <!-- Initialization -->
<PropertyGroup> <PropertyGroup>
<LibFolder>$(MSBuildProjectDirectory)\lib</LibFolder> <LibFolder>$(MSBuildProjectDirectory)\lib</LibFolder>
<SrcFolder>$(MSBuildProjectDirectory)\src</SrcFolder> <SrcFolder>$(MSBuildProjectDirectory)\src</SrcFolder>
<BuildFolder>$(MSBuildProjectDirectory)\build</BuildFolder> <BuildFolder>$(MSBuildProjectDirectory)\build</BuildFolder>
<SourceFolder>$(MSBuildProjectDirectory)\artifacts\Source</SourceFolder> <SourceFolder>$(MSBuildProjectDirectory)\artifacts\Source</SourceFolder>
<WebPIFolder>$(MSBuildProjectDirectory)\artifacts\WebPI</WebPIFolder> <WebPIFolder>$(MSBuildProjectDirectory)\artifacts\WebPI</WebPIFolder>
<CompileFolder>$(BuildFolder)\Compile</CompileFolder> <CompileFolder>$(BuildFolder)\Compile</CompileFolder>
<WebSitesFolder>$(CompileFolder)\_PublishedWebsites</WebSitesFolder> <WebSitesFolder>$(CompileFolder)\_PublishedWebsites</WebSitesFolder>
<StageFolder>$(BuildFolder)\Stage</StageFolder> <StageFolder>$(BuildFolder)\Stage</StageFolder>
<ProfilingFolder>$(BuildFolder)\Profiling</ProfilingFolder> <ProfilingFolder>$(BuildFolder)\Profiling</ProfilingFolder>
<BuildPlatform Condition="$(ProgramW6432) != ''">x64</BuildPlatform> <BuildPlatform Condition="$(ProgramW6432) != ''">x64</BuildPlatform>
<BuildPlatform Condition="$(BuildPlatform) == ''">x86</BuildPlatform> <BuildPlatform Condition="$(BuildPlatform) == ''">x86</BuildPlatform>
</PropertyGroup> </PropertyGroup>
<Import Project="$(LibFolder)\msbuild\MSBuild.Community.Tasks.Targets"/> <Import Project="$(LibFolder)\msbuild\MSBuild.Community.Tasks.Targets"/>
<!-- Coordinating Targets --> <!-- Coordinating Targets -->
<Target Name ="Build"> <Target Name ="Build">
<CallTarget Targets="Clean"/> <CallTarget Targets="Clean"/>
@ -44,62 +44,62 @@
</Target> </Target>
<!-- Building --> <!-- Building -->
<Target Name="Clean"> <Target Name="Clean">
<MSBuild Projects="$(SrcFolder)\Orchard.sln" Targets="Clean" /> <MSBuild Projects="$(SrcFolder)\Orchard.sln" Targets="Clean" />
<RemoveDir Directories="$(BuildFolder)" /> <RemoveDir Directories="$(BuildFolder)" />
</Target> </Target>
<Target Name ="Compile"> <Target Name ="Compile">
<MSBuild <MSBuild
Projects="$(SrcFolder)\Orchard.sln" Projects="$(SrcFolder)\Orchard.sln"
Targets="Build" Targets="Build"
Properties="Configuration=Release;OutputPath=$(CompileFolder)" /> Properties="Configuration=Release;OutputPath=$(CompileFolder)" />
</Target> </Target>
<!-- Testing --> <!-- Testing -->
<Target Name ="Test"> <Target Name ="Test">
<PropertyGroup> <PropertyGroup>
<UseSqlite64 Condition="'$(teamcity_version)'=='' And '$(BuildPlatform)' == 'x64'">True</UseSqlite64> <UseSqlite64 Condition="'$(teamcity_version)'=='' And '$(BuildPlatform)' == 'x64'">True</UseSqlite64>
</PropertyGroup> </PropertyGroup>
<Message Condition="'$(UseSqlite64)' == 'True'" Text="Testing with x64 version of Sqlite"/> <Message Condition="'$(UseSqlite64)' == 'True'" Text="Testing with x64 version of Sqlite"/>
<CreateItem Include="$(CompileFolder)\*.Tests.*dll"> <CreateItem Include="$(CompileFolder)\*.Tests.*dll">
<Output TaskParameter="Include" ItemName="TestAssemblies" /> <Output TaskParameter="Include" ItemName="TestAssemblies" />
</CreateItem> </CreateItem>
<!-- use x64 sqlite for tests depending on build platform --> <!-- use x64 sqlite for tests depending on build platform -->
<Copy Condition="'$(UseSqlite64)' == 'True'" <Copy Condition="'$(UseSqlite64)' == 'True'"
SourceFiles="$(LibFolder)\sqlite\x64\System.Data.SQLite.dll" SourceFiles="$(LibFolder)\sqlite\x64\System.Data.SQLite.dll"
DestinationFiles="$(CompileFolder)\System.Data.SQLite.dll" /> DestinationFiles="$(CompileFolder)\System.Data.SQLite.dll" />
<NUnit Assemblies="@(TestAssemblies)" ToolPath="$(LibFolder)\nunit" WorkingDirectory="$(CompileFolder)" OutputXmlFile="$(BuildFolder)\Orchard.Tests.xml" /> <NUnit Assemblies="@(TestAssemblies)" ToolPath="$(LibFolder)\nunit" WorkingDirectory="$(CompileFolder)" OutputXmlFile="$(BuildFolder)\Orchard.Tests.xml" />
<!-- restore sqlite version if needed --> <!-- restore sqlite version if needed -->
<Copy Condition="'$(UseSqlite64)' == 'True'" <Copy Condition="'$(UseSqlite64)' == 'True'"
SourceFiles="$(LibFolder)\sqlite\System.Data.SQLite.dll" SourceFiles="$(LibFolder)\sqlite\System.Data.SQLite.dll"
DestinationFiles="$(CompileFolder)\System.Data.SQLite.dll" /> DestinationFiles="$(CompileFolder)\System.Data.SQLite.dll" />
</Target> </Target>
<Target Name ="Spec"> <Target Name ="Spec">
<CreateItem Include="$(CompileFolder)\*.Specs.dll"> <CreateItem Include="$(CompileFolder)\*.Specs.dll">
<Output TaskParameter="Include" ItemName="SpecAssemblies" /> <Output TaskParameter="Include" ItemName="SpecAssemblies" />
</CreateItem> </CreateItem>
<NUnit Assemblies="@(SpecAssemblies)" ToolPath="$(LibFolder)\nunit" /> <NUnit Assemblies="@(SpecAssemblies)" ToolPath="$(LibFolder)\nunit" />
</Target> </Target>
<!-- Packaging --> <!-- Packaging -->
<UsingTask AssemblyFile="$(CompileFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.StageProjectAlteration" /> <UsingTask AssemblyFile="$(CompileFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.StageProjectAlteration" />
<Target Name="Package-Stage"> <Target Name="Package-Stage">
<ItemGroup> <ItemGroup>
<Stage-Bin-Exclude Include="$(WebSitesFolder)\**\bin\**\*" /> <Stage-Bin-Exclude Include="$(WebSitesFolder)\**\bin\**\*" />
<Stage-Web Include="$(WebSitesFolder)\Orchard.Web\**\*;$(SrcFolder)\Orchard.Web\*.csproj" /> <Stage-Web Include="$(WebSitesFolder)\Orchard.Web\**\*;$(SrcFolder)\Orchard.Web\*.csproj" />
<Stage-Core Include="$(WebSitesFolder)\Orchard.Core\**\*" Exclude="@(Stage-Bin-Exclude)" /> <Stage-Core Include="$(WebSitesFolder)\Orchard.Core\**\*" Exclude="@(Stage-Bin-Exclude)" />
<Stage-Modules Include="$(WebSitesFolder)\**\*" Exclude="@(Stage-Web);@(Stage-Core);@(Stage-Bin-Exclude)" /> <Stage-Modules Include="$(WebSitesFolder)\**\*" Exclude="@(Stage-Web);@(Stage-Core);@(Stage-Bin-Exclude)" />
@ -133,7 +133,7 @@
Value="Error" /> Value="Error" />
<!-- move over extra non-content files the csproj referenced --> <!-- move over extra non-content files the csproj referenced -->
<Copy SourceFiles="@(StageProjectAlteration-ExtraFiles->'$(SrcFolder)\Orchard.Web\%(Identity)')" <Copy SourceFiles="@(StageProjectAlteration-ExtraFiles->'$(SrcFolder)\Orchard.Web\%(Identity)')"
DestinationFolder="$(StageFolder)\%(RecursiveDir)"/> DestinationFolder="$(StageFolder)\%(RecursiveDir)"/>
</Target> </Target>
@ -151,34 +151,34 @@
$(MSBuildProjectDirectory)\**\*.patch; $(MSBuildProjectDirectory)\**\*.patch;
$(MSBuildProjectDirectory)\**\*.hg; $(MSBuildProjectDirectory)\**\*.hg;
" /> " />
<Zip-Stage Include="$(StageFolder)\**\*" /> <Zip-Stage Include="$(StageFolder)\**\*" />
<Zip-Source Include=" <Zip-Source Include="
$(MSBuildProjectDirectory)\lib\**\*; $(MSBuildProjectDirectory)\lib\**\*;
$(MSBuildProjectDirectory)\src\**\*; $(MSBuildProjectDirectory)\src\**\*;
$(MSBuildProjectDirectory)\*.txt; $(MSBuildProjectDirectory)\*.txt;
" Exclude="@(Zip-Exclude)" /> " Exclude="@(Zip-Exclude)" />
</ItemGroup> </ItemGroup>
<MakeDir Directories="$(WebPIFolder);$(SourceFolder)"/> <MakeDir Directories="$(WebPIFolder);$(SourceFolder)"/>
<Zip Files="@(Zip-Stage)" WorkingDirectory="$(StageFolder)" ZipFileName="$(WebPIFolder)\Orchard.Web.zip" /> <Zip Files="@(Zip-Stage)" WorkingDirectory="$(StageFolder)" ZipFileName="$(WebPIFolder)\Orchard.Web.zip" />
<Zip Files="@(Zip-Source)" WorkingDirectory="$(MSBuildProjectDirectory)" ZipFileName="$(SourceFolder)\Orchard.Source.zip" /> <Zip Files="@(Zip-Source)" WorkingDirectory="$(MSBuildProjectDirectory)" ZipFileName="$(SourceFolder)\Orchard.Source.zip" />
</Target> </Target>
<!-- Profiling --> <!-- Profiling -->
<Target Name="Profiling-Stage"> <Target Name="Profiling-Stage">
<ItemGroup> <ItemGroup>
<Profiling-Web Include="$(StageFolder)\**\*" /> <Profiling-Web Include="$(StageFolder)\**\*" />
</ItemGroup> </ItemGroup>
<Copy SourceFiles="@(Profiling-Web)" DestinationFolder="$(ProfilingFolder)\%(RecursiveDir)"/> <Copy SourceFiles="@(Profiling-Web)" DestinationFolder="$(ProfilingFolder)\%(RecursiveDir)"/>
</Target> </Target>
<Target Name="Profiling-Setup"> <Target Name="Profiling-Setup">
<Exec Command="$(ProfilingFolder)\bin\Orchard.exe @$(SrcFolder)\Orchard.Profile\profiling-setup-commands.txt" WorkingDirectory="$(ProfilingFolder)"/> <Exec Command="$(ProfilingFolder)\bin\Orchard.exe @$(SrcFolder)\Orchard.Profile\profiling-setup-commands.txt" WorkingDirectory="$(ProfilingFolder)"/>
</Target> </Target>