Merge pull request #1049 from redboltz/fix_makedist.sh

Fixed cmake config name.

.github/workflows/gha.yml

@@ -31,10 +31,12 @@ jobs:
         export ARCH="64"
         if [ ${{ matrix.pattern }} == 0 ]; then
           export SHARED="ON"
+          export SAN="-fsanitize=address -fno-omit-frame-pointer"
           export CHAR_SIGN="unsigned"
         fi
         if [ ${{ matrix.pattern }} == 1 ]; then
           export SHARED="ON"
+          export SAN="-fsanitize=address -fno-omit-frame-pointer"
           export CHAR_SIGN="signed"
         fi
         if [ ${{ matrix.pattern }} == 2 ]; then
@@ -61,7 +63,7 @@ jobs:
         cd ..
 
         # build and test
-        CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" GTEST_ROOT="${BASE}/usr" CFLAGS="-Werror -g -fsanitize=undefined" CXXFLAGS="-Werror -g -fsanitize=undefined" ${ACTION}
+        CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" GTEST_ROOT="${BASE}/usr" CFLAGS="-Werror -g -fsanitize=undefined  -fno-sanitize-recover=all" CXXFLAGS="-Werror -g -ggdb3 -fsanitize=undefined  -fno-sanitize-recover=all" ${ACTION}
 
   linux:
     runs-on: ubuntu-18.04
@@ -87,6 +89,7 @@ jobs:
           ACTION="ci/build_cmake.sh"
           export ARCH="64"
           export SHARED="ON"
+          export SAN="-fsanitize=address -fno-omit-frame-pointer"
           export CHAR_SIGN="unsigned"
         fi
         if [ ${{ matrix.pattern }} == 1 ]; then
@@ -95,6 +98,7 @@ jobs:
           ACTION="ci/build_cmake.sh"
           export ARCH="32"
           export SHARED="ON"
+          export SAN="-fsanitize=address -fno-omit-frame-pointer"
           export CHAR_SIGN="signed"
         fi
         if [ ${{ matrix.pattern }} == 2 ]; then
@@ -103,6 +107,7 @@ jobs:
           ACTION="ci/build_cmake.sh"
           export ARCH="64"
           export SHARED="ON"
+          export SAN="-fsanitize=address -fno-omit-frame-pointer"
           export CHAR_SIGN="signed"
         fi
         if [ ${{ matrix.pattern }} == 3 ]; then
@@ -119,6 +124,7 @@ jobs:
           ACTION="ci/build_cmake.sh"
           export ARCH="64"
           export SHARED="ON"
+          export SAN="-fsanitize=address -fno-omit-frame-pointer"
           export CHAR_SIGN="signed"
         fi
         if [ ${{ matrix.pattern }} == 5 ]; then
@@ -127,6 +133,7 @@ jobs:
           ACTION="ci/build_cmake.sh"
           export ARCH="32"
           export SHARED="ON"
+          export SAN="-fsanitize=address -fno-omit-frame-pointer"
           export CHAR_SIGN="unsigned"
         fi
         if [ ${{ matrix.pattern }} == 6 ]; then
@@ -135,6 +142,7 @@ jobs:
           ACTION="ci/build_cmake.sh"
           export ARCH="64"
           export SHARED="ON"
+          export SAN="-fsanitize=address -fno-omit-frame-pointer"
           export CHAR_SIGN="unsigned"
         fi
         if [ ${{ matrix.pattern }} == 7 ]; then
@@ -172,7 +180,7 @@ jobs:
         fi
 
         # build and test
