Unify all package related names to msgpack-c.

Update the version to 6.0.0.
2025-04-24 00:57:07 +02:00 · 2023-02-28 10:43:13 +09:00 · 2023-02-28 10:43:13 +09:00 · 01f3d24fee
commit 01f3d24fee
parent 551308ae10
15 changed files with 82 additions and 77 deletions
--- a/.gitignore
+++ b/.gitignore
@ -19,7 +19,7 @@ Makefile.in
 /config.log
 /config.status
 /libtool
-/msgpack.pc
+/msgpack-c.pc
 /src/msgpack/version.h
 /src/msgpack/version.hpp
 /stamp-h1
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,8 @@
+# 2023-02-28 version 6.0.0
+## << breaking changes >>
+  * Change CMake package name of C library to msgpack-c (#1053)
+    Unified all C package, library, cmake, tarball name become msgpack-c.
+
 # 2023-01-10 version 5.0.0
  * Add additional address sanitizer for CI. (#1023)
 ## << breaking changes >>
--- 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 (msgpackc)
+PROJECT (msgpack-c)

 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})
@ -31,7 +31,7 @@ IF (BIGENDIAN)
    SET(MSGPACK_ENDIAN_LITTLE_BYTE 0)
 ELSE ()
    SET(MSGPACK_ENDIAN_BIG_BYTE 0)
