[sobjectizer] Update to v.5.7.3 (#22399)

* sobjectizer updated to v5.7.3. * so5extra updated to v1.5.0. * so5extra-1.5.0 added to baseline. * Fixes for old cmake commands. * Update baseline for sobjectizer/so5extra. * modernize cmake functions * update version * modernize cmake functions * update version * udpate version Co-authored-by: Jonliu1993 <[email protected]>
microsoft · Jan 7, 2022 · 03ca9b5 · 03ca9b5
1 parent d52bb6f
commit 03ca9b5
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 24 deletions.
diff --git a/ports/so5extra/portfile.cmake b/ports/so5extra/portfile.cmake
@@ -1,21 +1,20 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO stiffstream/so5extra
-    REF 20f4c83ecde1509fbaf337dcf40f2f49dcf2690d # v.1.4.1.1
-    SHA512 a3df042b60afc4c57361b5b3c21f4b7c077f1b0ab7a4d33fda14cc915f10b22a42ef0acbb1c7c8b356ce31ee84f24391164120642faf96235549204c83b40294
+    REF 713ed4876135dfaa9b744b567f7c300eae09800d # v.1.5.0
+    SHA512 51b1e9521288c4cfbbf29aa9719b9da3ee0073e38af6fc275a5ec0a22b4bededf293b136aac0cf99a435b4411ccf0687556418fc25285f501a6f426f3a623c34
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}/dev/so_5_extra
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/dev/so_5_extra"
     OPTIONS
         -DSO5EXTRA_INSTALL=ON
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/so5extra)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/so5extra)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/so5extra RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/so5extra" RENAME copyright)
 
diff --git a/ports/so5extra/vcpkg.json b/ports/so5extra/vcpkg.json
@@ -1,10 +1,18 @@
 {
   "name": "so5extra",
-  "version": "1.4.1.1",
+  "version": "1.5.0",
   "description": "A set of additional tools for SObjectizer framework.",
   "homepage": "https://github.com/Stiffstream/so5extra",
   "license": "BSD-3-Clause",
   "dependencies": [
-    "sobjectizer"
+    "sobjectizer",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake
@@ -1,26 +1,25 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO stiffstream/sobjectizer
-    REF 972b5310b7a486dd4d4322ffb46f1c7e15c47ef6 # v.5.7.2.6
-    SHA512 0e5160981218d49beda3ed367ed34fa05c706104f68b6b06619f62a9b2a1ef92b08ddfd3ae14451e51e41bb7742789da4536289ec9d2d23dce13cdf6284108c9
+    REF 4c3bf6e9da4eae21fa5cce31dd464aabaec803a4 # v.5.7.3
+    SHA512 e5de6753d44c85c8077b133af1823bf892e1e7361659bbfc424b39c2f123e3b1c99b1292908e32034b538ef2410a41587c51723c8f8e1ffd85badd559f2a393c
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOBJECTIZER_BUILD_STATIC )
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SOBJECTIZER_BUILD_SHARED)
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}/dev
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/dev"
     OPTIONS
         -DSOBJECTIZER_BUILD_STATIC=${SOBJECTIZER_BUILD_STATIC}
         -DSOBJECTIZER_BUILD_SHARED=${SOBJECTIZER_BUILD_SHARED}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sobjectizer)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sobjectizer)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
diff --git a/ports/sobjectizer/vcpkg.json b/ports/sobjectizer/vcpkg.json
@@ -1,7 +1,17 @@
 {
   "name": "sobjectizer",
-  "version": "5.7.2.6",
+  "version": "5.7.3",
   "description": "SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels.",
   "homepage": "https://github.com/Stiffstream/sobjectizer",
-  "license": "BSD-3-Clause"
+  "license": "BSD-3-Clause",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6425,11 +6425,11 @@
       "port-version": 1
     },
     "so5extra": {
-      "baseline": "1.4.1.1",
+      "baseline": "1.5.0",
       "port-version": 0
     },
     "sobjectizer": {
-      "baseline": "5.7.2.6",
+      "baseline": "5.7.3",
       "port-version": 0
     },
     "soci": {

diff --git a/versions/s-/so5extra.json b/versions/s-/so5extra.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a25bef02c9cea8f01ec3066d423b4f4ca6615959",
+      "version": "1.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "19014d4bd5c636ba619162dfad251af8142e4843",
       "version": "1.4.1.1",

diff --git a/versions/s-/sobjectizer.json b/versions/s-/sobjectizer.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6d0c49d93ac92669376ad08293de921d9e36352e",
+      "version": "5.7.3",
+      "port-version": 0
+    },
     {
       "git-tree": "a9d077353078063b67cad355ccb7546a0b4bfcac",
       "version": "5.7.2.6",