diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-01-25 15:05:30 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-01-25 15:05:51 -0800 |
| commit | d04e78815a82b52af8b36d14fd68703936199ce3 (patch) | |
| tree | 548017475b5921058b3dedab9c02e32fb879ee94 | |
| parent | 3d1b72ea05bd4065a3cc5eb57cac1d9277451d0f (diff) | |
| download | vcpkg-d04e78815a82b52af8b36d14fd68703936199ce3.tar.gz vcpkg-d04e78815a82b52af8b36d14fd68703936199ce3.zip | |
[vcpkg] Do not build tests when running scripts\bootstrap.ps1.
| -rw-r--r-- | scripts/bootstrap.ps1 | 2 | ||||
| -rw-r--r-- | toolsrc/dirs.proj | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index a37ed99aa..98ccb40ad 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -26,7 +26,7 @@ try{ $msbuildExeWithPlatformToolset = & $scriptsDir\findAnyMSBuildWithCppPlatformToolset.ps1 $msbuildExe = $msbuildExeWithPlatformToolset[0] $platformToolset = $msbuildExeWithPlatformToolset[1] - & $msbuildExe "/p:VCPKG_VERSION=-$gitHash" "/p:DISABLE_METRICS=$disableMetrics" /p:Configuration=Release /p:Platform=x86 /p:PlatformToolset=$platformToolset /m + & $msbuildExe "/p:VCPKG_VERSION=-$gitHash" "/p:DISABLE_METRICS=$disableMetrics" /p:Configuration=Release /p:Platform=x86 /p:PlatformToolset=$platformToolset /m dirs.proj Write-Verbose("Placing vcpkg.exe in the correct location") diff --git a/toolsrc/dirs.proj b/toolsrc/dirs.proj new file mode 100644 index 000000000..06bfd6b5d --- /dev/null +++ b/toolsrc/dirs.proj @@ -0,0 +1,22 @@ +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir> + </PropertyGroup> + <ItemGroup> + <ProjectFile Include="vcpkg\vcpkg.vcxproj"/> + <ProjectFile Include="vcpkglib\vcpkglib.vcxproj"/> + <ProjectFile Include="vcpkgcommon\vcpkgcommon.vcxproj"/> + <ProjectFile Include="vcpkgmetrics\vcpkgmetrics.vcxproj"/> + <ProjectFile Include="vcpkgmetricsuploader\vcpkgmetricsuploader.vcxproj"/> + </ItemGroup> + + <Target Name="Rebuild" DependsOnTargets="Clean;Build" /> + + <Target Name="Build"> + <MSBuild Projects="@(ProjectFile)" Properties="SolutionDir=$(SolutionDir)" Targets="Build"/> + </Target> + + <Target Name="Clean"> + <MSBuild Projects="@(ProjectFile)" Properties="SolutionDir=$(SolutionDir)" Targets="Clean"/> + </Target> +</Project>
\ No newline at end of file |