Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpiutil] Remove remnants of ghc fs and tcb_span libraries (#5411)

Browse Source
This commit is contained in:
Ryan Blue
2023-06-22 22:42:44 -04:00
committed by GitHub
parent 90602cc135
commit 1fca519fb4
4 changed files with 7 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/build.gradle
View File

@@ -67,9 +67,6 @@ doxygen {
cppIncludeRoots << '../ntcore/build/generated/main/native/include/'
if (project.hasProperty('docWarningsAsErrors')) {
// C++20 shims
exclude 'wpi/ghc/filesystem.hpp'
// Drake
exclude 'drake/common/**'

5
wpiutil/CMakeLists.txt
View File

@@ -146,11 +146,6 @@ target_include_directories(wpiutil PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/memory/include>
$<INSTALL_INTERFACE:${include_dest}/wpiutil>)
install(DIRECTORY src/main/native/thirdparty/ghc/include/ DESTINATION "${include_dest}/wpiutil")
target_include_directories(wpiutil PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/ghc/include>
$<INSTALL_INTERFACE:${include_dest}/wpiutil>)
install(DIRECTORY src/main/native/thirdparty/json/include/ DESTINATION "${include_dest}/wpiutil")
target_include_directories(wpiutil PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/json/include>

30
wpiutil/build.gradle
View File

@@ -26,18 +26,13 @@ ext {
srcDirs 'src/main/native/thirdparty/fmtlib/include'
}
}
ghcCpp(CppSourceSet) {
exportedHeaders {
srcDirs 'src/main/native/thirdparty/ghc/include'
}
}
jsonCpp(CppSourceSet) {
source {
srcDirs 'src/main/native/thirdparty/json/cpp'
include '*.cpp'
}
exportedHeaders {
srcDirs 'src/main/native/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/fmtlib/include'
srcDirs 'src/main/native/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/fmtlib/include'
}
}
llvmCpp(CppSourceSet) {
@@ -46,7 +41,7 @@ ext {
include '**/*.cpp'
}
exportedHeaders {
srcDirs 'src/main/native/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/ghc/include'
srcDirs 'src/main/native/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include'
}
}
mpackCpp(CppSourceSet) {
@@ -67,11 +62,6 @@ ext {
srcDirs 'src/main/native/thirdparty/sigslot/include'
}
}
tcbSpanCpp(CppSourceSet) {
exportedHeaders {
srcDirs 'src/main/native/thirdparty/tcb_span/include'
}
}
memoryCpp(CppSourceSet) {
source {
srcDirs 'src/main/native/thirdparty/memory/src', 'src/main/native/thirdparty/memory/include/wpi/memory'
@@ -101,7 +91,7 @@ ext {
include '**/*.cpp'
}
exportedHeaders {
srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/mpack/include'
srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/mpack/include'
include '**/*.h'
}
}
@@ -115,7 +105,7 @@ ext {
include '**/*.cpp'
}
exportedHeaders {
srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/mpack/include'
srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/mpack/include'
include '**/*.h'
}
}
@@ -128,7 +118,7 @@ ext {
include '**/*.cpp'
}
exportedHeaders {
srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/mpack/include'
srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/mpack/include'
include '**/*.h'
}
}
@@ -141,7 +131,7 @@ ext {
include '**/*.cpp'
}
exportedHeaders {
srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/mpack/include'
srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/mpack/include'
include '**/*.h'
}
}
@@ -184,9 +174,6 @@ cppHeadersZip {
from('src/main/native/thirdparty/fmtlib/include') {
into '/'
}
from('src/main/native/thirdparty/ghc/include') {
into '/'
}
from('src/main/native/thirdparty/json/include') {
into '/'
}
@@ -199,9 +186,6 @@ cppHeadersZip {
from('src/main/native/thirdparty/sigslot/include') {
into '/'
}
from('src/main/native/thirdparty/tcb_span/include') {
into '/'
}
from('src/main/native/thirdparty/memory/include') {
into '/'
}
@@ -233,7 +217,7 @@ model {
all {
it.sources.each {
it.exportedHeaders {
srcDirs 'src/main/native/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/ghc/include', 'src/main/native/thirdparty/memory/include', 'src/main/native/thirdparty/mpack/include'
srcDirs 'src/main/native/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/memory/include', 'src/main/native/thirdparty/mpack/include'
}
}
}

20
wpiutil/src/main/native/cpp/fs.cpp
View File

@@ -43,26 +43,6 @@
#endif // _WIN32
#if defined(__APPLE__)
#include <Availability.h>
#endif
#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) \
|| (defined(__cplusplus) && __cplusplus >= 201703L)) \
&& defined(__has_include)
#if __has_include(<filesystem>) \
&& (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) \
|| __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) \
&& (defined(__clang__) || !defined(__GNUC__) || __GNUC__ >= 10 \
|| (__GNUC__ >= 9 && __GNUC_MINOR__ >= 1))
#define GHC_USE_STD_FS
#endif
#endif
#ifndef GHC_USE_STD_FS
// #define GHC_WIN_DISABLE_WSTRING_STORAGE_TYPE
#define GHC_FILESYSTEM_IMPLEMENTATION
#include "wpi/ghc/filesystem.hpp"
#endif
#include "wpi/Errno.h"
#include "wpi/ErrorHandling.h"
#include "wpi/WindowsError.h"