Merge pull request #173 from robotpy/update-semiwrap

virtuald · web-flow · commit 63a238a39db6 · 2025-05-24T00:39:50.000-04:00
Update semiwrap
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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",
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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",

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ exclude_artifacts = [`
`31`	`31`	`]`
`32`	`32`
`33`	`33`	`[params.requirements]`
`34`		`-semiwrap = "~=0.1"`
	`34`	`+semiwrap = "~=0.1.2"`
`35`	`35`	`hatch-meson = "~=0.1.0b2"`
`36`	`36`	`hatch-nativelib = "~=0.2.0"`
`37`	`37`	`hatch-robotpy = "~=0.2"`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@ project('wpilib', ['cpp'],`
`4`	`4`
`5`	`5`	`subdir('semiwrap')`
`6`	`6`
`7`		`-dyn_camsrv = declare_dependency(compile_args: ['-DDYNAMIC_CAMERA_SERVER=1'])`
`8`		`-`
`9`	`7`	`wpilib_sources += files(`
`10`	`8`	`'wpilib/src/main.cpp',`
`11`	`9`	`'wpilib/src/rpy/ControlWord.cpp',`
`@@ -14,8 +12,6 @@ wpilib_sources += files(`
`14`	`12`	`'wpilib/src/rpy/MotorControllerGroup.cpp',`
`15`	`13`	`)`
`16`	`14`
`17`		`-wpilib_deps += [dyn_camsrv]`
`18`		`-`
`19`	`15`	`wpilib_counter_sources += files(`
`20`	`16`	`'wpilib/counter/counter.cpp',`
`21`	`17`	`)`
`@@ -37,8 +33,6 @@ wpilib_shuffleboard_sources += files(`
`37`	`33`	`'wpilib/shuffleboard/ShuffleboardData.cpp',`
`38`	`34`	`)`
`39`	`35`
`40`		`-wpilib_shuffleboard_deps += [dyn_camsrv]`
`41`		`-`
`42`	`36`	`wpilib_simulation_sources += files(`
`43`	`37`	`'wpilib/simulation/simulation.cpp',`
`44`	`38`	`)`