[bitserializer] Update to new version 0.10 (#11683)

* [BitSerializer] Update to version 0.9

* [bitserializer] Update to version 0.10

* [bitserializer] Enable all features by default

* [bitserializer] Update hash of tagged commit and remove "rapidyaml-archive" from default list of features

* [bitserializer] Add alias packages for deprecated BitSerializer's libraries

* Skip bitserializer-rapidyaml for arm and osx

* Update scripts/ci.baseline.txt

Co-authored-by: Pavel_Kisliak <Pavel_Kisliak@epam.com>
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>

11 files changed, 53 insertions, 102 deletions

diff --git a/ports/bitserializer-cpprestjson/CONTROL b/ports/bitserializer-cpprestjson/CONTROL
index c3c1da30b..24c03ce9a 100644
--- a/ports/bitserializer-cpprestjson/CONTROL
+++ b/ports/bitserializer-cpprestjson/CONTROL
@@ -1,5 +1,4 @@
 Source: bitserializer-cpprestjson

-Version: 0.9

-Build-Depends: bitserializer, cpprestsdk

-Description: C++ 17 library for serialization, module for support JSON (implementation based on the CppRestSDK library)

-Homepage: https://bitbucket.org/Pavel_Kisliak/bitserializer

+Version: alias

+Build-Depends: bitserializer[cpprestjson-archive]

+Description: Deprecated alias for bitserializer-cpprestjson

diff --git a/ports/bitserializer-cpprestjson/portfile.cmake b/ports/bitserializer-cpprestjson/portfile.cmake
index 1cc969f59..0015715fb 100644
--- a/ports/bitserializer-cpprestjson/portfile.cmake
+++ b/ports/bitserializer-cpprestjson/portfile.cmake
@@ -1,19 +1 @@
-vcpkg_from_bitbucket(

-    OUT_SOURCE_PATH SOURCE_PATH

-    REPO Pavel_Kisliak/BitSerializer

-	REF 0.9

-	SHA512 74515a1a8338935c52752200d96abc0c0ee2c2b0b42880b1d10c8f56b5f8eb30680bd96b64eb2b352764128ad6a1fcd59749f481883c48a06230d652bee05902

-    HEAD_REF master

-)

-

-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)

+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
\ No newline at end of file
diff --git a/ports/bitserializer-pugixml/CONTROL b/ports/bitserializer-pugixml/CONTROL
index 6d43cb07d..23ab32923 100644
--- a/ports/bitserializer-pugixml/CONTROL
+++ b/ports/bitserializer-pugixml/CONTROL
@@ -1,5 +1,4 @@
 Source: bitserializer-pugixml

-Version: 0.9

-Build-Depends: bitserializer, pugixml

-Description: C++ 17 library for serialization, module for support XML (implementation based on the PugiXml library)

-Homepage: https://bitbucket.org/Pavel_Kisliak/bitserializer

+Version: alias

+Build-Depends: bitserializer[pugixml-archive]

+Description: Deprecated alias for bitserializer-pugixml

diff --git a/ports/bitserializer-pugixml/portfile.cmake b/ports/bitserializer-pugixml/portfile.cmake
index ee727cfdb..0015715fb 100644
--- a/ports/bitserializer-pugixml/portfile.cmake
+++ b/ports/bitserializer-pugixml/portfile.cmake
@@ -1,19 +1 @@
-vcpkg_from_bitbucket(

-    OUT_SOURCE_PATH SOURCE_PATH

-    REPO Pavel_Kisliak/BitSerializer

-    REF 0.9

-    SHA512 74515a1a8338935c52752200d96abc0c0ee2c2b0b42880b1d10c8f56b5f8eb30680bd96b64eb2b352764128ad6a1fcd59749f481883c48a06230d652bee05902

-    HEAD_REF master

-)

-

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}/archives/bitserializer_pugixml

-    PREFER_NINJA

-)

-vcpkg_install_cmake()

-vcpkg_fixup_cmake_targets(CONFIG_PATH share/bitserializer-pugixml/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-pugixml RENAME copyright)

+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
\ No newline at end of file
diff --git a/ports/bitserializer-rapidjson/CONTROL b/ports/bitserializer-rapidjson/CONTROL
index bf6e5061a..3cb55085b 100644
--- a/ports/bitserializer-rapidjson/CONTROL
+++ b/ports/bitserializer-rapidjson/CONTROL
@@ -1,5 +1,4 @@
 Source: bitserializer-rapidjson

-Version: 0.9

-Build-Depends: bitserializer, rapidjson

-Description: C++ 17 library for serialization, module for support JSON (implementation based on the RapidJson library)

-Homepage: https://bitbucket.org/Pavel_Kisliak/bitserializer

+Version: alias

+Build-Depends: bitserializer[rapidjson-archive]

+Description: Deprecated alias for bitserializer-rapidjson

diff --git a/ports/bitserializer-rapidjson/portfile.cmake b/ports/bitserializer-rapidjson/portfile.cmake
index 1594016b4..0015715fb 100644
--- a/ports/bitserializer-rapidjson/portfile.cmake
+++ b/ports/bitserializer-rapidjson/portfile.cmake
@@ -1,19 +1 @@
-vcpkg_from_bitbucket(

-    OUT_SOURCE_PATH SOURCE_PATH

-    REPO Pavel_Kisliak/BitSerializer

-	REF 0.9

-	SHA512 74515a1a8338935c52752200d96abc0c0ee2c2b0b42880b1d10c8f56b5f8eb30680bd96b64eb2b352764128ad6a1fcd59749f481883c48a06230d652bee05902

-    HEAD_REF master

-)

-

-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)

