aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormyd7349 <myd7349@gmail.com>2021-09-08 12:04:44 +0800
committerGitHub <noreply@github.com>2021-09-07 21:04:44 -0700
commit503d17d5345387c478748ce2f91588c0f2017db4 (patch)
tree2742fead0d9f6394e4055fcfe800dd90fb2747b8
parentc126a7817c74c88ef95672640c5ec2ba518f7341 (diff)
downloadvcpkg-503d17d5345387c478748ce2f91588c0f2017db4.tar.gz
vcpkg-503d17d5345387c478748ce2f91588c0f2017db4.zip
[uriparser] Update to v0.9.5 (#19820)
* [uriparser] Update to 0.9.5 * [uriparser] Add new version * Small changes Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
-rw-r--r--ports/uriparser/CONTROL7
-rw-r--r--ports/uriparser/portfile.cmake21
-rw-r--r--ports/uriparser/vcpkg.json22
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/u-/uriparser.json5
5 files changed, 37 insertions, 20 deletions
diff --git a/ports/uriparser/CONTROL b/ports/uriparser/CONTROL
deleted file mode 100644
index 6196b0a45..000000000
--- a/ports/uriparser/CONTROL
+++ /dev/null
@@ -1,7 +0,0 @@
-Source: uriparser
-Version: 0.9.4
-Homepage: https://github.com/uriparser/uriparser
-Description: uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C89 ("ANSI C"). uriparser is cross-platform, fast, supports Unicode, and is licensed under the New BSD license.
-
-Feature: tool
-Description: Builds tools (e.g. CLI "uriparse")
diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake
index 36e24ce9e..e09c67d88 100644
--- a/ports/uriparser/portfile.cmake
+++ b/ports/uriparser/portfile.cmake
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO uriparser/uriparser
- REF 25dddb16cf044a7df27884e7ad3911baaaca3d7c # uriparser-0.9.4
- SHA512 9001649eb027d0ff4f990b20d0f05643939e2bb8ab89d158f32353d6f7c4264a551a6af7856ad13890d05f58b3d15d59e6d82ee0d95b7788c03b34bb52086cd2
+ REF 092c2ed1c1cdf2e3305f76927369a07b294eb279 # uriparser-0.9.5
+ SHA512 2d7a4e9d186389bada2a8e6b4400b628ea54d17fb8d8ba32f2f416205480a72e94c724ba04462b874b3b4b9399b7f776bcfae76a8cb96a8b896514c05d2be775
HEAD_REF master
)
@@ -12,9 +12,8 @@ else()
set(URIPARSER_BUILD_TOOLS OFF)
endif()
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DURIPARSER_BUILD_DOCS=OFF
-DURIPARSER_BUILD_TESTS=OFF
@@ -24,7 +23,7 @@ vcpkg_configure_cmake(
-DURIPARSER_BUILD_TOOLS=${URIPARSER_BUILD_TOOLS}
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
vcpkg_copy_pdbs()
@@ -42,18 +41,16 @@ file(STRINGS
)
string(REGEX REPLACE "${_package_version_re}" "\\1" _package_version ${_package_version_define})
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}-${_package_version})
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}-${_package_version})
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
vcpkg_replace_string(
- ${CURRENT_PACKAGES_DIR}/include/uriparser/UriBase.h
+ "${CURRENT_PACKAGES_DIR}/include/uriparser/UriBase.h"
"defined(URI_STATIC_BUILD)"
"1 // defined(URI_STATIC_BUILD)"
)
endif()
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/uriparser RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
-# Remove duplicate info
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/uriparser/vcpkg.json b/ports/uriparser/vcpkg.json
new file mode 100644
index 000000000..dab0db2bb
--- /dev/null
+++ b/ports/uriparser/vcpkg.json
@@ -0,0 +1,22 @@
+{
+ "name": "uriparser",
+ "version-semver": "0.9.5",
+ "description": "Strictly RFC 3986 compliant URI parsing and handling library written in C89.",
+ "homepage": "https://uriparser.github.io/",
+ "license": "BSD-3-Clause",
+ "dependencies": [
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ },
+ {
+ "name": "vcpkg-cmake-config",
+ "host": true
+ }
+ ],
+ "features": {
+ "tool": {
+ "description": "Builds CLI tool uriparse."
+ }
+ }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index d949a0cd5..9c7065b1e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6605,7 +6605,7 @@
"port-version": 1
},
"uriparser": {
- "baseline": "0.9.4",
+ "baseline": "0.9.5",
"port-version": 0
},
"usbmuxd": {
diff --git a/versions/u-/uriparser.json b/versions/u-/uriparser.json
index 1d85b4827..e5a5c3124 100644
--- a/versions/u-/uriparser.json
+++ b/versions/u-/uriparser.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "cdf383916004ac2ef910b4ea82632d8474763956",
+ "version-semver": "0.9.5",
+ "port-version": 0
+ },
+ {
"git-tree": "85975d0874cda87d367d337f4c7dddf8e7f37bce",
"version-string": "0.9.4",
"port-version": 0