diff options
| author | Markus Rickert <rickertm@users.noreply.github.com> | 2020-05-18 20:05:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 11:05:23 -0700 |
| commit | 47e9a1d1c1f95f26020ccf44c4bef570ac740583 (patch) | |
| tree | a0c42baa99253a625b5caf2a53a78520b3a48efe | |
| parent | 9f516b9347e993fd7692f4683e6cb35d1d24f913 (diff) | |
| download | vcpkg-47e9a1d1c1f95f26020ccf44c4bef570ac740583.tar.gz vcpkg-47e9a1d1c1f95f26020ccf44c4bef570ac740583.zip | |
[vcpkg] msbuild: do not build vcpkgmetricsuploader when -disableMetrics (#11368)
| -rw-r--r-- | scripts/bootstrap.ps1 | 7 | ||||
| -rw-r--r-- | toolsrc/dirs.proj | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 1eaf1c598..8603647b3 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -426,5 +426,10 @@ Read more about vcpkg telemetry at docs/about/privacy.md Write-Verbose "Placing vcpkg.exe in the correct location" Copy-Item "$vcpkgReleaseDir\vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" -Copy-Item "$vcpkgReleaseDir\vcpkgmetricsuploader.exe" "$vcpkgRootDir\scripts\vcpkgmetricsuploader.exe" + +if (-not $disableMetrics) +{ + Copy-Item "$vcpkgReleaseDir\vcpkgmetricsuploader.exe" "$vcpkgRootDir\scripts\vcpkgmetricsuploader.exe" +} + Remove-Item "$vcpkgReleaseDir" -Force -Recurse -ErrorAction SilentlyContinue diff --git a/toolsrc/dirs.proj b/toolsrc/dirs.proj index 7729c9897..960374bff 100644 --- a/toolsrc/dirs.proj +++ b/toolsrc/dirs.proj @@ -5,7 +5,7 @@ <ItemGroup> <ProjectFile Include="vcpkglib\vcpkglib.vcxproj"/> <ProjectFile Include="vcpkg\vcpkg.vcxproj"/> - <ProjectFile Include="vcpkgmetricsuploader\vcpkgmetricsuploader.vcxproj"/> + <ProjectFile Include="vcpkgmetricsuploader\vcpkgmetricsuploader.vcxproj" Condition="'$(DISABLE_METRICS)'!='1'"/> </ItemGroup> <Target Name="Rebuild" DependsOnTargets="Clean;Build" /> |