Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[many ports] Remove from CI baseline #25075

Merged
merged 42 commits into from
Jun 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
70da1e0
cppcms
Thomas1664 Jun 5, 2022
d028b72
cudnn
Thomas1664 Jun 5, 2022
4992e48
devicenameresolver
Thomas1664 Jun 5, 2022
19e736a
epsilon
Thomas1664 Jun 5, 2022
51ed0ef
fann
Thomas1664 Jun 5, 2022
70fda77
cudnn license
Thomas1664 Jun 5, 2022
b47d88e
devicenameresolver version
Thomas1664 Jun 5, 2022
51e6c5f
epsilon
Thomas1664 Jun 5, 2022
8f52be3
version
Thomas1664 Jun 5, 2022
b7430cd
Remove from ci baseline
Thomas1664 Jun 5, 2022
febbf22
license
Thomas1664 Jun 5, 2022
6ba5262
version
Thomas1664 Jun 5, 2022
2e46d27
libbf
Thomas1664 Jun 5, 2022
2187b51
version
Thomas1664 Jun 5, 2022
b902665
Why are those ports unsupported on static? I think because of failing…
Thomas1664 Jun 5, 2022
b3b2302
version
Thomas1664 Jun 5, 2022
5b2152d
cppcms
Thomas1664 Jun 5, 2022
6faa412
version
Thomas1664 Jun 5, 2022
d24c2ca
epsilon
Thomas1664 Jun 5, 2022
4f8c498
version
Thomas1664 Jun 5, 2022
fec69f5
typo
Thomas1664 Jun 5, 2022
35cc225
version
Thomas1664 Jun 5, 2022
dca8cd2
test on static
Thomas1664 Jun 5, 2022
1ad05cc
version
Thomas1664 Jun 5, 2022
f87ca26
cppcms not supported on static
Thomas1664 Jun 5, 2022
454e3b9
version
Thomas1664 Jun 5, 2022
a186012
cudnn
Thomas1664 Jun 5, 2022
ed73777
device
Thomas1664 Jun 5, 2022
beb23c7
version
Thomas1664 Jun 5, 2022
049a40a
try again...
Thomas1664 Jun 5, 2022
2a9fb61
version
Thomas1664 Jun 5, 2022
6713f67
version-date
Thomas1664 Jun 6, 2022
bb111a3
version
Thomas1664 Jun 6, 2022
fee6db8
[cppcms] Patch out tests & examples
Thomas1664 Jun 8, 2022
d7499f3
version
Thomas1664 Jun 8, 2022
6e0db25
Fix patch
Thomas1664 Jun 8, 2022
9459a0e
version
Thomas1664 Jun 8, 2022
97b0784
remove debug include
Thomas1664 Jun 8, 2022
c2627a2
version
Thomas1664 Jun 8, 2022
081ab67
[cppcms] copy pdbs
Thomas1664 Jun 15, 2022
63badfa
version
Thomas1664 Jun 15, 2022
5cb1bb3
Merge branch 'master' of https://github.com/microsoft/vcpkg into upda…
Thomas1664 Jun 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions ports/cppcms/no-tests-and-examples.patch
Original file line number Diff line number Diff line change
@@ -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()

23 changes: 13 additions & 10 deletions ports/cppcms/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Thomas1664 marked this conversation as resolved.
Show resolved Hide resolved
vcpkg_copy_pdbs()

vcpkg_copy_tools(TOOL_NAMES cppcms_scale cppcms_make_key cppcms_config_find_param AUTO_CLEAN)

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})
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

file(INSTALL ${SOURCE_PATH}/MIT.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/MIT.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
11 changes: 8 additions & 3 deletions ports/cppcms/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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"
]
}
18 changes: 4 additions & 14 deletions ports/cudnn/portfile.cmake
Original file line number Diff line number Diff line change
@@ -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()
Thomas1664 marked this conversation as resolved.
Show resolved Hide resolved

vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved

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
Expand Down Expand Up @@ -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}")
2 changes: 1 addition & 1 deletion ports/cudnn/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 0 additions & 2 deletions ports/devicenameresolver/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)

vcpkg_from_bitbucket(
OUT_SOURCE_PATH SOURCE_PATH
REPO mrexodia/devicenameresolver
Expand Down
5 changes: 3 additions & 2 deletions ports/devicenameresolver/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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": [
{
Expand Down
13 changes: 9 additions & 4 deletions ports/epsilon/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)

vcpkg_from_sourceforge(
OUT_SOURCE_PATH SOURCE_PATH
REPO epsilon-project/epsilon
Expand Down Expand Up @@ -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")
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved

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)
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
5 changes: 3 additions & 2 deletions ports/epsilon/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
22 changes: 11 additions & 11 deletions ports/fann/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Official design
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libfann/fann
Expand All @@ -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
Expand Down Expand Up @@ -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")

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)
file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
11 changes: 9 additions & 2 deletions ports/fann/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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
}
]
}
17 changes: 5 additions & 12 deletions ports/libbf/portfile.cmake
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
14 changes: 11 additions & 3 deletions ports/libbf/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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
}
]
}
18 changes: 0 additions & 18 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know why UWP fails

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it is a fail, it is still build by daily CI, so you can get the error log from there.

fann:x64-windows-static=fail
fastrtps:arm-uwp=fail
fastrtps:x64-uwp=fail
fastrtps:x64-windows-static=fail
Expand Down Expand Up @@ -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
Expand Down
Loading