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] Added python script to generate all packages file list, added to azur… #12177

Merged
merged 6 commits into from Jul 6, 2020

Conversation

yaoleo34
Copy link
Contributor

A Python script is added in order to generate a full list of header files, called VCPKGHeaderDatabase.txt, this file is to be used for VS Code. A separate file is generated for all packages file list, called VCPKGDatabase.txt, this file is to be used for vcpkg website. This is achieved through Azure pipelines to generate these file lists at the end of the build.

@ras0219
Copy link
Contributor

ras0219 commented Jul 1, 2020

It looks like some leading slashes are being removed:

From the x86-windows VCPKGDatabase.txt:

xxhash:/debug/lib/xxhash.lib
xxhash:include/xxhash.h
xxhash:/lib/xxhash.lib
xxhash:/share/man/man1/xxhsum.1
xxhash:/share/xxhash/copyright
xxhash:/share/xxhash/vcpkg_abi_info.txt
zlib:/bin/zlib.pdb
zlib:/bin/zlib1.dll
zlib:/debug/bin/zlibd.pdb
zlib:/debug/bin/zlibd1.dll
zlib:/debug/lib/zlibd.lib
zlib:include/zconf.h
zlib:include/zlib.h
zlib:/lib/zlib.lib
zlib:/share/zlib/copyright
zlib:/share/zlib/usage
zlib:/share/zlib/vcpkg_abi_info.txt
zstd:/bin/zstd.dll
zstd:/bin/zstd.pdb
zstd:/debug/bin/zstdd.dll
zstd:/debug/bin/zstdd.pdb
zstd:/debug/lib/zstdd.lib
zstd:include/cover.h
zstd:include/zbuff.h
zstd:include/zdict.h
zstd:include/zstd.h
zstd:include/zstd_errors.h
zstd:/lib/zstd.lib
zstd:/share/zstd/COPYING
zstd:/share/zstd/LICENSE
zstd:/share/zstd/copyright
zstd:/share/zstd/vcpkg_abi_info.txt
zstd:/share/zstd/zstd-config-debug.cmake
zstd:/share/zstd/zstd-config-release.cmake
zstd:/share/zstd/zstd-config.cmake

@PhoebeHui PhoebeHui added category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed requires:discussion labels Jul 1, 2020
@PhoebeHui PhoebeHui requested a review from BillyONeal July 1, 2020 03:19
@PhoebeHui PhoebeHui changed the title Added python script to generate all packages file list, added to azur… [vcpkg] Added python script to generate all packages file list, added to azur… Jul 1, 2020
@ras0219
Copy link
Contributor

ras0219 commented Jul 1, 2020

It would be best to include all files starting with /include/, instead of filtering by extension. This will catch headers like #include <vector> or #include <boost/foo/magic.ipp>

Copy link
Contributor

@ras0219-msft ras0219-msft left a comment

Choose a reason for hiding this comment

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

LGTM once the conditions are flipped :)

scripts/azure-pipelines/linux/azure-pipelines.yml Outdated Show resolved Hide resolved
scripts/azure-pipelines/linux/azure-pipelines.yml Outdated Show resolved Hide resolved
scripts/azure-pipelines/osx/azure-pipelines.yml Outdated Show resolved Hide resolved
scripts/azure-pipelines/osx/azure-pipelines.yml Outdated Show resolved Hide resolved
scripts/azure-pipelines/windows/azure-pipelines.yml Outdated Show resolved Hide resolved
yaoleo34 and others added 2 commits July 2, 2020 14:19
@yaoleo34 yaoleo34 marked this pull request as ready for review July 2, 2020 21:29
@PhoebeHui
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@PhoebeHui PhoebeHui added the info:reviewed Pull Request changes follow basic guidelines label Jul 6, 2020
Comment on lines +74 to +75
$env:VCPKG_DOWNLOADS = "D:\downloads"
./vcpkg.exe fetch python3
Copy link
Member

Choose a reason for hiding this comment

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

This is going to cause a merge conflict with a @ras0219 PR which removes this explicit variable set.

Also, why duplicate the fetch python3 call?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The second fetch python3 call was to get the executable file path to execute python.

Which variable set does the PR remove exactly?

Copy link
Member

Choose a reason for hiding this comment

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

#12198 <- This is the conflicting change. Your PR landed first so the comment goes to that one instead.

@ras0219-msft ras0219-msft merged commit aa2b9ef into microsoft:master Jul 6, 2020
@ras0219-msft
Copy link
Contributor

LGTM, thanks Leo @yaoleo34 !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants