rename port to vowpal-wabbit and add patch to remove bin targets

microsoft · Oct 24, 2022 · 10b9efb · 10b9efb
1 parent 64f2791
commit 10b9efb
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 10 deletions.
diff --git a/ports/vowpal-wabbit/cmake_remove_bin_targets.patch b/ports/vowpal-wabbit/cmake_remove_bin_targets.patch
@@ -0,0 +1,25 @@
+diff --git a/vowpalwabbit/CMakeLists.txt b/vowpalwabbit/CMakeLists.txt
+index 56cb361ec..ec23fb654 100644
+--- a/vowpalwabbit/CMakeLists.txt
++++ b/vowpalwabbit/CMakeLists.txt
+@@ -1,9 +1,9 @@
+-add_subdirectory(active_interactor)
++# add_subdirectory(active_interactor)
+ add_subdirectory(allreduce)
+ if(VW_BUILD_VW_C_WRAPPER)
+   add_subdirectory(c_wrapper)
+ endif()
+-add_subdirectory(cli)
++# add_subdirectory(cli)
+ add_subdirectory(common)
+ add_subdirectory(config)
+ add_subdirectory(core)
+@@ -14,7 +14,7 @@ add_subdirectory(explore)
+ add_subdirectory(io)
+ add_subdirectory(model_merger)
+ add_subdirectory(slim)
+-add_subdirectory(spanning_tree_bin)
++# add_subdirectory(spanning_tree_bin)
+ add_subdirectory(spanning_tree)
+ if(BUILD_FLATBUFFERS)
+   add_subdirectory(fb_parser)
diff --git a/ports/vowpalwabbit/portfile.cmake → ports/vowpal-wabbit/portfile.cmake b/ports/vowpalwabbit/portfile.cmake → ports/vowpal-wabbit/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     REF 9496a6dd5610910a495ca004a93c8ab6913293e4
     SHA512 df4da3f3ab763dbd113b0ace0552d676ec905a6ff0d942d9fc1828e36fb8440d1b75a61c1ea6de09879e0f52547366936d02a77dba2bac89503a075da12414db
     HEAD_REF master
+    PATCHES cmake_remove_bin_targets.patch
 )
 
 vcpkg_cmake_configure(
@@ -27,7 +28,3 @@ file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_D
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/VowpalWabbit)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
diff --git a/ports/vowpal-wabbit/usage b/ports/vowpal-wabbit/usage
@@ -0,0 +1,4 @@
+vowpalwabbit provides CMake targets:
+
+    find_package(VowpalWabbit CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE VowpalWabbit::vw_core)
diff --git a/ports/vowpalwabbit/vcpkg.json → ports/vowpal-wabbit/vcpkg.json b/ports/vowpalwabbit/vcpkg.json → ports/vowpal-wabbit/vcpkg.json
@@ -1,5 +1,5 @@
 {
-  "name": "vowpalwabbit",
+  "name": "vowpal-wabbit",
   "version": "9.5.0",
   "description": "Reduction based online learning framework with a focus on contextual bandits and reinforcement learning.",
   "homepage": "https://github.com/vowpalwabbit/vowpal_wabbit",

diff --git a/ports/vowpalwabbit/usage b/ports/vowpalwabbit/usage