diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-02-07 11:24:35 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-07 11:24:35 -0800 |
| commit | 8db6db5dac70c25b04cd4dd84392484dee822fbe (patch) | |
| tree | 4734de271f966ff4b9a913b15c1b7b537ecd1a8d /toolsrc/vcpkglib | |
| parent | 2873f07823df192ba55693d200850669eabe332c (diff) | |
| download | vcpkg-8db6db5dac70c25b04cd4dd84392484dee822fbe.tar.gz vcpkg-8db6db5dac70c25b04cd4dd84392484dee822fbe.zip | |
[vcpkg] Further parser improvements (#9895)
* [vcpkg] Consolidate several internal parsers together (packagespecs + logicexpression + control) and enhance error messages
* [vcpkg] Migrate Build-Depends parsing to new framework
* [vcpkg] Fix tests. Re-enable underscores in feature names due to libwebp[vwebp_sdl] -- todo: rename this feature and remove underscores.
Diffstat (limited to 'toolsrc/vcpkglib')
| -rw-r--r-- | toolsrc/vcpkglib/vcpkglib.vcxproj | 9 | ||||
| -rw-r--r-- | toolsrc/vcpkglib/vcpkglib.vcxproj.filters | 31 |
2 files changed, 30 insertions, 10 deletions
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj index 5119c5833..e033625a0 100644 --- a/toolsrc/vcpkglib/vcpkglib.vcxproj +++ b/toolsrc/vcpkglib/vcpkglib.vcxproj @@ -171,26 +171,32 @@ <ClInclude Include="..\include\vcpkg\base\zstringview.h" />
<ClInclude Include="..\include\vcpkg\binaryparagraph.h" />
<ClInclude Include="..\include\vcpkg\build.h" />
+ <ClInclude Include="..\include\vcpkg\cmakevars.h" />
<ClInclude Include="..\include\vcpkg\commands.h" />
<ClInclude Include="..\include\vcpkg\dependencies.h" />
+ <ClInclude Include="..\include\vcpkg\export.chocolatey.h" />
<ClInclude Include="..\include\vcpkg\export.h" />
<ClInclude Include="..\include\vcpkg\export.ifw.h" />
<ClInclude Include="..\include\vcpkg\globalstate.h" />
<ClInclude Include="..\include\vcpkg\help.h" />
<ClInclude Include="..\include\vcpkg\input.h" />
<ClInclude Include="..\include\vcpkg\install.h" />
+ <ClInclude Include="..\include\vcpkg\logicexpression.h" />
<ClInclude Include="..\include\vcpkg\metrics.h" />
<ClInclude Include="..\include\vcpkg\packagespec.h" />
- <ClInclude Include="..\include\vcpkg\packagespecparseresult.h" />
+ <ClInclude Include="..\include\vcpkg\paragraphparser.h" />
<ClInclude Include="..\include\vcpkg\paragraphparseresult.h" />
<ClInclude Include="..\include\vcpkg\paragraphs.h" />
<ClInclude Include="..\include\vcpkg\parse.h" />
+ <ClInclude Include="..\include\vcpkg\portfileprovider.h" />
<ClInclude Include="..\include\vcpkg\postbuildlint.h" />
<ClInclude Include="..\include\vcpkg\postbuildlint.buildtype.h" />
+ <ClInclude Include="..\include\vcpkg\pragmas.h" />
<ClInclude Include="..\include\vcpkg\remove.h" />
<ClInclude Include="..\include\vcpkg\sourceparagraph.h" />
<ClInclude Include="..\include\vcpkg\statusparagraph.h" />
<ClInclude Include="..\include\vcpkg\statusparagraphs.h" />
+ <ClInclude Include="..\include\vcpkg\textrowcol.h" />
<ClInclude Include="..\include\vcpkg\tools.h" />
<ClInclude Include="..\include\vcpkg\triplet.h" />
<ClInclude Include="..\include\vcpkg\update.h" />
@@ -255,7 +261,6 @@ <ClCompile Include="..\src\vcpkg\logicexpression.cpp" />
<ClCompile Include="..\src\vcpkg\metrics.cpp" />
<ClCompile Include="..\src\vcpkg\packagespec.cpp" />
- <ClCompile Include="..\src\vcpkg\packagespecparseresult.cpp" />
<ClCompile Include="..\src\vcpkg\paragraphparseresult.cpp" />
<ClCompile Include="..\src\vcpkg\paragraphs.cpp" />
<ClCompile Include="..\src\vcpkg\parse.cpp" />
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters index 043a9a22f..d7adfcdfd 100644 --- a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters +++ b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters @@ -120,9 +120,6 @@ <ClCompile Include="..\src\vcpkg\packagespec.cpp">
<Filter>Source Files\vcpkg</Filter>
</ClCompile>
- <ClCompile Include="..\src\vcpkg\packagespecparseresult.cpp">
- <Filter>Source Files\vcpkg</Filter>
- </ClCompile>
<ClCompile Include="..\src\vcpkg\paragraphparseresult.cpp">
<Filter>Source Files\vcpkg</Filter>
</ClCompile>
@@ -226,10 +223,10 @@ <Filter>Source Files\vcpkg</Filter>
</ClCompile>
<ClCompile Include="..\src\vcpkg\cmakevars.cpp">
- <Filter>Source Files</Filter>
+ <Filter>Source Files\vcpkg</Filter>
</ClCompile>
<ClCompile Include="..\src\vcpkg\portfileprovider.cpp">
- <Filter>Source Files</Filter>
+ <Filter>Source Files\vcpkg</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
@@ -320,9 +317,6 @@ <ClInclude Include="..\include\vcpkg\packagespec.h">
<Filter>Header Files\vcpkg</Filter>
</ClInclude>
- <ClInclude Include="..\include\vcpkg\packagespecparseresult.h">
- <Filter>Header Files\vcpkg</Filter>
- </ClInclude>
<ClInclude Include="..\include\vcpkg\paragraphparseresult.h">
<Filter>Header Files\vcpkg</Filter>
</ClInclude>
@@ -416,5 +410,26 @@ <ClInclude Include="..\include\vcpkg\base\zstringview.h">
<Filter>Header Files\vcpkg\base</Filter>
</ClInclude>
+ <ClInclude Include="..\include\vcpkg\cmakevars.h">
+ <Filter>Header Files\vcpkg</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\vcpkg\export.chocolatey.h">
+ <Filter>Header Files\vcpkg</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\vcpkg\logicexpression.h">
+ <Filter>Header Files\vcpkg</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\vcpkg\paragraphparser.h">
+ <Filter>Header Files\vcpkg</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\vcpkg\portfileprovider.h">
+ <Filter>Header Files\vcpkg</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\vcpkg\pragmas.h">
+ <Filter>Header Files\vcpkg</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\vcpkg\textrowcol.h">
+ <Filter>Header Files\vcpkg</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file |