svn commit: r1925589 - in /apr/apr-util/branches/1.7.x/build/vcpkg: ./ apr-util/ apr-util/portfile.cmake apr-util/vcpkg.json

Author: ivan
Date: Fri May 16 18:17:54 2025
New Revision: 1925589

URL: http://svn.apache.org/viewvc?rev=1925589&view=rev
Log:
Add vcpkg port files.

Patch by: Timofei Zhakov <tima chemodax.net>

Added:
    apr/apr-util/branches/1.7.x/build/vcpkg/
    apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/   (props changed)
      - copied from r1925588, apr/apr/trunk/build/vcpkg/apr-2/
Modified:
    apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/portfile.cmake
    apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/vcpkg.json

Propchange: apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 16 18:17:54 2025
@@ -0,0 +1,7 @@
+/apr/apr/branches/1.4.x/build/vcpkg/apr-2:1101301
+/apr/apr/branches/1.5.x/build/vcpkg/apr-2:1101302
+/apr/apr/branches/cmake-native-type/build/vcpkg/apr-2:1920427-1920435
+/apr/apr/branches/thread-name/build/vcpkg/apr-2:1902296-1906888
+/apr/apr/branches/win32-pollset-wakeup-no-file-socket-emulation/build/vcpkg/apr-2:1897199-1897894
+/apr/apr/branches/xmllite/build/vcpkg/apr-2:1859121-1860149
+/apr/apr-util/branches/1.4.x/build/vcpkg/apr-2:1211219,1211223

Modified: apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/portfile.cmake
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/portfile.cmake?rev=1925589&r1=1925588&r2=1925589&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/portfile.cmake (original)
+++ apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/portfile.cmake Fri May 16 18:17:54 2025
@@ -1,20 +1,18 @@
-set(VERSION 2.0.0)
 #
-# Modify REF to latest commit id from https://github.com/apache/apr
+# Modify REF to latest commit id from https://github.com/apache/apr-util
 # Update SHA512 with actual SHA512
 #
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO apache/apr
-    REF 6445e8804008922f8018aa238aa4d6bba608c49a
+    REPO apache/apr-util
+    REF 0cf97bf278a453b976ab4305de5661560514232c
     SHA512 0
-    HEAD_REF trunk
+    HEAD_REF 1.7.x
 )
 
 if (VCPKG_TARGET_IS_WINDOWS)
     vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         FEATURES
-            private-headers INSTALL_PRIVATE_H
             crypto FEATURE_CRYPTO
             xlate FEATURE_XLATE
             dbd-odbc FEATURE_DBD_ODBC
@@ -25,21 +23,17 @@ if (VCPKG_TARGET_IS_WINDOWS)
     vcpkg_cmake_configure(
         SOURCE_PATH "${SOURCE_PATH}"
         OPTIONS
-            -DAPR_BUILD_TESTAPR=OFF
             -DINSTALL_PDB=OFF
             -DAPU_HAVE_CRYPTO=${FEATURE_CRYPTO}
             -DAPU_HAVE_ICONV=${FEATURE_XLATE}
             -DAPU_HAVE_ODBC=${FEATURE_DBD_ODBC}
             -DAPU_HAVE_SQLITE3=${FEATURE_DBD_SQLITE3}
             -DAPU_HAVE_PGSQL=${FEATURE_DBD_PGQL}
-            -DAPU_USE_EXPAT=${APU_USE_EXPAT}
-            -DAPR_INSTALL_PRIVATE_H=${INSTALL_PRIVATE_H}
+            -DAPU_USE_EXPAT=ON
     )
 
     vcpkg_cmake_install()
     vcpkg_copy_pdbs()
-    vcpkg_cmake_config_fixup(PACKAGE_NAME "apr"
-                             CONFIG_PATH "lib/cmake/apr")
 
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 else()
@@ -50,4 +44,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-

Modified: apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/vcpkg.json
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/vcpkg.json?rev=1925589&r1=1925588&r2=1925589&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/vcpkg.json (original)
+++ apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/vcpkg.json Fri May 16 18:17:54 2025
@@ -1,22 +1,16 @@
 {
-  "name": "apr-2",
-  "version": "2.0.0",
-  "port-version": 5,
-  "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.",
+  "name": "apr-util",
+  "version": "1.7.0",
+  "description": "Apache Portable Runtime (APR) project mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation",
   "homepage": "https://apr.apache.org/",
   "license": "Apache-2.0",
-  "supports": "!uwp",
   "dependencies": [
+    "apr",
     "expat",
     {
       "name": "vcpkg-cmake",
       "host": true,
       "platform": "windows"
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true,
-      "platform": "windows"
     }
   ],
   "features": {
@@ -49,9 +43,6 @@
         }
       ]
     },
-    "private-headers": {
-      "description": "Install non-standard files required for building Apache httpd"
-    },
     "xlate": {
       "description": "Xlate support",
       "dependencies": [