From c6a00b5ced6226072e0a2e2b4b272c6a0f216e96 Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Fri, 23 May 2025 23:34:32 -0400 Subject: [PATCH 1/2] Updated dependencies - build-system.requires: semiwrap~=0.1.2 --- rdev.toml | 2 +- subprojects/pyntcore/pyproject.toml | 2 +- subprojects/robotpy-apriltag/pyproject.toml | 2 +- subprojects/robotpy-cscore/pyproject.toml | 2 +- subprojects/robotpy-hal/pyproject.toml | 2 +- subprojects/robotpy-halsim-gui/pyproject.toml | 2 +- subprojects/robotpy-romi/pyproject.toml | 2 +- subprojects/robotpy-wpilib/pyproject.toml | 2 +- subprojects/robotpy-wpimath/pyproject.toml | 2 +- subprojects/robotpy-wpinet/pyproject.toml | 2 +- subprojects/robotpy-wpiutil/pyproject.toml | 2 +- subprojects/robotpy-xrp/pyproject.toml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rdev.toml b/rdev.toml index 90f9f03ab..98011b7fa 100644 --- a/rdev.toml +++ b/rdev.toml @@ -31,7 +31,7 @@ exclude_artifacts = [ ] [params.requirements] -semiwrap = "~=0.1" +semiwrap = "~=0.1.2" hatch-meson = "~=0.1.0b2" hatch-nativelib = "~=0.2.0" hatch-robotpy = "~=0.2" diff --git a/subprojects/pyntcore/pyproject.toml b/subprojects/pyntcore/pyproject.toml index 9ab331328..c5e8e48ff 100644 --- a/subprojects/pyntcore/pyproject.toml +++ b/subprojects/pyntcore/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1", + "semiwrap~=0.1.2", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", diff --git a/subprojects/robotpy-apriltag/pyproject.toml b/subprojects/robotpy-apriltag/pyproject.toml index a18241e7d..c5f0919e4 100644 --- a/subprojects/robotpy-apriltag/pyproject.toml +++ b/subprojects/robotpy-apriltag/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1", + "semiwrap~=0.1.2", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", diff --git a/subprojects/robotpy-cscore/pyproject.toml b/subprojects/robotpy-cscore/pyproject.toml index 2741f5a6d..30a71b245 100644 --- a/subprojects/robotpy-cscore/pyproject.toml +++ b/subprojects/robotpy-cscore/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1", + "semiwrap~=0.1.2", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", diff --git a/subprojects/robotpy-hal/pyproject.toml b/subprojects/robotpy-hal/pyproject.toml index bf6ea391c..70f77f31d 100644 --- a/subprojects/robotpy-hal/pyproject.toml +++ b/subprojects/robotpy-hal/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1", + "semiwrap~=0.1.2", "hatch-meson~=0.1.0b2", "hatchling", "robotpy-native-wpihal==2025.3.2", diff --git a/subprojects/robotpy-halsim-gui/pyproject.toml b/subprojects/robotpy-halsim-gui/pyproject.toml index 8f8cec51f..77c84c33e 100644 --- a/subprojects/robotpy-halsim-gui/pyproject.toml +++ b/subprojects/robotpy-halsim-gui/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1", + "semiwrap~=0.1.2", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", diff --git a/subprojects/robotpy-romi/pyproject.toml b/subprojects/robotpy-romi/pyproject.toml index 43e11ef5b..48948c87f 100644 --- a/subprojects/robotpy-romi/pyproject.toml +++ b/subprojects/robotpy-romi/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1", + "semiwrap~=0.1.2", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", diff --git a/subprojects/robotpy-wpilib/pyproject.toml b/subprojects/robotpy-wpilib/pyproject.toml index 2ed6684b3..c5379bed1 100644 --- a/subprojects/robotpy-wpilib/pyproject.toml +++ b/subprojects/robotpy-wpilib/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1", + "semiwrap~=0.1.2", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", diff --git a/subprojects/robotpy-wpimath/pyproject.toml b/subprojects/robotpy-wpimath/pyproject.toml index ab472a835..01bf64ca0 100644 --- a/subprojects/robotpy-wpimath/pyproject.toml +++ b/subprojects/robotpy-wpimath/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1", + "semiwrap~=0.1.2", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", diff --git a/subprojects/robotpy-wpinet/pyproject.toml b/subprojects/robotpy-wpinet/pyproject.toml index 88053ba31..deec4d536 100644 --- a/subprojects/robotpy-wpinet/pyproject.toml +++ b/subprojects/robotpy-wpinet/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1", + "semiwrap~=0.1.2", "hatch-meson~=0.1.0b2", "hatchling", "robotpy-native-wpinet==2025.3.2", diff --git a/subprojects/robotpy-wpiutil/pyproject.toml b/subprojects/robotpy-wpiutil/pyproject.toml index 5d71e7e34..b37acd451 100644 --- a/subprojects/robotpy-wpiutil/pyproject.toml +++ b/subprojects/robotpy-wpiutil/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1", + "semiwrap~=0.1.2", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", diff --git a/subprojects/robotpy-xrp/pyproject.toml b/subprojects/robotpy-xrp/pyproject.toml index 6b6e0c741..dc63f8e11 100644 --- a/subprojects/robotpy-xrp/pyproject.toml +++ b/subprojects/robotpy-xrp/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1", + "semiwrap~=0.1.2", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", From bfc845676c7e555a04c9304229643115995c104e Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Fri, 23 May 2025 23:35:01 -0400 Subject: [PATCH 2/2] Add DYNAMIC_CAMERA_SERVER macro back --- subprojects/robotpy-wpilib/meson.build | 6 ------ subprojects/robotpy-wpilib/pyproject.toml | 11 +++++------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/subprojects/robotpy-wpilib/meson.build b/subprojects/robotpy-wpilib/meson.build index 814fe9325..6343d6a5a 100644 --- a/subprojects/robotpy-wpilib/meson.build +++ b/subprojects/robotpy-wpilib/meson.build @@ -4,8 +4,6 @@ project('wpilib', ['cpp'], subdir('semiwrap') -dyn_camsrv = declare_dependency(compile_args: ['-DDYNAMIC_CAMERA_SERVER=1']) - wpilib_sources += files( 'wpilib/src/main.cpp', 'wpilib/src/rpy/ControlWord.cpp', @@ -14,8 +12,6 @@ wpilib_sources += files( 'wpilib/src/rpy/MotorControllerGroup.cpp', ) -wpilib_deps += [dyn_camsrv] - wpilib_counter_sources += files( 'wpilib/counter/counter.cpp', ) @@ -37,8 +33,6 @@ wpilib_shuffleboard_sources += files( 'wpilib/shuffleboard/ShuffleboardData.cpp', ) -wpilib_shuffleboard_deps += [dyn_camsrv] - wpilib_simulation_sources += files( 'wpilib/simulation/simulation.cpp', ) diff --git a/subprojects/robotpy-wpilib/pyproject.toml b/subprojects/robotpy-wpilib/pyproject.toml index c5379bed1..297d01288 100644 --- a/subprojects/robotpy-wpilib/pyproject.toml +++ b/subprojects/robotpy-wpilib/pyproject.toml @@ -97,9 +97,8 @@ depends = [ ] includes = ["wpilib/src"] -# pp_defines = [ -# "DYNAMIC_CAMERA_SERVER 1" -# ] +[tool.semiwrap.extension_modules."wpilib._wpilib".defines] +DYNAMIC_CAMERA_SERVER = 1 [tool.semiwrap.extension_modules."wpilib._wpilib".headers] # frc @@ -279,9 +278,9 @@ wraps = ["robotpy-native-wpilib"] depends = ["wpilib", "wpilib_interfaces"] yaml_path = "semiwrap/shuffleboard" -# pp_defines = [ -# "DYNAMIC_CAMERA_SERVER 1" -# ] +[tool.semiwrap.extension_modules."wpilib.shuffleboard._shuffleboard".defines] +DYNAMIC_CAMERA_SERVER = 1 + [tool.semiwrap.extension_modules."wpilib.shuffleboard._shuffleboard".headers] # frc/shuffleboard