Skip to content

Ignore byte order mark in the head of UTF-8 text. #1149

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

Merged
merged 3 commits into from
Apr 28, 2020

Conversation

dota17
Copy link
Member

@dota17 dota17 commented Mar 19, 2020

Fix issue #1141

@coveralls
Copy link

coveralls commented Mar 19, 2020

Coverage Status

Coverage increased (+0.02%) to 93.881% when pulling 7092f8d on dota17:Ignore-BOM into 91f1553 on open-source-parsers:master.

@dota17 dota17 force-pushed the Ignore-BOM branch 6 times, most recently from 7dde688 to 1d28aa5 Compare March 24, 2020 08:37
@dota17
Copy link
Member Author

dota17 commented Mar 24, 2020

The CI failed in Visual Studio environment, this error is weird, does anyone have a clue about this?

C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets(133,5): error MSB3073: The command "setlocal [C:\projects\jsoncpp\src\test_lib_json\jsoncpp_test.vcxproj]
C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets(133,5): error MSB3073: "C:\Program Files (x86)\CMake\bin\cmake.exe" -E copy_if_different C:/projects/jsoncpp/src/lib_json/Release/jsoncpp.dll C:/projects/jsoncpp/src/test_lib_json/Release [C:\projects\jsoncpp\src\test_lib_json\jsoncpp_test.vcxproj]
C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets(133,5): error MSB3073: if %errorlevel% neq 0 goto :cmEnd [C:\projects\jsoncpp\src\test_lib_json\jsoncpp_test.vcxproj]
C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets(133,5): error MSB3073: Release\jsoncpp_test.exe [C:\projects\jsoncpp\src\test_lib_json\jsoncpp_test.vcxproj]
C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets(133,5): error MSB3073: if %errorlevel% neq 0 goto :cmEnd [C:\projects\jsoncpp\src\test_lib_json\jsoncpp_test.vcxproj]
C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets(133,5): error MSB3073: :cmEnd [C:\projects\jsoncpp\src\test_lib_json\jsoncpp_test.vcxproj]
C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets(133,5): error MSB3073: endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone [C:\projects\jsoncpp\src\test_lib_json\jsoncpp_test.vcxproj]
C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets(133,5): error MSB3073: :cmErrorLevel [C:\projects\jsoncpp\src\test_lib_json\jsoncpp_test.vcxproj]
C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets(133,5): error MSB3073: exit /b %1 [C:\projects\jsoncpp\src\test_lib_json\jsoncpp_test.vcxproj]
C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets(133,5): error MSB3073: :cmDone [C:\projects\jsoncpp\src\test_lib_json\jsoncpp_test.vcxproj]
C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets(133,5): error MSB3073: if %errorlevel% neq 0 goto :VCEnd [C:\projects\jsoncpp\src\test_lib_json\jsoncpp_test.vcxproj]
C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets(133,5): error MSB3073: :VCEnd" exited with code 1. [C:\projects\jsoncpp\src\test_lib_json\jsoncpp_test.vcxproj]
  jsontestrunner_exe.vcxproj -> C:\projects\jsoncpp\src\jsontestrunner\Release\jsontestrunner_exe.exe
Command exited with code 1

Copy link
Contributor

@cdunn2001 cdunn2001 left a comment

Choose a reason for hiding this comment

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

Approved, but please add the length-check if you have time. If that doesn't fix the VS crash, then we'll have to investigate further I guess. We can't merge until AppVeyor passes.

@cdunn2001
Copy link
Contributor

This is approved, so you're free to merge it. My general rule is that if a PR is logically a single commit, we can simply "squash" rather than creating a new merge-commit. You can see that option in the drop-down next to "rebase and merge" if you're not familiar with it.

Sometimes, I prefer to retain several commits for the history, in which case I create a new merge-commit. I think I'll change the default to squash, since "rebase and merge" is rarely what we want (since it does a "fast-forward").

@dota17 dota17 merged commit 83946a2 into open-source-parsers:master Apr 28, 2020
@cdunn2001
Copy link
Contributor

*   6860735 Merge branch 'master' into pre-v2.y.z
|\
| * 2cb16b3 (up/master) allowBom -> skipBom (#1162)
| * 83946a2 Ignore byte order mark in the head of UTF-8 text. (#1149)
* | 12d4ece update .travis and * builder.sh
* | 018fc0a clang-tidy fixes again from PR-1155
* | 1124a54 JSONCPP_VER_11 -> JSONCPP_CXX_STD_11
* | 9e57027 clean code
* | 720b55b change soversion in CMakeLists.txt
* | 576e6dd update
* | a7abd14 update version string
* |   655cbd3 Merge branch 'master' into pre-v2.y.z
|\ \
| * \   cf9b7eb Merge branch 'master' of github.com:open-source-parsers/jsoncpp
| |\ \
| | |/
| | * 91f1553 (HEAD -> master, up/00.11.z)
| | *   5813ab1 (origin/master, origin/HEAD) Merge branch 'fixup-tests' into 'ma
| | |\
| | | * a0b8c3e Do not run colliding tests at same time
| | | * b349221 Cleanup test configurations
| | | * 9e23f66 Issue 1102: Fixup test suite, fix broken tests
| | | * 411d88f Stop checking status; raise instead
| | | * 1ff6bb6 ninja test
| | |/
* | | 3ccb05d update CMakeLists.txt
* | | fe1c7ca update .travis.yml
* | | 54c5fa7 fix Appveyor CI errors
* | |   c62a014 Merge branch 'master' into pre-v2.y.z
|\ \ \
| |/ /
| * | c4f162e Revert "clang-tidy fixes again (#1155)"
...

(That uses git lola.)

This is a mess. For the new branch, I really think you're better off using cherry-pick than merge.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants