From 443f3dfbbce76389ef2f480c8edc59ca1d25015c Mon Sep 17 00:00:00 2001 From: Jordan Bayles Date: Wed, 11 Sep 2024 16:57:42 -0700 Subject: [PATCH 1/2] Release 1.9.6 and move versions to 1.9.7 This patch updates versions to be for version 1.9.7. --- CMakeLists.txt | 4 ++-- include/json/version.h | 4 ++-- log.txt | 53 ++++++++++++++++++++++++++++++++++++++++++ meson.build | 4 ++-- 4 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 log.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index f11425c08..c958250e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,11 +62,11 @@ project(jsoncpp # 2. ./include/json/version.h # 3. ./CMakeLists.txt # IMPORTANT: also update the PROJECT_SOVERSION!! - VERSION 1.9.6 # [.[.[.]]] + VERSION 1.9.7 # [.[.[.]]] LANGUAGES CXX) message(STATUS "JsonCpp Version: ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") -set(PROJECT_SOVERSION 26) +set(PROJECT_SOVERSION 27) include(${CMAKE_CURRENT_SOURCE_DIR}/include/PreventInSourceBuilds.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/include/PreventInBuildInstalls.cmake) diff --git a/include/json/version.h b/include/json/version.h index 38faedf11..25745cce1 100644 --- a/include/json/version.h +++ b/include/json/version.h @@ -9,10 +9,10 @@ // 3. /CMakeLists.txt // IMPORTANT: also update the SOVERSION!! -#define JSONCPP_VERSION_STRING "1.9.6" +#define JSONCPP_VERSION_STRING "1.9.7" #define JSONCPP_VERSION_MAJOR 1 #define JSONCPP_VERSION_MINOR 9 -#define JSONCPP_VERSION_PATCH 6 +#define JSONCPP_VERSION_PATCH 7 #define JSONCPP_VERSION_QUALIFIER #define JSONCPP_VERSION_HEXA \ ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | \ diff --git a/log.txt b/log.txt new file mode 100644 index 000000000..8255b2271 --- /dev/null +++ b/log.txt @@ -0,0 +1,53 @@ +Don't use build dir build interfaces (#1419) +Added Value::find with String key (#1467) +cmake export configuration: allow repeating find_package(jsoncpp) calls (#1491) +Introduce CharReaderBuilder::ecma404Mode (#1333) +meson.build: fix the version number (#1432) +include/json/value.h is changed (#1462) +Create a jsoncppConfig.cmake file, even if building under meson (#1486) +Update CMakeLists.txt (#1528) +Protect target JsonCpp::JsonCpp against multi-include (#1435) +Opportunistically take advantage of C++20 move-in/out-of stringstream (#1457) +Use current source / binary dir when assuring out of source builds (#1527) +Move removeIndex's result instead of copying (#1516) +Update cmake.yml +Update meson.yml (#1564) +Create cmake.yml (#1563) +remove ccache micro management (#1448) +Add security policy (#1484) +Update readFromString.cpp (#1477) +Fixed setting JSONCPP_USE_SECURE_MEMORY definition (#1479) +Fix compile on windows with clang (#1480) +CharReader: Add StructuredError (#1409) +Update link in amalgamate.py (#1335) +Bump CMake policy version to avoid deprecation warning (#1499) +build(meson): use find_program('python3') (#1386) +Update clang-format.yml +Update meson.yml (#1562) +Add code coverage (#1561) +Update clang-format.yml +add a valueToQuotedString overload (#1397) +Fix asserts in Value::setComment (#1445) +Fix out-of-bounds read. (#1503) +Fix a parser bug where tokens are misidentified as commas. (#1502) +Update clang-format.yml +Update meson.yml +Update meson.yml (#1554) +Clang format updates (#1560) +Update clang-format.yml +Update clang-format.yml +Create clang-format.yml +add comment space directive (#1558) +Delete .travis_scripts directory (#1556) +Delete .travis.yml (#1557) +Fix clang format issues (#1555) +Delete .github/workflows/c-cpp.yml +Rename meson_build_and_run to meson.yml +Create meson_build_and_run (#1553) +Create c-cpp.yml +Avoid using cmake glob vars if we are a subproject (#1459) +feat: adds front and back methods to Value type (#1458) +Fix wrong usage of doxygen groups (#1417) +Use default rather than hard-coded 8 for maximum aggregate member alignment (#1378) +Fix various typos (#1350) +Parse large floats as infinity (#1349) (#1353) \ No newline at end of file diff --git a/meson.build b/meson.build index 561b41ce7..8e8d57e3c 100644 --- a/meson.build +++ b/meson.build @@ -9,7 +9,7 @@ project( # 2. /include/json/version.h # 3. /CMakeLists.txt # IMPORTANT: also update the SOVERSION!! - version : '1.9.6', + version : '1.9.7', default_options : [ 'buildtype=release', 'cpp_std=c++11', @@ -50,7 +50,7 @@ jsoncpp_lib = library( 'src/lib_json/json_value.cpp', 'src/lib_json/json_writer.cpp', ]), - soversion : 26, + soversion : 27, install : true, include_directories : jsoncpp_include_directories, cpp_args: dll_export_flag) From 611a5c91eafabbd70b1049c596efecc5394f6ed6 Mon Sep 17 00:00:00 2001 From: Jordan Bayles Date: Wed, 11 Sep 2024 16:58:52 -0700 Subject: [PATCH 2/2] remove log.txt --- log.txt | 53 ----------------------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 log.txt diff --git a/log.txt b/log.txt deleted file mode 100644 index 8255b2271..000000000 --- a/log.txt +++ /dev/null @@ -1,53 +0,0 @@ -Don't use build dir build interfaces (#1419) -Added Value::find with String key (#1467) -cmake export configuration: allow repeating find_package(jsoncpp) calls (#1491) -Introduce CharReaderBuilder::ecma404Mode (#1333) -meson.build: fix the version number (#1432) -include/json/value.h is changed (#1462) -Create a jsoncppConfig.cmake file, even if building under meson (#1486) -Update CMakeLists.txt (#1528) -Protect target JsonCpp::JsonCpp against multi-include (#1435) -Opportunistically take advantage of C++20 move-in/out-of stringstream (#1457) -Use current source / binary dir when assuring out of source builds (#1527) -Move removeIndex's result instead of copying (#1516) -Update cmake.yml -Update meson.yml (#1564) -Create cmake.yml (#1563) -remove ccache micro management (#1448) -Add security policy (#1484) -Update readFromString.cpp (#1477) -Fixed setting JSONCPP_USE_SECURE_MEMORY definition (#1479) -Fix compile on windows with clang (#1480) -CharReader: Add StructuredError (#1409) -Update link in amalgamate.py (#1335) -Bump CMake policy version to avoid deprecation warning (#1499) -build(meson): use find_program('python3') (#1386) -Update clang-format.yml -Update meson.yml (#1562) -Add code coverage (#1561) -Update clang-format.yml -add a valueToQuotedString overload (#1397) -Fix asserts in Value::setComment (#1445) -Fix out-of-bounds read. (#1503) -Fix a parser bug where tokens are misidentified as commas. (#1502) -Update clang-format.yml -Update meson.yml -Update meson.yml (#1554) -Clang format updates (#1560) -Update clang-format.yml -Update clang-format.yml -Create clang-format.yml -add comment space directive (#1558) -Delete .travis_scripts directory (#1556) -Delete .travis.yml (#1557) -Fix clang format issues (#1555) -Delete .github/workflows/c-cpp.yml -Rename meson_build_and_run to meson.yml -Create meson_build_and_run (#1553) -Create c-cpp.yml -Avoid using cmake glob vars if we are a subproject (#1459) -feat: adds front and back methods to Value type (#1458) -Fix wrong usage of doxygen groups (#1417) -Use default rather than hard-coded 8 for maximum aggregate member alignment (#1378) -Fix various typos (#1350) -Parse large floats as infinity (#1349) (#1353) \ No newline at end of file