diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-04-17 18:16:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 18:16:20 -0700 |
| commit | 09af1e9b55fdb79ef5aa04de3f1710759b2de990 (patch) | |
| tree | fc151fb148667d5cf10bf3dcd8e26b5d04cc6d16 /toolsrc/vcpkglib | |
| parent | 556325a1f7b6049d91565257c00db2f0bf1eadc5 (diff) | |
| download | vcpkg-09af1e9b55fdb79ef5aa04de3f1710759b2de990.tar.gz vcpkg-09af1e9b55fdb79ef5aa04de3f1710759b2de990.zip | |
[vcpkg] Add initial JSON support (#10521)
* [vcpkg] Add initial JSON support
This adds a JSON parser, as well as the amount of unicode support
required for JSON parsing to work according to the specification. In the
future, I hope to rewrite our existing XML files into JSON.
Additionally, as a drive-by, we've added the following:
* add /wd4800 to pragmas.h -- this is a "performance warning", for when
you implicitly convert pointers or integers to bool, and shouldn't be
an issue for us.
* Switched Parse::ParserBase to read unicode (as utf-8), as opposed to
ASCII
* Building again under VCPKG_DEVELOPMENT_WARNINGS, yay!
Diffstat (limited to 'toolsrc/vcpkglib')
| -rw-r--r-- | toolsrc/vcpkglib/vcpkglib.vcxproj | 8 | ||||
| -rw-r--r-- | toolsrc/vcpkglib/vcpkglib.vcxproj.filters | 20 |
2 files changed, 22 insertions, 6 deletions
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj index f054fe1ad..38e0ade40 100644 --- a/toolsrc/vcpkglib/vcpkglib.vcxproj +++ b/toolsrc/vcpkglib/vcpkglib.vcxproj @@ -153,9 +153,11 @@ <ClInclude Include="..\include\vcpkg\base\graphs.h" />
<ClInclude Include="..\include\vcpkg\base\hash.h" />
<ClInclude Include="..\include\vcpkg\base\ignore_errors.h" />
+ <ClInclude Include="..\include\vcpkg\base\json.h" />
<ClInclude Include="..\include\vcpkg\base\lazy.h" />
<ClInclude Include="..\include\vcpkg\base\lineinfo.h" />
<ClInclude Include="..\include\vcpkg\base\machinetype.h" />
+ <ClInclude Include="..\include\vcpkg\base\parse.h" />
<ClInclude Include="..\include\vcpkg\base\optional.h" />
<ClInclude Include="..\include\vcpkg\base\sortedvector.h" />
<ClInclude Include="..\include\vcpkg\base\span.h" />
@@ -167,6 +169,7 @@ <ClInclude Include="..\include\vcpkg\base\system.h" />
<ClInclude Include="..\include\vcpkg\base\system.print.h" />
<ClInclude Include="..\include\vcpkg\base\system.process.h" />
+ <ClInclude Include="..\include\vcpkg\base\unicode.h" />
<ClInclude Include="..\include\vcpkg\base\util.h" />
<ClInclude Include="..\include\vcpkg\base\view.h" />
<ClInclude Include="..\include\vcpkg\base\zstringview.h" />
@@ -190,7 +193,6 @@ <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" />
@@ -225,12 +227,15 @@ <ClCompile Include="..\src\vcpkg\base\enums.cpp" />
<ClCompile Include="..\src\vcpkg\base\files.cpp" />
<ClCompile Include="..\src\vcpkg\base\hash.cpp" />
+ <ClCompile Include="..\src\vcpkg\base\json.cpp" />
<ClCompile Include="..\src\vcpkg\base\machinetype.cpp" />
+ <ClCompile Include="..\src\vcpkg\base\parse.cpp" />
<ClCompile Include="..\src\vcpkg\base\strings.cpp" />
<ClCompile Include="..\src\vcpkg\base\stringview.cpp" />
<ClCompile Include="..\src\vcpkg\base\system.cpp" />
<ClCompile Include="..\src\vcpkg\base\system.print.cpp" />
<ClCompile Include="..\src\vcpkg\base\system.process.cpp" />
+ <ClCompile Include="..\src\vcpkg\base\unicode.cpp" />
<ClCompile Include="..\src\vcpkg\binarycaching.cpp" />
<ClCompile Include="..\src\vcpkg\binaryparagraph.cpp" />
<ClCompile Include="..\src\vcpkg\build.cpp" />
@@ -270,7 +275,6 @@ <ClCompile Include="..\src\vcpkg\packagespec.cpp" />
<ClCompile Include="..\src\vcpkg\paragraphparseresult.cpp" />
<ClCompile Include="..\src\vcpkg\paragraphs.cpp" />
- <ClCompile Include="..\src\vcpkg\parse.cpp" />
<ClCompile Include="..\src\vcpkg\portfileprovider.cpp" />
<ClCompile Include="..\src\vcpkg\postbuildlint.buildtype.cpp" />
<ClCompile Include="..\src\vcpkg\postbuildlint.cpp" />
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters index e9441f72c..c663d0b8d 100644 --- a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters +++ b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters @@ -129,9 +129,6 @@ <ClCompile Include="..\src\vcpkg\paragraphs.cpp">
<Filter>Source Files\vcpkg</Filter>
</ClCompile>
- <ClCompile Include="..\src\vcpkg\parse.cpp">
- <Filter>Source Files\vcpkg</Filter>
- </ClCompile>
<ClCompile Include="..\src\vcpkg\postbuildlint.buildtype.cpp">
<Filter>Source Files\vcpkg</Filter>
</ClCompile>
@@ -186,6 +183,9 @@ <ClCompile Include="..\src\vcpkg\base\machinetype.cpp">
<Filter>Source Files\vcpkg\base</Filter>
</ClCompile>
+ <ClCompile Include="..\src\vcpkg\base\parse.cpp">
+ <Filter>Source Files\vcpkg\base</Filter>
+ </ClCompile>
<ClCompile Include="..\src\vcpkg\base\strings.cpp">
<Filter>Source Files\vcpkg\base</Filter>
</ClCompile>
@@ -237,6 +237,12 @@ <ClCompile Include="..\src\vcpkg\binarycaching.cpp">
<Filter>Source Files\vcpkg</Filter>
</ClCompile>
+ <ClCompile Include="..\src\vcpkg\base\json.cpp">
+ <Filter>Source Files\vcpkg\base</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\vcpkg\base\unicode.cpp">
+ <Filter>Source Files\vcpkg\base</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\pch.h">
@@ -332,7 +338,7 @@ <ClInclude Include="..\include\vcpkg\paragraphs.h">
<Filter>Header Files\vcpkg</Filter>
</ClInclude>
- <ClInclude Include="..\include\vcpkg\parse.h">
+ <ClInclude Include="..\include\vcpkg\base\parse.h">
<Filter>Header Files\vcpkg</Filter>
</ClInclude>
<ClInclude Include="..\include\vcpkg\postbuildlint.h">
@@ -443,5 +449,11 @@ <ClInclude Include="..\include\vcpkg\binarycaching.h">
<Filter>Header Files\vcpkg</Filter>
</ClInclude>
+ <ClInclude Include="..\include\vcpkg\base\json.h">
+ <Filter>Header Files\vcpkg\base</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\vcpkg\base\unicode.h">
+ <Filter>Header Files\vcpkg\base</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
|
