aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scripts/bootstrap.ps17
-rw-r--r--toolsrc/dirs.proj2
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" />