[wpilib] Update to 2020.3.2 (#12373)

* Update wpilib port to 2020.3.2

Latest 2020 release

* Fix review comments

2 files changed, 27 insertions, 32 deletions

diff --git a/ports/wpilib/CONTROL b/ports/wpilib/CONTROL
index deef611ea..913521505 100644
--- a/ports/wpilib/CONTROL
+++ b/ports/wpilib/CONTROL
@@ -1,8 +1,9 @@
 Source: wpilib

-Version: 2020.1.1

+Version: 2020.3.2

 Homepage: https://github.com/wpilibsuite/allwpilib

 Build-Depends: eigen3, libuv

 Description: WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library.

+Supports: !osx

 

 Feature: cameraserver

 Build-Depends: opencv

diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake
index 15041d84b..cbe4051f7 100644
--- a/ports/wpilib/portfile.cmake
+++ b/ports/wpilib/portfile.cmake
@@ -3,30 +3,23 @@ vcpkg_fail_port_install(ON_TARGET "OSX")
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO wpilibsuite/allwpilib

-    REF e874ba9313a8243aa18eefb13e1d88a3999dd80e

-    SHA512 9a2e7abb3739008ed59e716d241a4ec8f0848c655ae8bb7e5bd98090109d6d86115c97ef16ea8881cc28715b691d873ab7be77b515efed8c361cb1f47745697f

+    REF 35eb90c135eba994a2ca2cbd50a68c367910f4b6

+    SHA512 55bc608632ab67c097f3cce7c5ad9790b2b123a633c93bf5b4008f90bf79538cc142c911850d5f49b75e3a12f43ffad9f6f5f9bcdf1351cce7513ecc4b04e439

 )

 

-set(WITHOUT_JAVA ON)

-set(WITHOUT_CSCORE ON)

-set(WITHOUT_ALLWPILIB ON)

-

-if ("cameraserver" IN_LIST FEATURES)

-  set(WITHOUT_CSCORE OFF)

-endif()

-

-if ("allwpilib" IN_LIST FEATURES)

-  set(WITHOUT_ALLWPILIB OFF)

-endif()

+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

+  INVERTED_FEATURES

+    cameraserver WITHOUT_CSCORE

+    allwpilib WITHOUT_ALLWPILIB

+)

 

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

     PREFER_NINJA

 

     OPTIONS

-      -DWITHOUT_JAVA=${WITHOUT_JAVA}

-      -DWITHOUT_CSCORE=${WITHOUT_CSCORE}

-      -DWITHOUT_ALLWPILIB=${WITHOUT_ALLWPILIB}

+      -DWITHOUT_JAVA=ON

+      ${FEATURE_OPTIONS}

       -DUSE_VCPKG_LIBUV=ON

       -DUSE_VCPKG_EIGEN=ON

       -DFLAT_INSTALL_WPILIB=ON

@@ -35,26 +28,27 @@ vcpkg_install_cmake()
 

 file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/ntcore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)

 file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/wpiutil/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)

-if (NOT WITHOUT_ALLWPILIB)

-file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/wpilibc/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)

-file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/hal/gen/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)

-file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/hal/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/gen)

+

+if ("allwpilib" IN_LIST FEATURES)

+    file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/wpilibc/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)

+    file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/hal/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)

+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/gen)

 endif()

-if (NOT WITHOUT_CSCORE)

-file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cameraserver/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)

-file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cscore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)

+

+if ("cameraserver" IN_LIST FEATURES)

+    file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cameraserver/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)

+    file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cscore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)

 endif()

 

 if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")

-  file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll")

-  file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll")

+    file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll")

+    file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll")

 

-  file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.so")

-  file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.so")

+    file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.so")

+    file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.so")

 

-  file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dylib")

-  file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dylib")

+    file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dylib")

+    file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dylib")

 endif()

 

 file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib")

@@ -65,4 +59,4 @@ file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAG
 

 vcpkg_copy_pdbs()

 

-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wpilib RENAME copyright)

+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)