[dbus] Fix release only build (#38350)

Basically fixes the issue introduced in #37736 Signed-off-by: Vitalii Koshura <[email protected]>
microsoft · Apr 24, 2024 · 469cb68 · 469cb68
1 parent b406a50
commit 469cb68
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/ports/dbus/portfile.cmake b/ports/dbus/portfile.cmake
@@ -7,12 +7,12 @@ vcpkg_from_gitlab(
     REF "dbus-${VERSION}"
     SHA512 8e476b408514e6540c36beb84e8025827c22cda8958b6eb74d22b99c64765eb3cd5a6502aea546e3e5f0534039857b37edee89c659acef40e7cab0939947d4af
     HEAD_REF master
-    PATCHES 
+    PATCHES
         cmake.dep.patch
         pkgconfig.patch
         getpeereid.patch # missing check from configure.ac
         libsystemd.patch
-) 
+)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS options
     FEATURES
@@ -53,7 +53,7 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(PACKAGE_NAME "DBus1" CONFIG_PATH "lib/cmake/DBus1")
-vcpkg_fixup_pkgconfig() 
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
@@ -83,7 +83,9 @@ else()
     list(APPEND TOOLS cleanup-sockets uuidgen)
 endif()
 list(TRANSFORM TOOLS PREPEND "dbus-" )
-vcpkg_copy_tools(TOOL_NAMES ${TOOLS} SEARCH_DIR ${CURRENT_PACKAGES_DIR}/debug/bin DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}")
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    vcpkg_copy_tools(TOOL_NAMES ${TOOLS} SEARCH_DIR ${CURRENT_PACKAGES_DIR}/debug/bin DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}")
+endif()
 vcpkg_copy_tools(TOOL_NAMES ${TOOLS} AUTO_CLEAN)
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/dbus/vcpkg.json b/ports/dbus/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "dbus",
   "version": "1.15.8",
-  "port-version": 3,
+  "port-version": 4,
   "description": "D-Bus specification and reference implementation, including libdbus and dbus-daemon",
   "homepage": "https://gitlab.freedesktop.org/dbus/dbus",
   "license": "AFL-2.1 OR GPL-2.0-or-later",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2190,7 +2190,7 @@
     },
     "dbus": {
       "baseline": "1.15.8",
-      "port-version": 3
+      "port-version": 4
     },
     "dcmtk": {
       "baseline": "3.6.8",

diff --git a/versions/d-/dbus.json b/versions/d-/dbus.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0d922ac71a87fc0b7ca31eb4820639b887cc2450",
+      "version": "1.15.8",
+      "port-version": 4
+    },
     {
       "git-tree": "86fbdb4cf82ddaf47ec2fd41bf040765b912c589",
       "version": "1.15.8",