Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg] pass -disableMetrics to bootstrap on git bash #11299

Merged
merged 1 commit into from May 19, 2020

Conversation

strega-nil
Copy link
Contributor

in git bash, we call back into bootstrap-vcpkg.bat,
but we don't pass -disableMetrics through.
This commit corrects this.

Fixes #11274

@PhoebeHui PhoebeHui self-assigned this May 11, 2020
@strega-nil
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Contributor

@PhoebeHui PhoebeHui left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@linquize, does this fix work for you?

@PhoebeHui
Copy link
Contributor

PhoebeHui commented May 19, 2020

@strega-nil, I test it, it looks doesn't work, can you confirm? you can see the 'vcpkgmetricsuploader.exe' generated and move to vcpkg\scripts.

MINGW64 /f/vcpkg/11299/vcpkg (bootstrap-disable-metrics)
$ ./bootstrap-vcpkg.sh -disableMetrics
Building vcpkg.exe ...

pch.cpp
....
update.cpp
userconfig.cpp
vcpkgcmdarguments.cpp
vcpkglib.cpp
vcpkgpaths.cpp
versiont.cpp
visualstudio.cpp
vcpkglib.vcxproj -> F:\VCPKG\11299\vcpkg\toolsrc\msbuild.x86.release\vcpkglib.lib
vcpkg.cpp
Generating code
All 21526 functions were compiled because no usable IPDB/IOBJ from previous compilation was found.
Finished generating code
vcpkg.vcxproj -> F:\VCPKG\11299\vcpkg\toolsrc\msbuild.x86.release\vcpkg.exe
vcpkgmetricsuploader.cpp
Generating code
All 8117 functions were compiled because no usable IPDB/IOBJ from previous compilation was found.
Finished generating code
vcpkgmetricsuploader.vcxproj -> F:\VCPKG\11299\vcpkg\toolsrc\msbuild.x86.release\vcpkgmetricsuploader.exe

Building vcpkg.exe... done.

@PhoebeHui PhoebeHui added info:internal This PR or Issue was filed by the vcpkg team. waiting for response labels May 19, 2020
@PhoebeHui
Copy link
Contributor

I tried '.\bootstrap-vcpkg.bat -disableMetrics' on master with latest source. you can see vcpkgmetricsuploader disabled.

PS F:\vcpkg\src> .\bootstrap-vcpkg.bat -disableMetrics

Building vcpkg.exe ...

pch.cpp
archives.cpp
checks.cpp
chrono.cpp
cofffilereader.cpp
...
userconfig.cpp
vcpkgcmdarguments.cpp
vcpkglib.cpp
vcpkgpaths.cpp
versiont.cpp
visualstudio.cpp
vcpkglib.vcxproj -> F:\VCPKG\src\toolsrc\msbuild.x86.release\vcpkglib.lib
vcpkg.cpp
Generating code
All 21312 functions were compiled because no usable IPDB/IOBJ from previous compilation was found.
Finished generating code
vcpkg.vcxproj -> F:\VCPKG\src\toolsrc\msbuild.x86.release\vcpkg.exe

Building vcpkg.exe... done.

@strega-nil
Copy link
Contributor Author

strega-nil commented May 19, 2020

@PhoebeHui that actually changed recently; we used to build vcpkgmetricsuploader always, not just when metrics were enabled (at least aiui). If you rebase this onto master, you'll see that vcpkgmetricsuploader no longer gets built.

in git bash, we call back into bootstrap-vcpkg.bat,
but we don't pass -disableMetrics through.
This commit corrects this
@strega-nil strega-nil merged commit 0043468 into microsoft:master May 19, 2020
@strega-nil strega-nil deleted the bootstrap-disable-metrics branch May 20, 2020 21:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bootstrap-vcpkg.sh -disableMetrics flag not passed to bootstrap-vcpkg.bat
3 participants