From ae893f31d89dc899c29203b1b7f81c500f4ef342 Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Tue, 5 Mar 2024 21:28:54 -0500 Subject: [PATCH] Don't use static linking --- .github/workflows/dist.yml | 2 ++ pyproject.toml | 22 ++++++++++++++++++++-- rev/_revlib/__init__.py | 0 rev/_revlib_driver/__init__.py | 0 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 rev/_revlib/__init__.py create mode 100644 rev/_revlib_driver/__init__.py diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index 3673d4f..795ae6a 100644 --- a/.github/workflows/dist.yml +++ b/.github/workflows/dist.yml @@ -14,6 +14,8 @@ jobs: uses: robotpy/build-actions/.github/workflows/package-ci.yml@v2024 with: artifactory_repo_type: vendor + enable_raspbian: false + enable_roborio: false secrets: META_REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }} RTD_TOKEN: ${{ secrets.RTD_TOKEN }} diff --git a/pyproject.toml b/pyproject.toml index 5b23655..720bd2d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,20 +22,38 @@ requires = [ [tool.robotpy-build] base_package = "rev" -[tool.robotpy-build.static_libs."revlib_driver".maven_lib_download] +[tool.robotpy-build.wrappers."rev._revlib_driver"] +name = "revlib_driver" +depends = [ + "wpiutil", + "wpiHal", + "wpilibc", +] + +[tool.robotpy-build.wrappers."rev._revlib_driver".maven_lib_download] artifact_id = "REVLib-driver" group_id = "com.revrobotics.frc" repo_url = "https://maven.revrobotics.com" version = "2024.2.2" libs = ["REVLibDriver"] -[tool.robotpy-build.static_libs."revlib".maven_lib_download] +[tool.robotpy-build.wrappers."rev._revlib"] +name = "revlib" +depends = [ + "wpiutil", + "wpiHal", + "wpilibc", + "revlib_driver" +] + +[tool.robotpy-build.wrappers."rev._revlib".maven_lib_download] artifact_id = "REVLib-cpp" group_id = "com.revrobotics.frc" repo_url = "https://maven.revrobotics.com" version = "2024.2.2" libs = ["REVLib"] + [tool.robotpy-build.wrappers."rev"] name = "rev" sources = [ diff --git a/rev/_revlib/__init__.py b/rev/_revlib/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/rev/_revlib_driver/__init__.py b/rev/_revlib_driver/__init__.py new file mode 100644 index 0000000..e69de29