Skip to content

Commit

Permalink
Merge pull request #480 from zooba/issue-410
Browse files Browse the repository at this point in the history
#410 Finish porting build system
  • Loading branch information
zooba committed Jun 19, 2015
2 parents 528e7d9 + 1d8af3b commit 80966b4
Show file tree
Hide file tree
Showing 425 changed files with 32 additions and 96,389 deletions.
8 changes: 4 additions & 4 deletions Build/Common.Build.CSharp.targets
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,19 @@
-->

<PropertyGroup>
<BuildTasksProjectDir>$(BuildRoot)\Tools\BuildTasks</BuildTasksProjectDir>
<BuildTasksProjectDir>$(BuildRoot)\Common\Tools\BuildTasks\</BuildTasksProjectDir>
<BuildTasksAssembly>$(BuildOutputRoot)\ToolBinaries\BuildTasks\Microsoft.VisualStudioTools.BuildTasks.dll</BuildTasksAssembly>
</PropertyGroup>
<ItemGroup>
<BuildTasksSourceFiles Include="$(BuildTasksProjectDir)\*.csproj"/>
<BuildTasksSourceFiles Include="$(BuildTasksProjectDir)\**\*.cs"/>
<BuildTasksSourceFiles Include="$(BuildTasksProjectDir)*.csproj"/>
<BuildTasksSourceFiles Include="$(BuildTasksProjectDir)**\*.cs"/>
</ItemGroup>

<!-- Use Exec rather than MSBuild here to completely isolate the task build - otherwise it interferes with the main build.
To avoid spawning a new msbuild.exe process again and again unnecessarily, do a quick up-to-date check (effectively
duplicating the one done by .csproj) on the target. -->
<Target Name="BuildBuildTasks" Inputs="@(BuildTasksSourceFiles)" Outputs="$(BuildTasksAssembly)">
<Exec Command='"$(MSBuildBinPath)\msbuild.exe" "$(BuildRoot)\Tools\BuildTasks\BuildTasks.csproj" /p:Configuration=$(Configuration) /p:VSTarget=$(VSTarget)'/>
<Exec Command='"$(MSBuildBinPath)\msbuild.exe" "$(BuildTasksProjectDir)BuildTasks.csproj" /p:Configuration=$(Configuration) /p:VSTarget=$(VSTarget)'/>
</Target>

<UsingTask AssemblyFile="$(BuildTasksAssembly)" TaskName="Microsoft.VisualStudioTools.BuildTasks.ExtractLambdasFromXaml"/>
Expand Down
6 changes: 3 additions & 3 deletions Build/Common.Build.Wix.settings
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

<PropertyGroup>
<Language>WiX</Language>
<WixToolsVersion Condition="'$(WixToolsVersion)'==''">3.7</WixToolsVersion>
<WixToolPath Condition="'$(WixToolPath)'==''">$(BuildRoot)\Tools\Wix\$(WixToolsVersion)</WixToolPath>
<WixExtDir Condition="'$(WixExtDir)'==''">$(BuildRoot)\Tools\Wix\$(WixToolsVersion)</WixExtDir>
<WixToolsVersion Condition="'$(WixToolsVersion)'==''">3.9</WixToolsVersion>
<WixToolPath Condition="'$(WixToolPath)'==''">$(BuildRoot)\BuildOutput\Wix\$(WixToolsVersion)</WixToolPath>
<WixExtDir Condition="'$(WixExtDir)'==''">$(BuildRoot)\BuildOutput\Wix\$(WixToolsVersion)</WixExtDir>
<WixTargetsPath>$(WixToolPath)\Wix.targets</WixTargetsPath>
<WixTasksPath>$(WixToolPath)\WixTasks.dll</WixTasksPath>
<LuxTargetsPath>$(WixToolPath)\Lux.targets</LuxTargetsPath>
Expand Down
2 changes: 0 additions & 2 deletions Build/Common.Build.settings
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<!-- The default Platform value is specified in the imports below -->

<RunFXCop Condition="'$(RunFXCop)' == ''">false</RunFXCop>
<RunStyleCop Condition="'$(RunStyleCop)' == ''">false</RunStyleCop>

<CodeCoverageEnabled Condition="'$(CodeCoverageEnabled)'==''">true</CodeCoverageEnabled>

Expand Down Expand Up @@ -96,7 +95,6 @@
<!-- Suppress warning about multiply defined AssemblyVersionInfo -->
<NoWarn>436</NoWarn>
<RunCodeAnalysis>$(RunFXCop)</RunCodeAnalysis>
<StyleCopEnabled>$(RunStyleCop)</StyleCopEnabled>

<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>

Expand Down
23 changes: 23 additions & 0 deletions Build/GetWix.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<#
.Synopsis
Downloads and extracts WiX if it is not currently available.
#>
$buildroot = (Split-Path -Parent (Split-Path -Parent $MyInvocation.MyCommand.Definition))
$target = "$buildroot\BuildOutput\Wix\3.9"
if (Test-Path "$target\wix.targets") {
Write-Output "Wix Location: $target"
return
}

Write-Output "Downloading Wix to $target"

$file = [IO.Path]::GetTempFileName()
Write-Output " - temporary storage: $file"

Invoke-WebRequest "https://wix.codeplex.com/downloads/get/1421697" -UseBasicParsing -OutFile $file

[Reflection.Assembly]::LoadWithPartialName('System.IO.Compression.FileSystem') | Out-Null
[System.IO.Compression.ZipFile]::ExtractToDirectory($file, $target)

del $file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ if ( $TfsWorkspace -ne '' )
}

""
prereq.exe

"Environment Ready"
""

Expand Down
2 changes: 2 additions & 0 deletions Python/Setup/BuildRelease.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,8 @@ if (-not (Get-Command msbuild -EA 0)) {
Throw "Visual Studio build tools are required."
}

& "$buildroot\Build\GetWix.ps1"

if (-not $outdir -and -not $release -and -not $internal) {
if (-not $outdir) {
Throw "Invalid output directory '$outdir'"
Expand Down
72 changes: 0 additions & 72 deletions Tools/BuildTasks/BuildTasks.csproj

This file was deleted.

22 changes: 0 additions & 22 deletions Tools/BuildTasks/BuildTasks.sln

This file was deleted.

Loading

0 comments on commit 80966b4

Please sign in to comment.