From 63e4cca88a44c6d543bb12d8d01564fb82bc946a Mon Sep 17 00:00:00 2001 From: Pavel_Kisliak Date: Mon, 4 May 2020 16:50:36 +0300 Subject: [PATCH 01/11] [BitSerializer] Update to version 0.9 --- ports/bitserializer-cpprestjson/CONTROL | 5 +++-- ports/bitserializer-cpprestjson/portfile.cmake | 14 ++++++++++---- ports/bitserializer-rapidjson/CONTROL | 5 +++-- ports/bitserializer-rapidjson/portfile.cmake | 14 ++++++++++---- ports/bitserializer/CONTROL | 5 +++-- ports/bitserializer/portfile.cmake | 16 +++++++++++----- 6 files changed, 40 insertions(+), 19 deletions(-) diff --git a/ports/bitserializer-cpprestjson/CONTROL b/ports/bitserializer-cpprestjson/CONTROL index f75cd41a2ddace..c3c1da30b20919 100644 --- a/ports/bitserializer-cpprestjson/CONTROL +++ b/ports/bitserializer-cpprestjson/CONTROL @@ -1,4 +1,5 @@ Source: bitserializer-cpprestjson -Version: 0.8 +Version: 0.9 Build-Depends: bitserializer, cpprestsdk -Description: This is an implementation of the BitSerializer archive for serialization JSON (based on CppRestSDK library). +Description: C++ 17 library for serialization, module for support JSON (implementation based on the CppRestSDK library) +Homepage: https://bitbucket.org/Pavel_Kisliak/bitserializer diff --git a/ports/bitserializer-cpprestjson/portfile.cmake b/ports/bitserializer-cpprestjson/portfile.cmake index 28430d5908fc96..1cc969f59ed63a 100644 --- a/ports/bitserializer-cpprestjson/portfile.cmake +++ b/ports/bitserializer-cpprestjson/portfile.cmake @@ -1,13 +1,19 @@ -include(vcpkg_common_functions) vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO Pavel_Kisliak/BitSerializer - REF 0.8 - SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093 + REF 0.9 + SHA512 74515a1a8338935c52752200d96abc0c0ee2c2b0b42880b1d10c8f56b5f8eb30680bd96b64eb2b352764128ad6a1fcd59749f481883c48a06230d652bee05902 HEAD_REF master ) -file(INSTALL ${SOURCE_PATH}/archives/bitserializer_cpprest_json DESTINATION ${CURRENT_PACKAGES_DIR}/include) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/archives/bitserializer_cpprest_json + PREFER_NINJA +) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/bitserializer-cpprestjson/cmake) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) # Handle copyright file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer-cpprestjson RENAME copyright) diff --git a/ports/bitserializer-rapidjson/CONTROL b/ports/bitserializer-rapidjson/CONTROL index db65c52aefba6c..bf6e5061a7eb3f 100644 --- a/ports/bitserializer-rapidjson/CONTROL +++ b/ports/bitserializer-rapidjson/CONTROL @@ -1,4 +1,5 @@ Source: bitserializer-rapidjson -Version: 0.8 +Version: 0.9 Build-Depends: bitserializer, rapidjson -Description: This is an implementation of the BitSerializer archive for serialization JSON (based on the RapidJson library). +Description: C++ 17 library for serialization, module for support JSON (implementation based on the RapidJson library) +Homepage: https://bitbucket.org/Pavel_Kisliak/bitserializer diff --git a/ports/bitserializer-rapidjson/portfile.cmake b/ports/bitserializer-rapidjson/portfile.cmake index 4050b73bc9a7b1..1594016b4ba46c 100644 --- a/ports/bitserializer-rapidjson/portfile.cmake +++ b/ports/bitserializer-rapidjson/portfile.cmake @@ -1,13 +1,19 @@ -include(vcpkg_common_functions) vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO Pavel_Kisliak/BitSerializer - REF 0.8 - SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093 + REF 0.9 + SHA512 74515a1a8338935c52752200d96abc0c0ee2c2b0b42880b1d10c8f56b5f8eb30680bd96b64eb2b352764128ad6a1fcd59749f481883c48a06230d652bee05902 HEAD_REF master ) -file(INSTALL ${SOURCE_PATH}/archives/bitserializer_rapidjson DESTINATION ${CURRENT_PACKAGES_DIR}/include) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/archives/bitserializer_rapidjson + PREFER_NINJA +) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/bitserializer-rapidjson/cmake) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) # Handle copyright file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer-rapidjson RENAME copyright) diff --git a/ports/bitserializer/CONTROL b/ports/bitserializer/CONTROL index 35e02fe030844c..5807d79c4ecaef 100644 --- a/ports/bitserializer/CONTROL +++ b/ports/bitserializer/CONTROL @@ -1,3 +1,4 @@ Source: bitserializer -Version: 0.8 -Description: The core part of library for serialization of arbitrary C++ types to various output formats. +Version: 0.9 +Description: Core part of C++ 17 library for serialization to JSON, XML, YAML +Homepage: https://bitbucket.org/Pavel_Kisliak/bitserializer diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake index 50eb93481b13fc..1f64a900addd76 100644 --- a/ports/bitserializer/portfile.cmake +++ b/ports/bitserializer/portfile.cmake @@ -1,13 +1,19 @@ -include(vcpkg_common_functions) vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO Pavel_Kisliak/BitSerializer - REF 0.8 - SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093 + REF 0.9 + SHA512 74515a1a8338935c52752200d96abc0c0ee2c2b0b42880b1d10c8f56b5f8eb30680bd96b64eb2b352764128ad6a1fcd59749f481883c48a06230d652bee05902 HEAD_REF master ) -file(INSTALL ${SOURCE_PATH}/core/bitserializer DESTINATION ${CURRENT_PACKAGES_DIR}/include) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/core + PREFER_NINJA +) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/bitserializer/cmake) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) # Handle copyright -file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer RENAME copyright) +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 7d7645752df802f2f3d3e1bd7915b226ff03df86 Mon Sep 17 00:00:00 2001 From: Pavel Kisliak Date: Wed, 7 Dec 2022 21:17:16 +0300 Subject: [PATCH 02/11] [BitSerializer] Add new version 0.50 --- ports/bitserializer/portfile.cmake | 14 +++++++++++--- ports/bitserializer/vcpkg.json | 8 +++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake index 36f9c413f985d2..ec91cca48e3c9b 100644 --- a/ports/bitserializer/portfile.cmake +++ b/ports/bitserializer/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO Pavel_Kisliak/BitSerializer - REF 0.44 - SHA512 0629acc93807254bd51d9eed761a92be4780d01604a9ae4bf8a933af70fdb206ea9b4f4db3489805b4163f5071246529ea22f8b3e7fbcd77ed936c3ab24697b2 + REF 0.50 + SHA512 d223e4487251e375b2f5d8b1dca9a3db3f5661c3eb308b12f019864e49d58fb0b7d45a45c3e7e232ba1d023adb1f9a3a287255099b205f57c6cade04167119d6 HEAD_REF master ) @@ -12,6 +12,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "rapidjson-archive" BUILD_RAPIDJSON_ARCHIVE "pugixml-archive" BUILD_PUGIXML_ARCHIVE "rapidyaml-archive" BUILD_RAPIDYAML_ARCHIVE + "csv-archive" BUILD_CSV_ARCHIVE ) vcpkg_cmake_configure( @@ -19,10 +20,17 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} ) + vcpkg_cmake_install() +vcpkg_copy_pdbs() vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +# All components of BitSerializer is "header only" except CSV archive +if (NOT ${BUILD_CSV_ARCHIVE}) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +endif() # Handle copyright file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bitserializer/vcpkg.json b/ports/bitserializer/vcpkg.json index 8ea09f7b01fb8b..66fd0993d9ac39 100644 --- a/ports/bitserializer/vcpkg.json +++ b/ports/bitserializer/vcpkg.json @@ -1,8 +1,7 @@ { "name": "bitserializer", - "version": "0.44", - "port-version": 2, - "description": "C++ 17 library for serialization to JSON, XML, YAML", + "version": "0.50", + "description": "C++ 17 library for serialization to JSON, XML, YAML, CSV", "homepage": "https://bitbucket.org/Pavel_Kisliak/bitserializer", "license": "MIT", "dependencies": [ @@ -22,6 +21,9 @@ "cpprestsdk" ] }, + "csv-archive": { + "description": "Module for support CSV" + }, "pugixml-archive": { "description": "Module for support XML (implementation based on the PugiXml library)", "dependencies": [ From c864f7017c39a82f1058f632eed3adc847e91b44 Mon Sep 17 00:00:00 2001 From: Pavel Kisliak Date: Mon, 26 Dec 2022 18:32:19 +0300 Subject: [PATCH 03/11] [BitSerializer] Update baseline and versions files --- versions/b-/bitserializer.json | 5 +++++ versions/baseline.json | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/b-/bitserializer.json b/versions/b-/bitserializer.json index b0cd2b5cf257b6..b2afbdde979fcc 100644 --- a/versions/b-/bitserializer.json +++ b/versions/b-/bitserializer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4c7d41220b53c251af12716ee5c6072fe1d63c9", + "version": "0.50", + "port-version": 0 + }, { "git-tree": "5890683ebbade2c0abbc466cd447e3f4220f49cd", "version": "0.44", diff --git a/versions/baseline.json b/versions/baseline.json index d9029e1369cb7a..6d8475980f89d2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -497,8 +497,8 @@ "port-version": 0 }, "bitserializer": { - "baseline": "0.44", - "port-version": 2 + "baseline": "0.50", + "port-version": 0 }, "bitserializer-cpprestjson": { "baseline": "alias", From 6b56f581fd274afc4b0bc8e7e5a6bc43ee8f8804 Mon Sep 17 00:00:00 2001 From: Pavel Kisliak Date: Tue, 27 Dec 2022 09:50:06 +0300 Subject: [PATCH 04/11] [BitSerializer] Add static linkage check --- ports/bitserializer/portfile.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake index ec91cca48e3c9b..7cc64c2f6d0e12 100644 --- a/ports/bitserializer/portfile.cmake +++ b/ports/bitserializer/portfile.cmake @@ -1,3 +1,8 @@ +# All components of BitSerializer is "header only" except CSV archive +if (${BUILD_CSV_ARCHIVE}) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO Pavel_Kisliak/BitSerializer @@ -27,7 +32,6 @@ vcpkg_cmake_config_fixup() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# All components of BitSerializer is "header only" except CSV archive if (NOT ${BUILD_CSV_ARCHIVE}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") endif() From 7e1be1c408c3d7330be702b734b2a4d8c0d2ec0d Mon Sep 17 00:00:00 2001 From: Pavel Kisliak Date: Tue, 27 Dec 2022 09:51:53 +0300 Subject: [PATCH 05/11] [BitSerializer] Update version file --- versions/b-/bitserializer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/b-/bitserializer.json b/versions/b-/bitserializer.json index b2afbdde979fcc..ffccfe6ef5473a 100644 --- a/versions/b-/bitserializer.json +++ b/versions/b-/bitserializer.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e4c7d41220b53c251af12716ee5c6072fe1d63c9", + "git-tree": "66b827e44bf7536936011f4dab7649cef81162ab", "version": "0.50", "port-version": 0 }, From a96707a93e621e4f9f7d8be7f0d2933096611f8a Mon Sep 17 00:00:00 2001 From: Pavel Kisliak Date: Tue, 27 Dec 2022 10:01:14 +0300 Subject: [PATCH 06/11] [BitSerializer] Add 'usage' file --- ports/bitserializer/usage | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 ports/bitserializer/usage diff --git a/ports/bitserializer/usage b/ports/bitserializer/usage new file mode 100644 index 00000000000000..0a7eca52e5e410 --- /dev/null +++ b/ports/bitserializer/usage @@ -0,0 +1,11 @@ +BitSerializer provides CMake targets: + + find_package(bitserializer CONFIG REQUIRED) + # Link only archives which you are specified in the features list when install + target_link_libraries(main PRIVATE + BitSerializer::cpprestjson-archive + BitSerializer::rapidjson-archive + BitSerializer::pugixml-archive + BitSerializer::rapidyaml-archive + BitSerializer::csv-archive + ) From 64c6da59b7b4d9e1f31d9c2298f1501ca18a9139 Mon Sep 17 00:00:00 2001 From: Pavel Kisliak Date: Tue, 27 Dec 2022 10:02:05 +0300 Subject: [PATCH 07/11] [BitSerializer] Update version file --- versions/b-/bitserializer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/b-/bitserializer.json b/versions/b-/bitserializer.json index ffccfe6ef5473a..63bef272d27a3a 100644 --- a/versions/b-/bitserializer.json +++ b/versions/b-/bitserializer.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "66b827e44bf7536936011f4dab7649cef81162ab", + "git-tree": "4edc5a07544839ad3b76bdf98aa7dd842cabfe30", "version": "0.50", "port-version": 0 }, From 5f5bf6b53b6e422b65c47278c115bf9c727d7648 Mon Sep 17 00:00:00 2001 From: Pavel Kisliak Date: Tue, 27 Dec 2022 12:05:55 +0300 Subject: [PATCH 08/11] [BitSerializer] Remove conditional check linkage type (by comment from review) --- ports/bitserializer/portfile.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake index 7cc64c2f6d0e12..981279a0c6f7ed 100644 --- a/ports/bitserializer/portfile.cmake +++ b/ports/bitserializer/portfile.cmake @@ -1,7 +1,5 @@ # All components of BitSerializer is "header only" except CSV archive -if (${BUILD_CSV_ARCHIVE}) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH From 1894f71d261e89ad5ddf52854e5e8dc3d4b17bf7 Mon Sep 17 00:00:00 2001 From: Pavel Kisliak Date: Tue, 27 Dec 2022 12:06:42 +0300 Subject: [PATCH 09/11] [BitSerializer] Update version file --- versions/b-/bitserializer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/b-/bitserializer.json b/versions/b-/bitserializer.json index 63bef272d27a3a..aad78043ffc6d9 100644 --- a/versions/b-/bitserializer.json +++ b/versions/b-/bitserializer.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4edc5a07544839ad3b76bdf98aa7dd842cabfe30", + "git-tree": "7e82964b5be3bf930373808cb27f1c2867911dea", "version": "0.50", "port-version": 0 }, From 04fcd81d5adbf724b27e97a3bd10bba0808781ca Mon Sep 17 00:00:00 2001 From: Pavel Kisliak Date: Thu, 29 Dec 2022 21:18:20 +0300 Subject: [PATCH 10/11] Add copy 'usage' file --- ports/bitserializer/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake index 981279a0c6f7ed..818e3324cd9a1f 100644 --- a/ports/bitserializer/portfile.cmake +++ b/ports/bitserializer/portfile.cmake @@ -36,3 +36,4 @@ endif() # Handle copyright file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file From 1c474cc6ab49f811ac96eaa4e51eeecf6dca21d3 Mon Sep 17 00:00:00 2001 From: Pavel Kisliak Date: Thu, 29 Dec 2022 21:19:42 +0300 Subject: [PATCH 11/11] [BitSerializer] Update versions file --- versions/b-/bitserializer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/b-/bitserializer.json b/versions/b-/bitserializer.json index aad78043ffc6d9..82aaa60e2ace6a 100644 --- a/versions/b-/bitserializer.json +++ b/versions/b-/bitserializer.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7e82964b5be3bf930373808cb27f1c2867911dea", + "git-tree": "8f6f0ca62f24edb91a4b605b045f46653442d1d5", "version": "0.50", "port-version": 0 },