mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 04:53:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[jsonnet, opentelemetry-cpp] Remove !(windows & !static) (#26953)

Browse Source 
* jsonnet

* opentelemetry-cpp

* version

* [mfl] Disable tests

* version

* Restore version db

* mfl

* version

* simplify

* CR

* version

* Fix deprecated functions

* wrong pr

* version

* revert
This commit is contained in:
Thomas1664 2022-09-26 20:35:51 +02:00 committed by GitHub
parent e3ba2df6fa
commit 5bc980361a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ports/jsonnet/portfile.cmake
View File

@ -32,13 +32,8 @@ else()
)
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(BUILD_SHARED ON)
set(BUILD_STATIC OFF)
else()
set(BUILD_SHARED OFF)
set(BUILD_STATIC ON)
endif()
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"

2
ports/jsonnet/vcpkg.json
View File

@ -1,10 +1,10 @@
{
"name": "jsonnet",
"version": "0.18.0",
"port-version": 1,
"description": "Jsonnet - The data templating language",
"homepage": "https://github.com/google/jsonnet",
"license": "Apache-2.0",
"supports": "!(windows & !static)",
"dependencies": [
"nlohmann-json",
"ryml",

14
ports/opentelemetry-cpp/portfile.cmake
View File

@ -2,12 +2,6 @@ if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
endif()
if ("etw" IN_LIST FEATURES)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "linux" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "OSX")
message(FATAL_ERROR "Feature 'ewt' does not support 'linux & osx'")
endif()
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO open-telemetry/opentelemetry-cpp
@ -36,9 +30,9 @@ if(WITH_OTLP)
SHA512 b61d7fe7d6e1b5943d45ab9d17c22fe36c0f7a8312f668aea2b6685aa0f5c98aaa41e76659057310ec1f061d36ad9e66993be177039121f62f73858a6749d3d9
)
vcpkg_extract_source_archive(${ARCHIVE} ${SOURCE_PATH}/third_party)
file(REMOVE_RECURSE ${SOURCE_PATH}/third_party/opentelemetry-proto)
file(RENAME ${SOURCE_PATH}/third_party/opentelemetry-proto-${OTEL_PROTO_VERSION} ${SOURCE_PATH}/third_party/opentelemetry-proto)
vcpkg_extract_source_archive("${ARCHIVE}" "${SOURCE_PATH}/third_party")
file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/opentelemetry-proto")
file(RENAME "${SOURCE_PATH}/third_party/opentelemetry-proto-${OTEL_PROTO_VERSION}" "${SOURCE_PATH}/third_party/opentelemetry-proto")
endif()
vcpkg_cmake_configure(
@ -52,7 +46,7 @@ vcpkg_cmake_configure(
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/opentelemetry-cpp)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

5
ports/opentelemetry-cpp/vcpkg.json
View File

@ -2,13 +2,13 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
"name": "opentelemetry-cpp",
"version-semver": "1.5.0",
"port-version": 1,
"description": [
"OpenTelemetry is a collection of tools, APIs, and SDKs.",
"You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior."
],
"homepage": "https://github.com/open-telemetry/opentelemetry-cpp",
"license": "Apache-2.0",
"supports": "!(windows & !static)",
"dependencies": [
"curl",
"nlohmann-json",
@ -26,7 +26,8 @@
"description": "Whether to include the Elasticsearch Client in the SDK"
},
"etw": {
"description": "Whether to include the ETW Exporter in the SDK"
"description": "Whether to include the ETW Exporter in the SDK",
"supports": "windows"
},
"jaeger": {
"description": "Whether to include the Jaeger exporter",

4
versions/baseline.json
View File

@ -3190,7 +3190,7 @@
},
"jsonnet": {
"baseline": "0.18.0",
"port-version": 0
"port-version": 1
},
"jwt-cpp": {
"baseline": "0.6.0",
@ -5422,7 +5422,7 @@
},
"opentelemetry-cpp": {
"baseline": "1.5.0",
"port-version": 0
"port-version": 1
},
"opentracing": {
"baseline": "1.6.0",

5
versions/j-/jsonnet.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d44312d784436a66ae779d4b644aa29e3ebe23e8",
"version": "0.18.0",
"port-version": 1
},
{
"git-tree": "1ac55d2bf1f121bd14e748bbf55569a49a9015d9",
"version": "0.18.0",

5
versions/o-/opentelemetry-cpp.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "49b229180a92d7c0148fd1c28a691a76c59aea51",
"version-semver": "1.5.0",
"port-version": 1
},
{
"git-tree": "6ec3fad654735c88e146be395fd84629c209de6e",
"version-semver": "1.5.0",