-	SET(MSGPACK_ENDIAN_LITTLE_BYTE 1)
+        SET(MSGPACK_ENDIAN_LITTLE_BYTE 1)
 ENDIF ()

 CONFIGURE_FILE (
@ -115,20 +115,20 @@ ENDIF ()
 INCLUDE (Files.cmake)

 CONFIGURE_FILE (
-    msgpack.pc.in
-    msgpack.pc
+    msgpack-c.pc.in
+    msgpack-c.pc
    @ONLY
 )

 IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
-    ADD_LIBRARY (msgpackc
-        ${msgpackc_SOURCES}
-        ${msgpackc_HEADERS}
+    ADD_LIBRARY (msgpack-c
+        ${msgpack-c_SOURCES}
+        ${msgpack-c_HEADERS}
    )

-    SET_TARGET_PROPERTIES (msgpackc PROPERTIES SOVERSION 2 VERSION 2.0.0)
+    SET_TARGET_PROPERTIES (msgpack-c PROPERTIES SOVERSION 2 VERSION 2.0.0)

-    TARGET_INCLUDE_DIRECTORIES (msgpackc
+    TARGET_INCLUDE_DIRECTORIES (msgpack-c
        PUBLIC
            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
            $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
@ -141,12 +141,12 @@ ENDIF ()


 IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
-    ADD_LIBRARY (msgpackc-static STATIC
-        ${msgpackc_SOURCES}
-        ${msgpackc_HEADERS}
+    ADD_LIBRARY (msgpack-c-static STATIC
+        ${msgpack-c_SOURCES}
+        ${msgpack-c_HEADERS}
    )

-    TARGET_INCLUDE_DIRECTORIES (msgpackc-static
+    TARGET_INCLUDE_DIRECTORIES (msgpack-c-static
        PUBLIC
            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
            $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
@ -156,13 +156,13 @@ IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
            ${CMAKE_CURRENT_SOURCE_DIR}
    )

-    SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
+    SET_TARGET_PROPERTIES (msgpack-c-static PROPERTIES OUTPUT_NAME "msgpack-c")

    IF (MSGPACK_ENABLE_SHARED)
        IF (MSVC)
-            SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX "_import.lib")
+            SET_TARGET_PROPERTIES (msgpack-c PROPERTIES IMPORT_SUFFIX "_import.lib")
        ELSEIF (MINGW)
-            SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX ".dll.a")
+            SET_TARGET_PROPERTIES (msgpack-c PROPERTIES IMPORT_SUFFIX ".dll.a")
        ENDIF ()
    ENDIF ()
 ENDIF ()
@ -194,19 +194,19 @@ ENDIF ()

 IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
    IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
-        SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra -DPIC")
+        SET_PROPERTY (TARGET msgpack-c APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra -DPIC")
    ENDIF ()
    IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
-       SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra" )
+       SET_PROPERTY (TARGET msgpack-c-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra" )
    ENDIF ()
 ENDIF ()

 IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
    IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
-        SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
+        SET_PROPERTY (TARGET msgpack-c APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
    ENDIF ()
    IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
-        SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
+        SET_PROPERTY (TARGET msgpack-c-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
    ENDIF ()
 ENDIF ()

@ -227,7 +227,7 @@ IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
 ENDIF ()

 IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC90" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC10")
-    SET_SOURCE_FILES_PROPERTIES(${msgpackc_SOURCES} PROPERTIES LANGUAGE C)
+    SET_SOURCE_FILES_PROPERTIES(${msgpack-c_SOURCES} PROPERTIES LANGUAGE C)
 ENDIF ()

 IF ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "sparc")
@ -247,28 +247,28 @@ IF (MSGPACK_BUILD_EXAMPLES)
 ENDIF ()

 IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
-    SET (MSGPACK_INSTALLTARGETS msgpackc)
+    SET (MSGPACK_INSTALLTARGETS msgpack-c)
 ENDIF ()

 IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
-    LIST (APPEND MSGPACK_INSTALLTARGETS msgpackc-static)
+    LIST (APPEND MSGPACK_INSTALLTARGETS msgpack-c-static)
 ENDIF ()

-INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} EXPORT msgpackc-targets
+INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} EXPORT msgpack-c-targets
    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
-FOREACH (file ${msgpackc_common_HEADERS})
+FOREACH (file ${msgpack-c_common_HEADERS})
    GET_FILENAME_COMPONENT (dir ${file} PATH)
    INSTALL (FILES ${file} DESTINATION ${CMAKE_INSTALL_PREFIX}/${dir})
 ENDFOREACH ()
-FOREACH (file ${msgpackc_configured_HEADERS})
+FOREACH (file ${msgpack-c_configured_HEADERS})
    GET_FILENAME_COMPONENT (dir ${file} PATH)
    INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${file} DESTINATION ${CMAKE_INSTALL_PREFIX}/${dir})
 ENDFOREACH ()
 IF (NOT MSVC)
-    INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+    INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack-c.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 ENDIF ()

 # Doxygen
@ -298,36 +298,36 @@ ENDIF ()

 INCLUDE (CMakePackageConfigHelpers)

-SET (CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/msgpackc")
+SET (CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/msgpack-c")

 WRITE_BASIC_PACKAGE_VERSION_FILE (
-    msgpackc-config-version.cmake
+    msgpack-c-config-version.cmake
    VERSION ${VERSION}
    COMPATIBILITY SameMajorVersion
 )

 IF (NOT CMAKE_VERSION VERSION_LESS 3.0)
-    EXPORT (EXPORT msgpackc-targets
-        FILE "${CMAKE_CURRENT_BINARY_DIR}/msgpackc-targets.cmake"
+    EXPORT (EXPORT msgpack-c-targets
+        FILE "${CMAKE_CURRENT_BINARY_DIR}/msgpack-c-targets.cmake"
    )
 ENDIF ()

-CONFIGURE_PACKAGE_CONFIG_FILE (msgpackc-config.cmake.in
-    msgpackc-config.cmake
+CONFIGURE_PACKAGE_CONFIG_FILE (msgpack-c-config.cmake.in
+    msgpack-c-config.cmake
    INSTALL_DESTINATION "${CMAKE_INSTALL_CMAKEDIR}"
 )

-INSTALL (EXPORT msgpackc-targets
+INSTALL (EXPORT msgpack-c-targets
    FILE
-        msgpackc-targets.cmake
+        msgpack-c-targets.cmake
    DESTINATION
        "${CMAKE_INSTALL_CMAKEDIR}"
 )

 INSTALL (
    FILES
-        "${CMAKE_CURRENT_BINARY_DIR}/msgpackc-config.cmake"
-        "${CMAKE_CURRENT_BINARY_DIR}/msgpackc-config-version.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/msgpack-c-config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/msgpack-c-config-version.cmake"
    DESTINATION
        "${CMAKE_INSTALL_CMAKEDIR}"
 )
--- a/Files.cmake
+++ b/Files.cmake
@ -1,5 +1,5 @@
 # Source files
-SET (msgpackc_SOURCES
+SET (msgpack-c_SOURCES
    src/objectc.c
    src/unpack.c
    src/version.c
@ -8,7 +8,7 @@ SET (msgpackc_SOURCES
 )

 # Header files
-SET (msgpackc_common_HEADERS
+SET (msgpack-c_common_HEADERS
    include/msgpack.h
    include/msgpack/fbuffer.h
    include/msgpack/gcc_atomic.h
@ -29,13 +29,13 @@ SET (msgpackc_common_HEADERS
 )

 # Header files will configured
-SET (msgpackc_configured_HEADERS
+SET (msgpack-c_configured_HEADERS
    include/msgpack/pack_template.h
    include/msgpack/sysdep.h
 )

 # All header files
-LIST (APPEND msgpackc_HEADERS
-    ${msgpackc_common_HEADERS}
-    ${msgpackc_configured_HEADERS}
+LIST (APPEND msgpack-c_HEADERS
+    ${msgpack-c_common_HEADERS}
+    ${msgpack-c_configured_HEADERS}
 )
--- a/QUICKSTART-C.md
+++ b/QUICKSTART-C.md
@ -183,7 +183,7 @@ int main(void) {
        }

        /* results:
-         * $ gcc stream.cc -lmsgpackc -o stream
+         * $ gcc stream.cc -lmsgpack-c -o stream
         * $ ./stream
         * 1
         * 2
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 `msgpack` for C
 ===================

-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)
+Version 6.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: 5.0.0.{build}
+version: 6.0.0.{build}

 branches:
  only:
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@ -19,7 +19,7 @@ FOREACH (source_file ${exec_PROGRAMS})
        ${source_file}
    )
    TARGET_LINK_LIBRARIES (${source_file_we}
-        msgpackc
+        msgpack-c
    )
    IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")
--- a/example/cmake/CMakeLists.txt
+++ b/example/cmake/CMakeLists.txt
@ -3,15 +3,15 @@ project (example)

 if(EXAMPLE_MSGPACK_EMBEDDED)
    add_subdirectory(msgpack-c)
-    set(msgpackc_DIR ${CMAKE_CURRENT_BINARY_DIR}/msgpack-c)
+    set(msgpack-c_DIR ${CMAKE_CURRENT_BINARY_DIR}/msgpack-c)
 endif()

-find_package(msgpackc REQUIRED)
+find_package(msgpack-c REQUIRED)

 add_executable (${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/../simple_c.c)
-target_link_libraries(${PROJECT_NAME} msgpackc)
+target_link_libraries(${PROJECT_NAME} msgpack-c)

-if(TARGET msgpackc-static)
+if(TARGET msgpack-c-static)
    add_executable (${PROJECT_NAME}-static ${CMAKE_CURRENT_LIST_DIR}/../simple_c.c)
-    target_link_libraries(${PROJECT_NAME}-static msgpackc-static)
+    target_link_libraries(${PROJECT_NAME}-static msgpack-c-static)
 endif()
--- a/include/msgpack/version_master.h
+++ b/include/msgpack/version_master.h
@ -1,3 +1,3 @@
-#define MSGPACK_VERSION_MAJOR    5
+#define MSGPACK_VERSION_MAJOR    6
 #define MSGPACK_VERSION_MINOR    0
 #define MSGPACK_VERSION_REVISION 0
--- a/makedist.sh
+++ b/makedist.sh
@ -24,7 +24,7 @@ tar --append --file=$filename $prefix/CMakeLists.txt
 tar --append --file=$filename $prefix/Files.cmake
 tar --append --file=$filename $prefix/NOTICE
 tar --append --file=$filename $prefix/Doxyfile
-tar --append --file=$filename $prefix/msgpack.pc.in
+tar --append --file=$filename $prefix/msgpack-c.pc.in
 tar --append --file=$filename $prefix/AUTHORS
 tar --append --file=$filename $prefix/README.md
 tar --append --file=$filename $prefix/LICENSE_1_0.txt
@ -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/msgpackc-config.cmake.in
+tar --append --file=$filename $prefix/msgpack-c-config.cmake.in

 rm -f $prefix

--- a/msgpack-c-config.cmake.in
+++ b/msgpack-c-config.cmake.in
@ -0,0 +1,19 @@
+#.rst:
+# msgpack
+# -------
+#
+# The following import targets are created
+#
+# ::
+#
+#   msgpack-c
+#   msgpack-c-static (optional)
+#
+
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+
+if(NOT TARGET msgpack-c AND NOT TARGET msgpack-c-static)
+  include("${CMAKE_CURRENT_LIST_DIR}/msgpack-c-targets.cmake")
+endif()
--- a/msgpack-c.pc.in
+++ b/msgpack-c.pc.in
@ -6,5 +6,5 @@ includedir=@includedir@
 Name: MessagePack
 Description: Binary-based efficient object serialization library
 Version: @VERSION@
-Libs: -L${libdir} -lmsgpackc
+Libs: -L${libdir} -lmsgpack-c
 Cflags: -I${includedir}
--- a/msgpackc-config.cmake.in
+++ b/msgpackc-config.cmake.in
@ -1,19 +0,0 @@
-#.rst:
-# msgpack
-# -------
-#
-# The following import targets are created
-#
-# ::
-#
-#   msgpackc
-#   msgpackc-static (optional)
-#
-
-@PACKAGE_INIT@
-
-include(CMakeFindDependencyMacro)
-
-if(NOT TARGET msgpackc AND NOT TARGET msgpackc-static)
-  include("${CMAKE_CURRENT_LIST_DIR}/msgpackc-targets.cmake")
-endif()
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -23,7 +23,7 @@ FOREACH (source_file ${check_PROGRAMS})
    )

    TARGET_LINK_LIBRARIES (${source_file_we}
-        msgpackc
+        msgpack-c
        ${GTEST_BOTH_LIBRARIES}
        ${ZLIB_LIBRARIES}
        ${CMAKE_THREAD_LIBS_INIT}