diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index 18163b2cbb..3eaf7b9988 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -41,9 +41,6 @@ Team 254 Library wpilibj/src/main/java/edu/wpi/first/wpilibj/spline/SplineP wpilibc/src/main/native/include/trajectory/TrajectoryParameterizer.h wpilibc/src/main/native/cpp/trajectory/TrajectoryParameterizer.cpp Portable File Dialogs wpigui/src/main/native/include/portable-file-dialogs.h -Drake wpimath/src/main/native/thirdparty/drake/ - wpimath/src/test/native/cpp/drake/ - wpimath/src/test/native/include/drake/ V8 export-template wpiutil/src/main/native/include/wpi/SymbolExports.h GCEM wpimath/src/main/native/thirdparty/gcem/include/ @@ -1069,41 +1066,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -============= -Drake Library -============= -All components of Drake are licensed under the BSD 3-Clause License -shown below. Where noted in the source code, some portions may -be subject to other permissive, non-viral licenses. - -Copyright 2012-2016 Robot Locomotion Group @ CSAIL -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. Redistributions -in binary form must reproduce the above copyright notice, this list of -conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. Neither the name of -the Massachusetts Institute of Technology nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ===================== Portable File Dialogs ===================== diff --git a/docs/build.gradle b/docs/build.gradle index ac7a9e0afa..5ac88ac9bc 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -67,9 +67,6 @@ doxygen { cppIncludeRoots << '../ntcore/build/generated/main/native/include/' if (project.hasProperty('docWarningsAsErrors')) { - // Drake - exclude 'drake/common/**' - // Eigen exclude 'Eigen/**' exclude 'unsupported/**' diff --git a/wpimath/CMakeLists.txt b/wpimath/CMakeLists.txt index e3d90cd4c1..4500879b19 100644 --- a/wpimath/CMakeLists.txt +++ b/wpimath/CMakeLists.txt @@ -89,8 +89,7 @@ if (WITH_JAVA) endif() -file(GLOB_RECURSE wpimath_native_src src/main/native/cpp/*.cpp - src/main/native/thirdparty/drake/src/*.cpp) +file(GLOB_RECURSE wpimath_native_src src/main/native/cpp/*.cpp) list(REMOVE_ITEM wpimath_native_src ${wpimath_jni_src}) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS FALSE) @@ -118,10 +117,6 @@ else() target_link_libraries (wpimath Eigen3::Eigen) endif() -install(DIRECTORY src/main/native/thirdparty/drake/include/ DESTINATION "${include_dest}/wpimath") -target_include_directories(wpimath SYSTEM PUBLIC - $) - install(DIRECTORY src/main/native/thirdparty/gcem/include/ DESTINATION "${include_dest}/wpimath") target_include_directories(wpimath SYSTEM PUBLIC $) diff --git a/wpimath/build.gradle b/wpimath/build.gradle index 1c16f70cb6..c604dd1644 100644 --- a/wpimath/build.gradle +++ b/wpimath/build.gradle @@ -9,30 +9,11 @@ ext { nativeName = 'wpimath' devMain = 'edu.wpi.first.math.DevMain' - - splitSetup = { - it.sources { - drakeCpp(CppSourceSet) { - source { - srcDirs 'src/main/native/thirdparty/drake/src' - include '**/*.cpp' - } - exportedHeaders { - srcDirs 'src/main/native/thirdparty/drake/include', - 'src/main/native/thirdparty/eigen/include', - 'src/main/native/thirdparty/gcem/include' - } - } - } - } } apply from: "${rootDir}/shared/jni/setupBuild.gradle" cppHeadersZip { - from('src/main/native/thirdparty/drake/include') { - into '/' - } from('src/main/native/thirdparty/eigen/include') { into '/' } @@ -47,7 +28,6 @@ model { it.sources.each { it.exportedHeaders { srcDirs 'src/main/native/include', - 'src/main/native/thirdparty/drake/include', 'src/main/native/thirdparty/eigen/include', 'src/main/native/thirdparty/gcem/include' } diff --git a/wpimath/src/test/native/cpp/estimator/MerweScaledSigmaPointsTest.cpp b/wpimath/src/test/native/cpp/estimator/MerweScaledSigmaPointsTest.cpp index 19a734b581..4471dc946c 100644 --- a/wpimath/src/test/native/cpp/estimator/MerweScaledSigmaPointsTest.cpp +++ b/wpimath/src/test/native/cpp/estimator/MerweScaledSigmaPointsTest.cpp @@ -6,8 +6,6 @@ #include "frc/estimator/MerweScaledSigmaPoints.h" -namespace drake::math { -namespace { TEST(MerweScaledSigmaPointsTest, ZeroMean) { frc::MerweScaledSigmaPoints<2> sigmaPoints; auto points = sigmaPoints.SquareRootSigmaPoints( @@ -30,5 +28,3 @@ TEST(MerweScaledSigmaPointsTest, NonzeroMean) { {2.0, 2.0, 2.00548, 2.0, 1.99452}}) .norm() < 1e-3); } -} // namespace -} // namespace drake::math