[many ports] Remove from CI baseline (#25075)

* cppcms

* cudnn

* devicenameresolver

* epsilon

* fann

* cudnn license

* devicenameresolver version

* epsilon

* version

* Remove from ci baseline

* license

* version

* libbf

* version

* Why are those ports unsupported on static? I think because of failing post build lint

* version

* cppcms

* version

* epsilon

* version

* typo

* version

* test on static

* version

* cppcms not supported on static

* version

* cudnn

* device

* version

* try again...

* version

* version-date

* version

* [cppcms] Patch out tests & examples

* version

* Fix patch

* version

* remove debug include

* version

* [cppcms] copy pdbs

* version
This commit is contained in:
Thomas1664 2022-06-18 00:48:09 +02:00 коммит произвёл GitHub
Родитель 92136965ac
Коммит b49b2bdf22
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
21 изменённых файлов: 172 добавлений и 91 удалений

Просмотреть файл

@ -0,0 +1,58 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ce0d53..5b432c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -685,9 +685,10 @@ if(NOT DISABLE_SHARED)
endif(NOT DISABLE_SHARED)
-
+if(FALSE)
add_executable(hello_world src/hello_world.cpp skin1.cpp skin2.cpp)
target_link_libraries(hello_world ${CPPCMS_LIB})
+endif()
if(NOT DISABLE_TCPCACHE)
add_executable(cppcms_scale src/cache_server_main.cpp)
@@ -710,7 +711,7 @@ endif(DISABLE_SHARED)
#########################################
# Tests
#########################################
-
+if(FALSE)
set(ALL_TESTS
form_test
proto_test
@@ -775,14 +776,14 @@ set(ALL_TESTS ${ALL_TESTS} external_session_test)
if(NOT DISABLE_GZIP)
target_link_libraries(response_test ${ZLIB})
endif()
-
+endif()
#####################################
# End of tests
#####################################
# These are use export
if(IS_WINDOWS AND NOT DISABLE_SHARED)
- set_target_properties(${ALL_TESTS} hello_world cppcms PROPERTIES
+ set_target_properties(${ALL_TESTS} cppcms PROPERTIES
COMPILE_DEFINITIONS DLL_EXPORT)
endif()
@@ -830,7 +831,7 @@ install(DIRECTORY cppcms DESTINATION include
#############
-
+if(FALSE)
set(CNF "${CMAKE_CURRENT_SOURCE_DIR}/tests")
add_test(base64_test base64_test)
@@ -1103,5 +1104,5 @@ if(NOT IS_WINDOWS)
PROPERTIES TIMEOUT 120)
endif()
-
+endif()

Просмотреть файл

@ -5,24 +5,27 @@ vcpkg_from_github(
REPO artyom-beilis/cppcms
REF b72b19915794d1af63c9a9e9bea58e20a4ad93d4
SHA512 e99d34d14fbde22be725ac2c0bec069fb584e45c66767af75efaf454ca61a7a5e57434bf86109f910884c72202b8cf98fe16505e7d3d30d9218abd4d8b27d5df
PATCHES
no-tests-and-examples.patch
)
vcpkg_find_acquire_program(PYTHON2)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DISABLE_DYNAMIC)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DPYTHON=${PYTHON2} # Switch to python3 on the next update
-DUSE_WINDOWS6_API=ON
-DDISABLE_SHARED=${DISABLE_DYNAMIC}
)
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
file(GLOB EXE_DEBUG_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
file(REMOVE ${EXE_DEBUG_FILES})
file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
file(REMOVE ${EXE_FILES})
vcpkg_copy_tools(TOOL_NAMES cppcms_scale cppcms_make_key cppcms_config_find_param AUTO_CLEAN)
file(INSTALL ${SOURCE_PATH}/MIT.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${SOURCE_PATH}/MIT.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

Просмотреть файл

@ -1,14 +1,19 @@
{
"name": "cppcms",
"version-string": "1.2.1",
"port-version": 4,
"version": "1.2.1",
"port-version": 5,
"description": "CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development",
"homepage": "https://github.com/artyom-beilis/cppcms",
"supports": "!(linux | osx)",
"license": "MIT",
"supports": "!(linux | osx | (windows & static))",
"dependencies": [
"icu",
"openssl",
"pcre",
{
"name": "vcpkg-cmake",
"host": true
},
"zlib"
]
}

Просмотреть файл

@ -1,16 +1,6 @@
if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX)
message(FATAL_ERROR "This port is only for Windows Desktop or Linux")
endif()
if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
message(FATAL_ERROR "This port is only for x64 architectures")
endif()
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
set(MINIMUM_CUDNN_VERSION "7.6.5")
include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake)
include("${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake")
vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT OUT_CUDA_VERSION CUDA_VERSION)
# Try to find CUDNN if it exists; only download if it doesn't exist
@ -71,6 +61,6 @@ else()
message(FATAL_ERROR "Please install CUDNN using your system package manager (the same way you installed CUDA). For example: apt install libcudnn8-dev.")
endif()
file(INSTALL "${CURRENT_PORT_DIR}/FindCUDNN.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL "${CURRENT_PORT_DIR}/FindCUDNN.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

Просмотреть файл

@ -1,7 +1,7 @@
{
"name": "cudnn",
"version": "7.6.5",
"port-version": 6,
"port-version": 7,
"description": "NVIDIA's cuDNN deep neural network acceleration library.",
"homepage": "https://developer.nvidia.com/cudnn",
"license": null,

Просмотреть файл

@ -1,5 +1,3 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_bitbucket(
OUT_SOURCE_PATH SOURCE_PATH
REPO mrexodia/devicenameresolver

Просмотреть файл

@ -1,8 +1,9 @@
{
"name": "devicenameresolver",
"version-string": "2016-06-26-0850d88fa6",
"port-version": 3,
"version-date": "2016-06-26",
"port-version": 4,
"description": "a little library that resolves a path from a (virtual) device name.",
"license": null,
"supports": "windows & !uwp",
"dependencies": [
{

Просмотреть файл

@ -1,5 +1,3 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_sourceforge(
OUT_SOURCE_PATH SOURCE_PATH
REPO epsilon-project/epsilon
@ -43,6 +41,13 @@ vcpkg_install_nmake(
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_copy_tools(TOOL_NAMES epsilon SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools")
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

Просмотреть файл

@ -1,9 +1,10 @@
{
"name": "epsilon",
"version-string": "0.9.2",
"port-version": 6,
"version": "0.9.2",
"port-version": 7,
"description": "EPSILON is an Open Source wavelet image compressor, that is aimed on parallel and robust image processing.",
"homepage": "https://sourceforge.net/projects/epsilon-project/",
"license": "GPL-2.0-only OR LGPL-2.0-only",
"supports": "windows",
"dependencies": [
"libpopt"

Просмотреть файл

@ -1,6 +1,3 @@
# Official design
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libfann/fann
@ -12,12 +9,11 @@ vcpkg_from_github(
fix-uwp-build.patch
)
set(INSTALL_BASE_DIR_DBG ${CURRENT_PACKAGES_DIR}/debug)
set(INSTALL_BASE_DIR_REL ${CURRENT_PACKAGES_DIR})
set(INSTALL_BASE_DIR_DBG "${CURRENT_PACKAGES_DIR}/debug")
set(INSTALL_BASE_DIR_REL "${CURRENT_PACKAGES_DIR}")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS_DEBUG
-DBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/bin
-DSBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/sbin
@ -50,12 +46,16 @@ vcpkg_configure_cmake(
-DINFO_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/info
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

Просмотреть файл

@ -1,7 +1,14 @@
{
"name": "fann",
"version": "2.2.0",
"port-version": 2,
"port-version": 3,
"description": "Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks.",
"homepage": "https://github.com/libfann/fann"
"homepage": "https://github.com/libfann/fann",
"license": "LGPL-2.1-only",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
}
]
}

Просмотреть файл

@ -1,7 +1,3 @@
if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
message(FATAL_ERROR "libbf does not support MSVC")
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mavam/libbf
@ -10,16 +6,13 @@ vcpkg_from_github(
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libbf)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbf/COPYING ${CURRENT_PACKAGES_DIR}/share/libbf/copyright)
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

Просмотреть файл

@ -1,6 +1,14 @@
{
"name": "libbf",
"version-string": "1.0.0",
"port-version": 2,
"description": "Bloom filters for C++11."
"version": "1.0.0",
"port-version": 3,
"description": "Bloom filters for C++11.",
"license": "BSD-3-Clause",
"supports": "!windows",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
}
]
}

Просмотреть файл

@ -159,9 +159,6 @@ coolprop:x64-uwp=fail
coroutine:arm-uwp=fail
coroutine:x64-linux=fail
coroutine:x64-uwp=fail
cppcms:x64-linux=fail
cppcms:x64-osx=fail
cppcms:x64-windows-static=fail
cppfs:arm-uwp=fail
cppfs:x64-uwp=fail
cppmicroservices:arm64-windows=fail
@ -181,11 +178,6 @@ crashpad:x86-windows=fail
ctemplate:x64-linux=fail
ctemplate:x64-osx=fail
cuda:x64-osx=fail
cudnn:arm64-windows=fail
cudnn:arm-uwp=fail
cudnn:x64-uwp=fail
cudnn:x64-windows-static=fail
cudnn:x86-windows=fail
# Since pipeline cannot automatically install dbghelp dependency, skip this detection
dbghelp:arm-uwp=skip
dbghelp:arm64-windows=skip
@ -197,7 +189,6 @@ dbghelp:x64-windows-static-md=skip
dbghelp:x64-windows=skip
dbghelp:x86-windows=skip
dcmtk:x64-uwp=fail
devicenameresolver:x64-windows-static=fail
# legacy directxsdk which conflicts with dxsdk-d3dx
directxsdk:x86-windows=skip
directxsdk:x64-windows=skip
@ -247,8 +238,6 @@ embree2:x64-linux=skip
embree2:x64-osx=skip
epsilon:arm-uwp=fail
epsilon:x64-uwp=fail
epsilon:x64-windows-static=fail
fann:x64-windows-static=fail
fastrtps:arm-uwp=fail
fastrtps:x64-uwp=fail
fastrtps:x64-windows-static=fail
@ -422,13 +411,6 @@ leveldb:arm-uwp=fail
leveldb:x64-uwp=fail
libaiff:x64-linux=fail
libarchive:arm-uwp=fail
libbf:arm64-windows=fail
libbf:arm-uwp=fail
libbf:x64-uwp=fail
libbf:x64-windows=fail
libbf:x64-windows-static=fail
libbf:x64-windows-static-md=fail
libbf:x86-windows=fail
libcopp:arm64-windows=fail
libcopp:arm-uwp=fail
# Missing system libraries on linux to run/prepare autoconf

Просмотреть файл

@ -1610,7 +1610,7 @@
},
"cppcms": {
"baseline": "1.2.1",
"port-version": 4
"port-version": 5
},
"cppcodec": {
"baseline": "0.2",
@ -1750,7 +1750,7 @@
},
"cudnn": {
"baseline": "7.6.5",
"port-version": 6
"port-version": 7
},
"cunit": {
"baseline": "2.1.3",
@ -1861,8 +1861,8 @@
"port-version": 5
},
"devicenameresolver": {
"baseline": "2016-06-26-0850d88fa6",
"port-version": 3
"baseline": "2016-06-26",
"port-version": 4
},
"devil": {
"baseline": "1.8.0",
@ -2106,7 +2106,7 @@
},
"epsilon": {
"baseline": "0.9.2",
"port-version": 6
"port-version": 7
},
"esaxx": {
"baseline": "ca7cb332011ec37",
@ -2162,7 +2162,7 @@
},
"fann": {
"baseline": "2.2.0",
"port-version": 2
"port-version": 3
},
"farmhash": {
"baseline": "1.1",
@ -3462,7 +3462,7 @@
},
"libbf": {
"baseline": "1.0.0",
"port-version": 2
"port-version": 3
},
"libbson": {
"baseline": "1.17.6",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "33ff6dbb307c2baceec0a21f05e098c0d15a8f88",
"version": "1.2.1",
"port-version": 5
},
{
"git-tree": "05ef150cab0e8f56bd4f06b41baa9125d94e3451",
"version-string": "1.2.1",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cfd70db6f58e45dc96c44a61833d821d987c1588",
"version": "7.6.5",
"port-version": 7
},
{
"git-tree": "aa008ef1b1c958146532dbbdabd76b62f9558653",
"version": "7.6.5",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bb4e35f532b95841344719e4ab90027a2796d5d4",
"version-date": "2016-06-26",
"port-version": 4
},
{
"git-tree": "a87ff3bcc7e455cf7b73ca36ff4e7ac0c54faba1",
"version-string": "2016-06-26-0850d88fa6",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "800dbc074727df7eded3e5707b828be676bb5943",
"version": "0.9.2",
"port-version": 7
},
{
"git-tree": "ad0883f9e090b404fcef27b3e4304df44472bf90",
"version-string": "0.9.2",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "05d4d344a7295f604f3cf541a9d92b9a680fd830",
"version": "2.2.0",
"port-version": 3
},
{
"git-tree": "9bff6da1b7043e1ab6e344c549a285b7101763e2",
"version": "2.2.0",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3c699adb88cb4cf15b0fb52cb9e506bc91672bf2",
"version": "1.0.0",
"port-version": 3
},
{
"git-tree": "b44ae45673f953a9aa87a1df8bdc04c6a4201aef",
"version-string": "1.0.0",