[libtracepoint] Update to 1.4.0, add "tools" features (#39418)

This commit is contained in:
Doug Cook 2024-06-24 18:14:14 -07:00 committed by GitHub
parent c6043cde21
commit 54fb22ead7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 104 additions and 32 deletions

View File

@ -4,19 +4,31 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO "microsoft/LinuxTracepoints" REPO "microsoft/LinuxTracepoints"
REF "v${VERSION}" REF "v${VERSION}"
SHA512 b296ad3ee102d45cd8bccb2e3ed478f3d7adff8b3650251926189fd6efbca38728db61208af1627c08c16641b349e31e9366c6bc1965795063f39a167181f067 SHA512 baf27c967b2fa1fb8e8684951fd8e12e40fe9c23f5052a2d77c63eceab6ddfc112537422b97c37cfb0e479361fa8aedea6d8d7edfae91810f1ed696060fcb822
HEAD_REF main) HEAD_REF main)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
tools BUILD_TOOLS
)
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/libeventheader-decode-cpp" SOURCE_PATH "${SOURCE_PATH}/libeventheader-decode-cpp"
OPTIONS OPTIONS
${FEATURE_OPTIONS}
-DBUILD_SAMPLES=OFF -DBUILD_SAMPLES=OFF
-DBUILD_TOOLS=OFF) )
vcpkg_cmake_install() vcpkg_cmake_install()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
if (BUILD_TOOLS)
vcpkg_copy_tools(
TOOL_NAMES perf-decode
AUTO_CLEAN)
endif()
vcpkg_cmake_config_fixup( vcpkg_cmake_config_fixup(
PACKAGE_NAME eventheader-decode PACKAGE_NAME eventheader-decode
CONFIG_PATH lib/cmake/eventheader-decode) CONFIG_PATH lib/cmake/eventheader-decode)

View File

@ -1,6 +1,6 @@
{ {
"name": "libeventheader-decode", "name": "libeventheader-decode",
"version": "1.3.3", "version": "1.4.0",
"description": "C++ classes for decoding EventHeader-encoded Linux Tracepoints", "description": "C++ classes for decoding EventHeader-encoded Linux Tracepoints",
"homepage": "https://github.com/microsoft/LinuxTracepoints/", "homepage": "https://github.com/microsoft/LinuxTracepoints/",
"license": "MIT", "license": "MIT",
@ -8,11 +8,11 @@
"dependencies": [ "dependencies": [
{ {
"name": "libeventheader-tracepoint", "name": "libeventheader-tracepoint",
"version>=": "1.3.3" "version>=": "1.4.0"
}, },
{ {
"name": "libtracepoint-decode", "name": "libtracepoint-decode",
"version>=": "1.3.3" "version>=": "1.4.0"
}, },
{ {
"name": "vcpkg-cmake", "name": "vcpkg-cmake",
@ -22,5 +22,10 @@
"name": "vcpkg-cmake-config", "name": "vcpkg-cmake-config",
"host": true "host": true
} }
] ],
"features": {
"tools": {
"description": "Build user tools: perf-decode"
}
}
} }

View File

@ -6,14 +6,14 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO "microsoft/LinuxTracepoints" REPO "microsoft/LinuxTracepoints"
REF "v${VERSION}" REF "v${VERSION}"
SHA512 b296ad3ee102d45cd8bccb2e3ed478f3d7adff8b3650251926189fd6efbca38728db61208af1627c08c16641b349e31e9366c6bc1965795063f39a167181f067 SHA512 baf27c967b2fa1fb8e8684951fd8e12e40fe9c23f5052a2d77c63eceab6ddfc112537422b97c37cfb0e479361fa8aedea6d8d7edfae91810f1ed696060fcb822
HEAD_REF main) HEAD_REF main)
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/libeventheader-tracepoint" SOURCE_PATH "${SOURCE_PATH}/libeventheader-tracepoint"
OPTIONS OPTIONS
-DBUILD_SAMPLES=OFF -DBUILD_SAMPLES=OFF
-DBUILD_TOOLS=OFF) )
vcpkg_cmake_install() vcpkg_cmake_install()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()

View File

