Skip to content

Conversation

ygj6
Copy link
Collaborator

@ygj6 ygj6 commented Jun 5, 2020

  • remove C part files
  • rename include/msgpack/.h to include/msgpack/.hpp
  • remove C part in source code

Closes: #872

ygj6 added 3 commits June 5, 2020 16:44
remove the following files or folders:
ci/build_cmake_embedded.sh
example/c
example/cmake
include/msgpack/predef
include/msgpack/preprocessor.hpp
include/msgpack/preprocessor
include/msgpack/v1/preprocessor.hpp
include/msgpack.h
include/msgpack/fbuffer.h
include/msgpack/gcc_atomic.h
include/msgpack/object.h
include/msgpack/pack.h
include/msgpack/pack_define.h
include/msgpack/pack_template.h
include/msgpack/predef.h
include/msgpack/sbuffer.h
include/msgpack/timestamp.h
include/msgpack/unpack.h
include/msgpack/unpack_template.h
include/msgpack/util.h
include/msgpack/version.h
include/msgpack/vrefbuffer.h
include/msgpack/zbuffer.h
include/msgpack/zone.h
msgpack_vc8.sln
msgpack_vc8.vcproj
msgpack-config.cmake.in
msgpack.pc.in
src
test/fixint_c.cpp
test/msgpack_c.cpp
test/pack_unpack_c.cpp
test/streaming_c.cpp
.gitmodules
external
QUICKSTART-C.md
include/msgpack/sysdep.h => include/msgpack/sysdep.hpp
include/msgpack/unpack_define.h => include/msgpack/unpack_define.hpp
include/msgpack/version_master.h => include/msgpack/version_master.hpp

Use `git log --follow include/msgpack/filename.hpp` to see full log
@redboltz
Copy link
Contributor

redboltz commented Jun 5, 2020

It seems that some of appveyor builds are failed. Could you fix it?

@ygj6
Copy link
Collaborator Author

ygj6 commented Jun 5, 2020

In the initial appveyor.yml, when msvc is "Visual Studio 10 2010" or "Visual Studio 11 2012" or "Visual Studio 12 2013", the value of MSGPACK_BOOST is OFF. If it is set to ON, the compilation will fail because Boost cannot be found.
This shows that for the three versions of msvc, Boost is not supported.
So, should I remove these three matrices in this PR?

@redboltz
Copy link
Contributor

redboltz commented Jun 5, 2020

Boost said that MSVC 8.0 SP1, MSVC 9.0 and newer are supported.
https://www.boost.org/doc/libs/1_73_0/libs/log/doc/html/log/installation.html

And https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B#Internal_version_numbering said that Visual Studio 10 2010 has MSVC++ 10.

So boost supports Visual Studio 10 2010.

I'm not sure appveyor's image management. It seems that appveyor or cmake's problem.
We need to try to find boost on these environment.
I think that we need only header only libraries except some of examples. Install (just place boost image) manually could be an option.

@redboltz
Copy link
Contributor

redboltz commented Jun 6, 2020

Some of examples require (not header only) boost library. But old msvc on appveyor doesn't have built library. So older msvc, disabling examples is acceptable solution.
It is better than removing build from the matrix because tests are built and executed.

Could you update appveyor.yml as follows ?

appveyor.yml

  matrix:
    - cpp11: -DMSGPACK_CXX11=OFF
      example:  -DMSGPACK_BUILD_EXAMPLES=OFF
      msvc: '"Visual Studio 10 2010"'
    - cpp11: -DMSGPACK_CXX11=OFF
      example:  -DMSGPACK_BUILD_EXAMPLES=OFF
      msvc: '"Visual Studio 11 2012"'
    - cpp11: -DMSGPACK_CXX11=OFF
      example:  -DMSGPACK_BUILD_EXAMPLES=OFF
      msvc: '"Visual Studio 12 2013"'
    - cpp11: -DMSGPACK_CXX11=ON
      example:  -DMSGPACK_BUILD_EXAMPLES=ON
      msvc: '"Visual Studio 14 2015"'
    - cpp11: -DMSGPACK_CXX11=OFF
      example:  -DMSGPACK_BUILD_EXAMPLES=ON
      msvc: '"Visual Studio 14 2015"'
- cmake -G %msvc% %cpp11% %example% %x3_parse% -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11 -DCMAKE_CXX_FLAGS='"/D_VARIADIC_MAX=10 /EHsc"' ..

@redboltz
Copy link
Contributor

redboltz commented Jun 6, 2020

It seems that the fix solves first 3 appveyor builds but unexpected side effects.
Required more fix...

@redboltz
Copy link
Contributor

redboltz commented Jun 6, 2020

It seems that 5906655 have some error on appveyor but I think that your approach (replacing CMakeLists.txt) is good :)
Text processing on Windows is very difficult to me :(

I will wait your update.

@ygj6 ygj6 force-pushed the cpp_master branch 2 times, most recently from 82fea55 to 755ee37 Compare June 6, 2020 16:13
@codecov-commenter
Copy link

Codecov Report

Merging #876 into cpp_master will increase coverage by 5.29%.
The diff coverage is n/a.

@@              Coverage Diff               @@
##           cpp_master     #876      +/-   ##
==============================================
+ Coverage       81.16%   86.46%   +5.29%     
==============================================
  Files              86       71      -15     
  Lines            6419     5053    -1366     
==============================================
- Hits             5210     4369     -841     
+ Misses           1209      684     -525     

@redboltz
Copy link
Contributor

redboltz commented Jun 8, 2020

Thank you for updating !

@redboltz redboltz merged commit ad9106e into msgpack:cpp_master Jun 8, 2020
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