-        CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" GTEST_ROOT="${BASE}/usr" CFLAGS="-Werror -g -fsanitize=undefined" CXXFLAGS="-Werror -g -fsanitize=undefined" MSGPACK_SAN="${SAN}" ${ACTION}
+        CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" GTEST_ROOT="${BASE}/usr" CFLAGS="-Werror -g -fsanitize=undefined  -fno-sanitize-recover=all" CXXFLAGS="-Werror -g -ggdb3 -fsanitize=undefined  -fno-sanitize-recover=all" ${ACTION}
 
   windows:
     runs-on: windows-2019

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2023-01-10 version 5.0.0
+  * Add additional address sanitizer for CI. (#1023)
+## << breaking changes >>
+  * Change CMake package name of C library to msgpackc (#1044, #1049)
+
 # 2021-08-01 version 4.0.0
   * Fix and improve alignment logic (#962)
   * Fix iovec name conflict (#953)

CMakeLists.txt

@@ -5,7 +5,7 @@ IF ((CMAKE_VERSION VERSION_GREATER 3.1) OR
     CMAKE_POLICY(SET CMP0054 NEW)
 ENDIF ()
 
-PROJECT (msgpack)
+PROJECT (msgpackc)
 
 FILE (READ ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/version_master.h contents)
 STRING (REGEX MATCH "#define MSGPACK_VERSION_MAJOR *([0-9a-zA-Z_]*)" NULL_OUT ${contents})
@@ -254,7 +254,7 @@ IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
     LIST (APPEND MSGPACK_INSTALLTARGETS msgpackc-static)
 ENDIF ()
 
-INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} EXPORT msgpack-targets
+INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} EXPORT msgpackc-targets
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -298,36 +298,36 @@ ENDIF ()
 
 INCLUDE (CMakePackageConfigHelpers)
 
-SET (CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/msgpack")
+SET (CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/msgpackc")
 
 WRITE_BASIC_PACKAGE_VERSION_FILE (
-    msgpack-config-version.cmake
+    msgpackc-config-version.cmake
     VERSION ${VERSION}
     COMPATIBILITY SameMajorVersion
 )
 
 IF (NOT CMAKE_VERSION VERSION_LESS 3.0)
-    EXPORT (EXPORT msgpack-targets
+    EXPORT (EXPORT msgpackc-targets
-        FILE "${CMAKE_CURRENT_BINARY_DIR}/msgpack-targets.cmake"
+        FILE "${CMAKE_CURRENT_BINARY_DIR}/msgpackc-targets.cmake"
     )
 ENDIF ()
 
-CONFIGURE_PACKAGE_CONFIG_FILE (msgpack-config.cmake.in
+CONFIGURE_PACKAGE_CONFIG_FILE (msgpackc-config.cmake.in
-    msgpack-config.cmake
+    msgpackc-config.cmake
     INSTALL_DESTINATION "${CMAKE_INSTALL_CMAKEDIR}"
 )
 
-INSTALL (EXPORT msgpack-targets
+INSTALL (EXPORT msgpackc-targets
     FILE
-        msgpack-targets.cmake
+        msgpackc-targets.cmake
     DESTINATION
         "${CMAKE_INSTALL_CMAKEDIR}"
 )
 
 INSTALL (
     FILES
-        "${CMAKE_CURRENT_BINARY_DIR}/msgpack-config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/msgpackc-config.cmake"
-        "${CMAKE_CURRENT_BINARY_DIR}/msgpack-config-version.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/msgpackc-config-version.cmake"
     DESTINATION
         "${CMAKE_INSTALL_CMAKEDIR}"
 )

README.md

@@ -1,7 +1,7 @@
 `msgpack` for C
 ===================
 
-Version 4.0.0 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=c_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/c_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/c_master)
+Version 5.0.0 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=c_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/c_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/c_master)
 [![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/c_master/graph/badge.svg)](https://codecov.io/gh/msgpack/msgpack-c/branch/c_master)
 
 It's like JSON but smaller and faster.

appveyor.yml

@@ -1,4 +1,4 @@
-version: 4.0.0.{build}
+version: 5.0.0.{build}
 
 branches:
   only:
@@ -22,10 +22,10 @@ build_script:
 - cmake --build . --config Release
 - cd ..
 - cd ..
-- appveyor DownloadFile http://zlib.net/zlib-1.2.11.tar.gz -FileName zlib-1.2.11.tar.gz
+- appveyor DownloadFile http://zlib.net/zlib-1.2.13.tar.gz -FileName zlib-1.2.13.tar.gz
-- 7z x zlib-1.2.11.tar.gz > NUL
+- 7z x zlib-1.2.13.tar.gz > NUL
-- 7z x zlib-1.2.11.tar > NUL
+- 7z x zlib-1.2.13.tar > NUL
-- cd zlib-1.2.11
+- cd zlib-1.2.13
 - md build
 - cd build
 - cmake -G %msvc% ..
@@ -35,9 +35,9 @@ build_script:
 - cd ..
 - md build
 - cd build
-- cmake -G %msvc% -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"' ..
+- cmake -G %msvc% -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.13\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.13 -DCMAKE_CXX_FLAGS='"/D_VARIADIC_MAX=10 /EHsc"' ..
 - cmake --build . --config Release -v
 
 test_script:
-- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release;%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release
+- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release;%APPVEYOR_BUILD_FOLDER%\zlib-1.2.13\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release
 - ctest -V

ci/build_cmake.sh

@@ -25,7 +25,7 @@ else
     export ARCH_FLAG="-m64"
 fi
 
-cmake -DMSGPACK_32BIT=${BIT32} -DBUILD_SHARED_LIBS=${SHARED} -DMSGPACK_CHAR_SIGN=${CHAR_SIGN} -DCMAKE_CXX_FLAGS="${ARCH_FLAG} ${CXXFLAGS}" -DCMAKE_C_FLAGS="${CFLAGS}" ..
+cmake -DMSGPACK_32BIT=${BIT32} -DBUILD_SHARED_LIBS=${SHARED} -DMSGPACK_CHAR_SIGN=${CHAR_SIGN} -DCMAKE_CXX_FLAGS="${ARCH_FLAG} ${CXXFLAGS} ${SAN}" -DCMAKE_C_FLAGS="${CFLAGS} ${SAN}" ..
 
 ret=$?
 if [ $ret -ne 0 ]
@@ -49,6 +49,7 @@ then
     exit $ret
 fi
 
+cmake -DMSGPACK_32BIT=${BIT32} -DBUILD_SHARED_LIBS=${SHARED} -DMSGPACK_CHAR_SIGN=${CHAR_SIGN} -DCMAKE_CXX_FLAGS="${ARCH_FLAG} ${CXXFLAGS}" -DCMAKE_C_FLAGS="${CFLAGS}" ..
 make install DESTDIR=`pwd`/install
 
 ret=$?

example/cmake/CMakeLists.txt

@@ -3,10 +3,10 @@ project (example)
 
 if(EXAMPLE_MSGPACK_EMBEDDED)
     add_subdirectory(msgpack-c)
-    set(msgpack_DIR ${CMAKE_CURRENT_BINARY_DIR}/msgpack-c)
+    set(msgpackc_DIR ${CMAKE_CURRENT_BINARY_DIR}/msgpack-c)
 endif()
 
-find_package(msgpack REQUIRED)
+find_package(msgpackc REQUIRED)
 
 add_executable (${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/../simple_c.c)
 target_link_libraries(${PROJECT_NAME} msgpackc)

include/msgpack/version_master.h

@@ -1,3 +1,3 @@
-#define MSGPACK_VERSION_MAJOR    4
+#define MSGPACK_VERSION_MAJOR    5
 #define MSGPACK_VERSION_MINOR    0
 #define MSGPACK_VERSION_REVISION 0

makedist.sh

@@ -32,7 +32,7 @@ tar --append --file=$filename $prefix/ChangeLog
 tar --append --file=$filename $prefix/NEWS
 tar --append --file=$filename $prefix/COPYING
 tar --append --file=$filename $prefix/README
-tar --append --file=$filename $prefix/msgpack-config.cmake.in
+tar --append --file=$filename $prefix/msgpackc-config.cmake.in
 
 rm -f $prefix
 

msgpackc-config.cmake.in

@@ -15,5 +15,5 @@
 include(CMakeFindDependencyMacro)
 
 if(NOT TARGET msgpackc AND NOT TARGET msgpackc-static)
-  include("${CMAKE_CURRENT_LIST_DIR}/msgpack-targets.cmake")
+  include("${CMAKE_CURRENT_LIST_DIR}/msgpackc-targets.cmake")
 endif()