@ -1,6 +1,6 @@
{ {
"name": "libeventheader-tracepoint", "name": "libeventheader-tracepoint",
"version": "1.3.3", "version": "1.4.0",
"description": "C/C++ interface for generating EventHeader-encoded Linux Tracepoints", "description": "C/C++ interface for generating EventHeader-encoded Linux Tracepoints",
"homepage": "https://github.com/microsoft/LinuxTracepoints/", "homepage": "https://github.com/microsoft/LinuxTracepoints/",
"license": "MIT", "license": "MIT",
@ -8,7 +8,7 @@
"dependencies": [ "dependencies": [
{ {
"name": "libtracepoint", "name": "libtracepoint",
"version>=": "1.3.3" "version>=": "1.4.0"
}, },
{ {
"name": "vcpkg-cmake", "name": "vcpkg-cmake",

View File

@ -4,20 +4,30 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO "microsoft/LinuxTracepoints" REPO "microsoft/LinuxTracepoints"
REF "v${VERSION}" REF "v${VERSION}"
SHA512 b296ad3ee102d45cd8bccb2e3ed478f3d7adff8b3650251926189fd6efbca38728db61208af1627c08c16641b349e31e9366c6bc1965795063f39a167181f067 SHA512 baf27c967b2fa1fb8e8684951fd8e12e40fe9c23f5052a2d77c63eceab6ddfc112537422b97c37cfb0e479361fa8aedea6d8d7edfae91810f1ed696060fcb822
HEAD_REF main) HEAD_REF main)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
tools BUILD_TOOLS
)
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/libtracepoint-control-cpp" SOURCE_PATH "${SOURCE_PATH}/libtracepoint-control-cpp"
OPTIONS OPTIONS ${FEATURE_OPTIONS}
-DBUILD_SAMPLES=OFF -DBUILD_SAMPLES=OFF
-DBUILD_TESTS=OFF )
-DBUILD_TOOLS=OFF)
vcpkg_cmake_install() vcpkg_cmake_install()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
if (BUILD_TOOLS)
vcpkg_copy_tools(
TOOL_NAMES perf-collect
AUTO_CLEAN)
endif()
vcpkg_cmake_config_fixup( vcpkg_cmake_config_fixup(
PACKAGE_NAME tracepoint-control PACKAGE_NAME tracepoint-control
CONFIG_PATH lib/cmake/tracepoint-control) CONFIG_PATH lib/cmake/tracepoint-control)

View File

@ -1,7 +1,6 @@
{ {
"name": "libtracepoint-control", "name": "libtracepoint-control",
"version": "1.3.3", "version": "1.4.0",
"port-version": 1,
"description": "C++ classes for collecting Linux Tracepoints", "description": "C++ classes for collecting Linux Tracepoints",
"homepage": "https://github.com/microsoft/LinuxTracepoints/", "homepage": "https://github.com/microsoft/LinuxTracepoints/",
"license": "MIT", "license": "MIT",
@ -9,7 +8,7 @@
"dependencies": [ "dependencies": [
{ {
"name": "libtracepoint-decode", "name": "libtracepoint-decode",
"version>=": "1.3.3" "version>=": "1.4.0"
}, },
{ {
"name": "vcpkg-cmake", "name": "vcpkg-cmake",
@ -19,5 +18,11 @@
"name": "vcpkg-cmake-config", "name": "vcpkg-cmake-config",
"host": true "host": true
} }
] ],
"features": {
"tools": {
"description": "Build user tools: perf-collect",
"supports": "linux"
}
}
} }

View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO "microsoft/LinuxTracepoints" REPO "microsoft/LinuxTracepoints"
REF "v${VERSION}" REF "v${VERSION}"
SHA512 b296ad3ee102d45cd8bccb2e3ed478f3d7adff8b3650251926189fd6efbca38728db61208af1627c08c16641b349e31e9366c6bc1965795063f39a167181f067 SHA512 baf27c967b2fa1fb8e8684951fd8e12e40fe9c23f5052a2d77c63eceab6ddfc112537422b97c37cfb0e479361fa8aedea6d8d7edfae91810f1ed696060fcb822
HEAD_REF main) HEAD_REF main)
vcpkg_cmake_configure( vcpkg_cmake_configure(

View File

@ -1,6 +1,6 @@
{ {
"name": "libtracepoint-decode", "name": "libtracepoint-decode",
"version": "1.3.3", "version": "1.4.0",
"description": "C++ classes for decoding Linux Tracepoints", "description": "C++ classes for decoding Linux Tracepoints",
"homepage": "https://github.com/microsoft/LinuxTracepoints/", "homepage": "https://github.com/microsoft/LinuxTracepoints/",
"license": "MIT", "license": "MIT",

View File

@ -6,20 +6,30 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO "microsoft/LinuxTracepoints" REPO "microsoft/LinuxTracepoints"
REF "v${VERSION}" REF "v${VERSION}"
SHA512 b296ad3ee102d45cd8bccb2e3ed478f3d7adff8b3650251926189fd6efbca38728db61208af1627c08c16641b349e31e9366c6bc1965795063f39a167181f067 SHA512 baf27c967b2fa1fb8e8684951fd8e12e40fe9c23f5052a2d77c63eceab6ddfc112537422b97c37cfb0e479361fa8aedea6d8d7edfae91810f1ed696060fcb822
HEAD_REF main) HEAD_REF main)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
tools BUILD_TOOLS)
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/libtracepoint" SOURCE_PATH "${SOURCE_PATH}/libtracepoint"
OPTIONS OPTIONS
${FEATURE_OPTIONS}
-DBUILD_SAMPLES=OFF -DBUILD_SAMPLES=OFF
-DBUILD_TOOLS=OFF
-DBUILD_TESTS=OFF) -DBUILD_TESTS=OFF)
vcpkg_cmake_install() vcpkg_cmake_install()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
if (BUILD_TOOLS)
vcpkg_copy_tools(
TOOL_NAMES tracepoint-register
AUTO_CLEAN)
endif()
if(NOT VCPKG_TARGET_IS_WINDOWS) if(NOT VCPKG_TARGET_IS_WINDOWS)
vcpkg_cmake_config_fixup( vcpkg_cmake_config_fixup(
PACKAGE_NAME tracepoint PACKAGE_NAME tracepoint

View File

@ -1,7 +1,6 @@
{ {
"name": "libtracepoint", "name": "libtracepoint",
"version": "1.3.3", "version": "1.4.0",
"port-version": 1,
"description": "C/C++ interface for generating Linux Tracepoints", "description": "C/C++ interface for generating Linux Tracepoints",
"homepage": "https://github.com/microsoft/LinuxTracepoints/", "homepage": "https://github.com/microsoft/LinuxTracepoints/",
"license": "MIT", "license": "MIT",
@ -15,5 +14,11 @@
"name": "vcpkg-cmake-config", "name": "vcpkg-cmake-config",
"host": true "host": true
} }
] ],
"features": {
"tools": {
"description": "Build user tools: tracepoint-register",
"supports": "linux"
}
}
} }

