[behaviortree-cpp] Update to 4.1.1 (#31287)

* update behaviortree-cpp * update version --------- Co-authored-by: Monica <[email protected]>
microsoft · May 11, 2023 · 3256b18 · 3256b18
1 parent 35ffca6
commit 3256b18
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 68 deletions.
diff --git a/ports/behaviortree-cpp/001_port_fixes.patch b/ports/behaviortree-cpp/001_port_fixes.patch
diff --git a/ports/behaviortree-cpp/002_fix_dependencies.patch b/ports/behaviortree-cpp/002_fix_dependencies.patch
diff --git a/ports/behaviortree-cpp/fix-x86_build.patch b/ports/behaviortree-cpp/fix-x86_build.patch
@@ -0,0 +1,35 @@
+diff --git a/3rdparty/lexy/include/lexy/_detail/swar.hpp b/3rdparty/lexy/include/lexy/_detail/swar.hpp
+index a268abb..d31bdaa 100644
+--- a/3rdparty/lexy/include/lexy/_detail/swar.hpp
++++ b/3rdparty/lexy/include/lexy/_detail/swar.hpp
+@@ -141,8 +141,13 @@ constexpr std::size_t swar_find_difference(swar_int lhs, swar_int rhs)
+     auto bit_idx = __builtin_ctzll(mask);
+ #elif defined(_MSC_VER)
+     unsigned long bit_idx;
+-    if (!_BitScanForward64(&bit_idx, mask))
+-        bit_idx         = 64;
++    #if defined(_WIN64)
++        if (!_BitScanForward64(&bit_idx, mask))
++            bit_idx         = 64;
++    #elif defined(_WIN32)
++        if (!_BitScanForward(&bit_idx, mask))
++            bit_idx         = 32;
++    #endif
+ #else
+ #    error "unsupported compiler; please file an issue"
+ #endif
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 295b317..0f1cd5c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -154,6 +154,10 @@ else()
+     add_library(${BTCPP_LIBRARY} STATIC ${BT_SOURCE})
+ endif()
+
++if (MSVC)
++    target_compile_definitions(${BTCPP_LIBRARY} PRIVATE NOMINMAX)
++endif ()
++
+ message(STATUS "BTCPP_EXTRA_LIBRARIES: ${BTCPP_EXTRA_LIBRARIES}")
+
+ target_link_libraries(${BTCPP_LIBRARY}
diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake
@@ -1,37 +1,38 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/BehaviorTree/BehaviorTree.CPP/archive/3.5.6.tar.gz"
-    FILENAME "BehaviorTree.CPP.3.5.6.tar.gz"
-    SHA512 cd3b15eb7c5bab68239b697da166220b4df8dd7e6cf5e831f316d411e24be56c9ed74e54a3e3dd332164d740159eaf9ce62d005601fd65133809dab29430c9b7
+    URLS "https://github.com/BehaviorTree/BehaviorTree.CPP/archive/${VERSION}.tar.gz"
+    FILENAME "BehaviorTree.CPP.${VERSION}.tar.gz"
+    SHA512 4505c4c8798ccbbc02f58320810eb86e791fb6ef57d8c85882e62bd2b509b41e0549dc311ed61926a873b5b956eda979efda488f01d00746e1e8db559f60253c
 )
 
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     PATCHES
-        001_port_fixes.patch
-        002_fix_dependencies.patch
+        fix-x86_build.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DCMAKE_DISABLE_FIND_PACKAGE_ament_cmake=1
         -DCMAKE_DISABLE_FIND_PACKAGE_Curses=1
-        -DBUILD_EXAMPLES=OFF
-        -DBUILD_UNIT_TESTS=OFF
-        -DBUILD_TOOLS=OFF
+        -DBTCPP_EXAMPLES=OFF
+        -DBTCPP_UNIT_TESTS=OFF
+        -DBTCPP_BUILD_TOOLS=OFF
+        -DBTCPP_GROOT_INTERFACE=OFF
+        -DBTCPP_SQLITE_LOGGING=OFF
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_DISABLE_FIND_PACKAGE_Curses
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/BehaviorTreeV3/cmake PACKAGE_NAME behaviortreev3)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/behaviortree_cpp PACKAGE_NAME behaviortree_cpp)
 vcpkg_copy_pdbs()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
-file(REMOVE_RECURSE
-    "${CURRENT_PACKAGES_DIR}/debug/include"
-    "${CURRENT_PACKAGES_DIR}/lib/BehaviorTreeV3"
-    "${CURRENT_PACKAGES_DIR}/debug/lib/BehaviorTreeV3"
-)
+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()
diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "behaviortree-cpp",
-  "version": "3.5.6",
-  "port-version": 3,
+  "version": "4.1.1",
   "description": "Behavior Trees Library in C++.",
   "homepage": "https://www.behaviortree.dev",
   "supports": "!uwp",

diff --git a/versions/b-/behaviortree-cpp.json b/versions/b-/behaviortree-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "66a97129b31a5e70e45a40c767ea96b1e0477a93",
+      "version": "4.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "7518e59f9f1e994e3af289b8de87115834dcb758",
       "version": "3.5.6",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -501,8 +501,8 @@
       "port-version": 2
     },
     "behaviortree-cpp": {
-      "baseline": "3.5.6",
-      "port-version": 3
+      "baseline": "4.1.1",
+      "port-version": 0
     },
     "benchmark": {
       "baseline": "1.8.0",