From 91e96f3ecf4bf31c084b3eecb3808f9fa977997a Mon Sep 17 00:00:00 2001 From: seanyen Date: Wed, 5 Aug 2020 15:20:44 -0700 Subject: [PATCH 01/11] adding behaviortree-cpp. --- ports/behaviortree-cpp/001_port_fixes.patch | 13 ++++++ ports/behaviortree-cpp/portfile.cmake | 47 +++++++++++++++++++++ ports/behaviortree-cpp/vcpkg.json | 6 +++ 3 files changed, 66 insertions(+) create mode 100644 ports/behaviortree-cpp/001_port_fixes.patch create mode 100644 ports/behaviortree-cpp/portfile.cmake create mode 100644 ports/behaviortree-cpp/vcpkg.json diff --git a/ports/behaviortree-cpp/001_port_fixes.patch b/ports/behaviortree-cpp/001_port_fixes.patch new file mode 100644 index 00000000000000..d78cd4d38b0e77 --- /dev/null +++ b/ports/behaviortree-cpp/001_port_fixes.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 75dea11..4eea781 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -229,7 +229,7 @@ if( ZMQ_FOUND ) + endif() + + if(MSVC) +- target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W4 /WX) ++ target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W4 /WX /wd4702) + else() + target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE + -Wall -Wextra -Werror=return-type) diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake new file mode 100644 index 00000000000000..2141fc2e205f30 --- /dev/null +++ b/ports/behaviortree-cpp/portfile.cmake @@ -0,0 +1,47 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/BehaviorTree/BehaviorTree.CPP/archive/3.5.1.tar.gz" + FILENAME "BehaviorTree.CPP.3.5.1.tar.gz" + SHA512 66db43225e692fa0f9073e63bdff765c037440372478792a9b442103a8bed945f5c3ae1d66266b86cb41d0006404a8297708a799ec0c7286c2beec6f964a4ac6 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + 001_port_fixes.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +set(TOOLS bt3_log_cat bt3_plugin_manifest) + +foreach(tool ${TOOLS}) + set(suffix ${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}") + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}") + endif() +endforeach() + +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_test_cmake(PACKAGE_NAME BehaviorTreeV3) diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json new file mode 100644 index 00000000000000..80dc03c0905d8e --- /dev/null +++ b/ports/behaviortree-cpp/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "behaviortree-cpp", + "version-string": "3.5.1", + "homepage": "https://www.behaviortree.dev", + "description": "Behavior Trees Library in C++." +} From c9797c7a4a43556b47f49b0f0045e78995c74256 Mon Sep 17 00:00:00 2001 From: seanyen Date: Wed, 5 Aug 2020 15:39:07 -0700 Subject: [PATCH 02/11] lint fix. --- ports/behaviortree-cpp/vcpkg.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json index 80dc03c0905d8e..8161b9173f25d8 100644 --- a/ports/behaviortree-cpp/vcpkg.json +++ b/ports/behaviortree-cpp/vcpkg.json @@ -1,6 +1,6 @@ -{ - "name": "behaviortree-cpp", - "version-string": "3.5.1", - "homepage": "https://www.behaviortree.dev", - "description": "Behavior Trees Library in C++." -} +{ + "name": "behaviortree-cpp", + "version-string": "3.5.1", + "description": "Behavior Trees Library in C++.", + "homepage": "https://www.behaviortree.dev" +} From 63226caf54892fcc1a55d8bc3ab7042a39279f1c Mon Sep 17 00:00:00 2001 From: seanyen Date: Wed, 5 Aug 2020 15:58:44 -0700 Subject: [PATCH 03/11] fix. --- ports/behaviortree-cpp/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake index 2141fc2e205f30..a5baff43cd0de4 100644 --- a/ports/behaviortree-cpp/portfile.cmake +++ b/ports/behaviortree-cpp/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_fail_port_install(ON_TARGET "UWP") + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE From 16b1f7e349ea8448d34fa4180f7ed7491b824b5d Mon Sep 17 00:00:00 2001 From: seanyen Date: Wed, 5 Aug 2020 20:01:34 -0700 Subject: [PATCH 04/11] Adding baseline. --- scripts/ci.baseline.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 64b452074eb6d4..9df5432fd9784e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -112,6 +112,9 @@ bde:x64-uwp=fail bde:x64-windows=fail bde:x64-windows-static=fail bde:x86-windows=fail +behaviortree-cpp:arm-uwp=fail +behaviortree-cpp:x64-osx=fail +behaviortree-cpp:x64-uwp=fail benchmark:arm64-windows=fail benchmark:arm-uwp=fail benchmark:x64-uwp=fail From d82fc8809a703b57d677d8ef74c0fd8642307c77 Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Fri, 7 Aug 2020 11:49:01 -0700 Subject: [PATCH 05/11] Update ports/behaviortree-cpp/vcpkg.json Co-authored-by: nicole mazzuca --- ports/behaviortree-cpp/vcpkg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json index 8161b9173f25d8..959581d03d7933 100644 --- a/ports/behaviortree-cpp/vcpkg.json +++ b/ports/behaviortree-cpp/vcpkg.json @@ -2,5 +2,6 @@ "name": "behaviortree-cpp", "version-string": "3.5.1", "description": "Behavior Trees Library in C++.", - "homepage": "https://www.behaviortree.dev" + "homepage": "https://www.behaviortree.dev", + "supports": "!uwp" } From a2e1f88afe05eb94408686db0a02210eede6e5fb Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Fri, 7 Aug 2020 11:49:18 -0700 Subject: [PATCH 06/11] Update scripts/ci.baseline.txt Co-authored-by: nicole mazzuca --- scripts/ci.baseline.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9df5432fd9784e..b24550943cdba5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -112,9 +112,7 @@ bde:x64-uwp=fail bde:x64-windows=fail bde:x64-windows-static=fail bde:x86-windows=fail -behaviortree-cpp:arm-uwp=fail behaviortree-cpp:x64-osx=fail -behaviortree-cpp:x64-uwp=fail benchmark:arm64-windows=fail benchmark:arm-uwp=fail benchmark:x64-uwp=fail From 8f9cd2e858ab3ffb374257d68a57a873523eafed Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Mon, 10 Aug 2020 15:29:49 -0700 Subject: [PATCH 07/11] Update ports/behaviortree-cpp/001_port_fixes.patch --- ports/behaviortree-cpp/001_port_fixes.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/behaviortree-cpp/001_port_fixes.patch b/ports/behaviortree-cpp/001_port_fixes.patch index d78cd4d38b0e77..3cb4ac29ed32a8 100644 --- a/ports/behaviortree-cpp/001_port_fixes.patch +++ b/ports/behaviortree-cpp/001_port_fixes.patch @@ -7,7 +7,7 @@ index 75dea11..4eea781 100644 if(MSVC) - target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W4 /WX) -+ target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W4 /WX /wd4702) ++ target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W4 /wd4702) else() target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE -Wall -Wextra -Werror=return-type) From a7f61df87382771af6d0a3ee09c6ae8e7ead25f8 Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Tue, 11 Aug 2020 01:10:32 -0700 Subject: [PATCH 08/11] Adding missing dep. --- ports/behaviortree-cpp/vcpkg.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json index 959581d03d7933..be73dc5e060863 100644 --- a/ports/behaviortree-cpp/vcpkg.json +++ b/ports/behaviortree-cpp/vcpkg.json @@ -3,5 +3,8 @@ "version-string": "3.5.1", "description": "Behavior Trees Library in C++.", "homepage": "https://www.behaviortree.dev", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + "boost-coroutine2" + ] } From 7177002ff97336aac5daf290aa503e4c420b803a Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Thu, 20 Aug 2020 17:25:11 -0700 Subject: [PATCH 09/11] Update ci.baseline.txt --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b24550943cdba5..64b452074eb6d4 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -112,7 +112,6 @@ bde:x64-uwp=fail bde:x64-windows=fail bde:x64-windows-static=fail bde:x86-windows=fail -behaviortree-cpp:x64-osx=fail benchmark:arm64-windows=fail benchmark:arm-uwp=fail benchmark:x64-uwp=fail From a334a288c1e2641d4ade7028737ffb87504216ec Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Thu, 20 Aug 2020 17:25:25 -0700 Subject: [PATCH 10/11] Update vcpkg.json --- ports/behaviortree-cpp/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json index be73dc5e060863..e53f9a351cd4e1 100644 --- a/ports/behaviortree-cpp/vcpkg.json +++ b/ports/behaviortree-cpp/vcpkg.json @@ -3,7 +3,7 @@ "version-string": "3.5.1", "description": "Behavior Trees Library in C++.", "homepage": "https://www.behaviortree.dev", - "supports": "!uwp", + "supports": "!uwp&!osx", "dependencies": [ "boost-coroutine2" ] From 75acb6ce46523fca1f71786e8f86951de4dd69bf Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Thu, 20 Aug 2020 17:47:25 -0700 Subject: [PATCH 11/11] Update vcpkg.json --- ports/behaviortree-cpp/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json index e53f9a351cd4e1..f14ea22da56f68 100644 --- a/ports/behaviortree-cpp/vcpkg.json +++ b/ports/behaviortree-cpp/vcpkg.json @@ -3,7 +3,7 @@ "version-string": "3.5.1", "description": "Behavior Trees Library in C++.", "homepage": "https://www.behaviortree.dev", - "supports": "!uwp&!osx", + "supports": "!uwp & !osx", "dependencies": [ "boost-coroutine2" ]