+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
\ No newline at end of file
diff --git a/ports/bitserializer-rapidyaml/CONTROL b/ports/bitserializer-rapidyaml/CONTROL
index b5632bb18..3d622fdf3 100644
--- a/ports/bitserializer-rapidyaml/CONTROL
+++ b/ports/bitserializer-rapidyaml/CONTROL
@@ -1,6 +1,5 @@
 Source: bitserializer-rapidyaml

-Version: 0.9

-Build-Depends: bitserializer, ryml

-Description: C++ 17 library for serialization, module for support YAML (implementation based on the RapidYaml library)

-Homepage: https://bitbucket.org/Pavel_Kisliak/bitserializer

+Version: alias

+Build-Depends: bitserializer[rapidyaml-archive]

+Description: Deprecated alias for bitserializer-rapidyaml

 Supports: !(arm|arm64|osx)

diff --git a/ports/bitserializer-rapidyaml/portfile.cmake b/ports/bitserializer-rapidyaml/portfile.cmake
index c5294e639..0015715fb 100644
--- a/ports/bitserializer-rapidyaml/portfile.cmake
+++ b/ports/bitserializer-rapidyaml/portfile.cmake
@@ -1,21 +1 @@
-vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "osx")

-

-vcpkg_from_bitbucket(

-    OUT_SOURCE_PATH SOURCE_PATH

-    REPO Pavel_Kisliak/BitSerializer

-    REF 0.9

-    SHA512 74515a1a8338935c52752200d96abc0c0ee2c2b0b42880b1d10c8f56b5f8eb30680bd96b64eb2b352764128ad6a1fcd59749f481883c48a06230d652bee05902

-    HEAD_REF master

-)

-

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}/archives/bitserializer_rapidyaml

-    PREFER_NINJA

-)

-vcpkg_install_cmake()

-vcpkg_fixup_cmake_targets(CONFIG_PATH share/bitserializer-rapidyaml/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/${PORT} RENAME copyright)

+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
\ No newline at end of file
diff --git a/ports/bitserializer/CONTROL b/ports/bitserializer/CONTROL
index 5807d79c4..63444a871 100644
--- a/ports/bitserializer/CONTROL
+++ b/ports/bitserializer/CONTROL
@@ -1,4 +1,21 @@
 Source: bitserializer

-Version: 0.9

+Version: 0.10

 Description: Core part of C++ 17 library for serialization to JSON, XML, YAML

 Homepage: https://bitbucket.org/Pavel_Kisliak/bitserializer

+Default-Features: cpprestjson-archive, rapidjson-archive, pugixml-archive

+

+Feature: cpprestjson-archive

+Build-Depends: cpprestsdk

+Description: Module for support JSON (implementation based on the CppRestSDK library)

+

+Feature: rapidjson-archive

+Build-Depends: rapidjson

+Description: Module for support JSON (implementation based on the RapidJson library)

+

+Feature: pugixml-archive

+Build-Depends: pugixml

+Description: Module for support XML (implementation based on the PugiXml library)

+

+Feature: rapidyaml-archive

+Build-Depends: ryml (!arm&!arm64&!osx)

+Description: Module for support YAML (implementation based on the RapidYaml library)

diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake
index 1f64a900a..d4ae86979 100644
--- a/ports/bitserializer/portfile.cmake
+++ b/ports/bitserializer/portfile.cmake
@@ -1,17 +1,26 @@
 vcpkg_from_bitbucket(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO Pavel_Kisliak/BitSerializer

-	REF 0.9

-	SHA512 74515a1a8338935c52752200d96abc0c0ee2c2b0b42880b1d10c8f56b5f8eb30680bd96b64eb2b352764128ad6a1fcd59749f481883c48a06230d652bee05902

+    REF 0.10

+    SHA512 a8a5acf4f9cc83d3090a3b06efbca682f4e022b5206bc7859ba6738e4d49a7678aa55f431f1721d50b28d8bde126b672396baae27cbaa79f62e3dc237ae678e1

     HEAD_REF master

 )

 

+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

+    "cpprestjson-archive"  BUILD_CPPRESTJSON_ARCHIVE

+    "rapidjson-archive"    BUILD_RAPIDJSON_ARCHIVE

+    "pugixml-archive"      BUILD_PUGIXML_ARCHIVE

+    "rapidyaml-archive"    BUILD_RAPIDYAML_ARCHIVE

+)

+

 vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}/core

+    SOURCE_PATH ${SOURCE_PATH}

     PREFER_NINJA

+    OPTIONS

+        ${FEATURE_OPTIONS}

 )

 vcpkg_install_cmake()

-vcpkg_fixup_cmake_targets(CONFIG_PATH share/bitserializer/cmake)

+vcpkg_fixup_cmake_targets(CONFIG_PATH share/bitserializer)

 

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug)

 

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 728225004..7fb026f06 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -125,9 +125,12 @@ berkeleydb:arm-uwp=fail
 berkeleydb:x64-linux=fail

 berkeleydb:x64-osx=fail

 berkeleydb:x64-uwp=fail

-bitserializer-rapidyaml:arm-uwp=fail

-bitserializer-rapidyaml:arm64-windows=fail

-bitserializer-rapidyaml:x64-osx=fail

+bitserializer-rapidyaml:arm-uwp=skip

+bitserializer-rapidyaml:arm64-windows=skip

+bitserializer-rapidyaml:x64-osx=skip

+bitserializer:arm-uwp=skip

+bitserializer:arm64-windows=skip

+bitserializer:x64-osx=skip

 blaze:x64-windows=fail

 blaze:x64-windows-static=fail

 blaze:x86-windows=fail