Merge pull request #1049 from redboltz/fix_makedist.sh

Fixed cmake config name.
2025-10-21 15:51:44 +02:00 · 2023-01-10 21:41:34 +09:00 · 2023-01-10 20:06:01 +09:00 · 2023-01-10 19:58:15 +09:00 · 2023-01-10 18:50:20 +09:00 · 2023-01-10 18:32:20 +09:00
10 changed files with 42 additions and 28 deletions
--- a/.github/workflows/gha.yml
+++ b/.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
--- a/CHANGELOG.md
+++ b/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)
--- a/CMakeLists.txt
+++ b/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
-        FILE "${CMAKE_CURRENT_BINARY_DIR}/msgpack-targets.cmake"
+    EXPORT (EXPORT msgpackc-targets
+        FILE "${CMAKE_CURRENT_BINARY_DIR}/msgpackc-targets.cmake"
    )
 ENDIF ()

-CONFIGURE_PACKAGE_CONFIG_FILE (msgpack-config.cmake.in
-    msgpack-config.cmake
+CONFIGURE_PACKAGE_CONFIG_FILE (msgpackc-config.cmake.in
+    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}/msgpack-config-version.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/msgpackc-config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/msgpackc-config-version.cmake"
    DESTINATION
        "${CMAKE_INSTALL_CMAKEDIR}"
 )
--- a/README.md
+++ b/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.
--- a/appveyor.yml
+++ b/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
- 7z x zlib-1.2.11.tar.gz > NUL
- 7z x zlib-1.2.11.tar > NUL
- cd zlib-1.2.11
+- appveyor DownloadFile http://zlib.net/zlib-1.2.13.tar.gz -FileName zlib-1.2.13.tar.gz
+- 7z x zlib-1.2.13.tar.gz > NUL
+- 7z x zlib-1.2.13.tar > NUL
+- 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
--- a/ci/build_cmake.sh
+++ b/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=$?
--- a/example/cmake/CMakeLists.txt
+++ b/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)
--- a/include/msgpack/version_master.h
+++ b/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
--- a/makedist.sh
+++ b/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

--- a/msgpackc-config.cmake.in
+++ b/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()
Author	SHA1	Message	Date
Takatoshi Kondo	551308ae10	Merge pull request #1049 from redboltz/fix_makedist.sh Fixed cmake config name.	2023-01-10 21:41:34 +09:00
Takatoshi Kondo	f2c446799c	Fixed cmake config name.	2023-01-10 20:06:01 +09:00
Takatoshi Kondo	c2430635f9	Merge pull request #1047 from redboltz/update_to_500_c Updated the version to 5.0.0.	2023-01-10 19:58:15 +09:00
Takatoshi Kondo	bffd3f2091	Updated the version to 5.0.0.	2023-01-10 18:50:20 +09:00
Takatoshi Kondo	076b5ed7fd	Merge pull request #1044 from traversaro/patch-1 Change CMake package name of C library to msgpackc	2023-01-10 18:32:20 +09:00
Silvio Traversaro	52fa74804c	Update CMakeLists.txt	2023-01-10 10:02:33 +01:00
Silvio Traversaro	5ae6077234	Update appveyor.yml	2023-01-07 14:40:24 +01:00
Silvio Traversaro	43de525dc7	Update zlib used in AppVeyor to 1.2.13	2023-01-07 13:35:33 +01:00
Silvio Traversaro	f7961b798b	Change CMake package name to msgpackc	2023-01-05 14:59:10 +01:00
Silvio Traversaro	5cada9eb27	Update and rename msgpack-config.cmake.in to msgpackc-config.cmake.in	2023-01-05 14:55:45 +01:00
Silvio Traversaro	ce42436f20	Change CMake package name to msgpackc	2023-01-05 14:55:10 +01:00
Takatoshi Kondo	c3df1bb26e	Merge pull request #1023 from redboltz/add_sanitizer Added additional address sanitizer for CI.	2022-06-05 21:15:26 +09:00
Takatoshi Kondo	63d3b093f0	Updated appveyor zlib version.	2022-06-05 20:35:54 +09:00
Takatoshi Kondo	8b57d2caf9	Added additional address sanitizer for CI. Except install, and except SHARED=OFF.	2022-06-05 20:30:14 +09:00