View File

@ -4385,11 +4385,11 @@
"port-version": 1 "port-version": 1
}, },
"libeventheader-decode": { "libeventheader-decode": {
"baseline": "1.3.3", "baseline": "1.4.0",
"port-version": 0 "port-version": 0
}, },
"libeventheader-tracepoint": { "libeventheader-tracepoint": {
"baseline": "1.3.3", "baseline": "1.4.0",
"port-version": 0 "port-version": 0
}, },
"libevhtp": { "libevhtp": {
@ -5093,15 +5093,15 @@
"port-version": 0 "port-version": 0
}, },
"libtracepoint": { "libtracepoint": {
"baseline": "1.3.3", "baseline": "1.4.0",
"port-version": 1 "port-version": 0
}, },
"libtracepoint-control": { "libtracepoint-control": {
"baseline": "1.3.3", "baseline": "1.4.0",
"port-version": 1 "port-version": 0
}, },
"libtracepoint-decode": { "libtracepoint-decode": {
"baseline": "1.3.3", "baseline": "1.4.0",
"port-version": 0 "port-version": 0
}, },
"libu2f-server": { "libu2f-server": {

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "c09584c798815084e1889cb8d74627d4fc3d6e34",
"version": "1.4.0",
"port-version": 0
},
{ {
"git-tree": "30514fb5dce7aa046e1b71f658cc3cc10a0366ec", "git-tree": "30514fb5dce7aa046e1b71f658cc3cc10a0366ec",
"version": "1.3.3", "version": "1.3.3",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "573c10d322f63b1eca14f7f176b1f129b0375d0c",
"version": "1.4.0",
"port-version": 0
},
{ {
"git-tree": "d6fd027094b3930216990f5572f1de34531d4b05", "git-tree": "d6fd027094b3930216990f5572f1de34531d4b05",
"version": "1.3.3", "version": "1.3.3",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "77d1f20773ba8b6d4cb0bd56c508a11521bb6577",
"version": "1.4.0",
"port-version": 0
},
{ {
"git-tree": "b43d20ba774f4d86540350bd84f420e1bcaa386b", "git-tree": "b43d20ba774f4d86540350bd84f420e1bcaa386b",
"version": "1.3.3", "version": "1.3.3",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "27e3b141818c89cc05ff4d66ee23f0b945ef8e2f",
"version": "1.4.0",
"port-version": 0
},
{ {
"git-tree": "1e04ce7805f13762e06cd0bb01069e1b27f283f2", "git-tree": "1e04ce7805f13762e06cd0bb01069e1b27f283f2",
"version": "1.3.3", "version": "1.3.3",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "914ce95e52f114854f76063fda0789ba1590f897",
"version": "1.4.0",
"port-version": 0
},
{ {
"git-tree": "4f06adb290d6c05a65c1c62c8e37edc43f33eeac", "git-tree": "4f06adb290d6c05a65c1c62c8e37edc43f33eeac",
"version": "1.3.3", "version": "1.3.3",