Add mrclib support (#273)

Author: ThadHouse

build.gradle

@@ -13,7 +13,7 @@ java {
 
 allprojects {
     group = "org.wpilib"
-    version = "2027.6.1"
+    version = "2027.7.1"
 
     if (project.hasProperty('publishVersion')) {
         version = project.publishVersion

src/main/java/org/wpilib/nativeutils/WPINativeUtilsExtension.java

@@ -260,7 +260,7 @@ public void addMacMinimumVersionArg() {
     public static abstract class DependencyVersions {
         public abstract Property<String> getWpiVersion();
 
-        public abstract Property<String> getNiLibVersion();
+        public abstract Property<String> getMrcLibVersion();
 
         public abstract Property<String> getOpencvVersion();
 
@@ -435,7 +435,7 @@ public void configureDependencies(Action<DependencyVersions> dependencies) {
         dependencyVersions = objects.newInstance(DependencyVersions.class);
 
         dependencyVersions.getWpiVersion().set("-1");
-        dependencyVersions.getNiLibVersion().set("-1");
+        dependencyVersions.getMrcLibVersion().set("-1");
         dependencyVersions.getOpencvVersion().set("-1");
         dependencyVersions.getGoogleTestVersion().set("-1");
 
@@ -468,35 +468,44 @@ public void configureDependencies(Action<DependencyVersions> dependencies) {
                 "googletest-cpp",
                 wpiVersion);
 
+        configs.register("mrclib", WPISharedMavenDependency.class, c -> {
+            c.getGroupId().set("org.wpilib.mrclib");
+            c.getArtifactId().set("mrclib-cpp");
+            c.getHeaderClassifier().set("headers");
+            c.getExt().set("zip");
+            c.getVersion().set(dependencyVersions.getMrcLibVersion());
+            c.getSkipAtRuntimePlatforms().add(this.platforms.systemcore);
+            c.getTargetPlatforms().addAll(this.platforms.allPlatforms);
+            c.getNoDebugSplit().set(true);
+        });
+
         // 2027
         configs.register("wpilib_jni", AllPlatformsCombinedNativeDependency.class, c -> {
             ListProperty<String> d = c.getDependencies();
             d.set(List.of("ntcore_shared", "hal_shared", "datalog_shared", "wpimath_shared", "wpinet_shared",
-                    "wpiutil_shared"));
+                    "wpiutil_shared", "mrclib_shared"));
         });
 
         configs.register("wpilib_static", AllPlatformsCombinedNativeDependency.class, c -> {
             ListProperty<String> d = c.getDependencies();
             d.set(List.of("wpilibc_static", "ntcore_static", "hal_static", "datalog_static", "wpimath_static",
-                    "wpinet_static",
-                    "wpiutil_static"));
+                    "wpinet_static", "wpiutil_static", "mrclib_shared"));
         });
 
         configs.register("wpilib_shared", AllPlatformsCombinedNativeDependency.class, c -> {
             ListProperty<String> d = c.getDependencies();
             d.set(List.of("wpilibc_shared", "ntcore_shared", "hal_shared", "datalog_shared", "wpimath_shared",
-                    "wpinet_shared",
-                    "wpiutil_shared"));
+                    "wpinet_shared", "wpiutil_shared", "mrclib_shared"));
         });
 
         configs.register("driver_static", AllPlatformsCombinedNativeDependency.class, c -> {
             ListProperty<String> d = c.getDependencies();
-            d.set(List.of("hal_static", "datalog_static", "wpimath_static", "wpinet_static", "wpiutil_static"));
+            d.set(List.of("hal_static", "datalog_static", "wpimath_static", "wpinet_static", "wpiutil_static", "mrclib_shared"));
         });
 
         configs.register("driver_shared", AllPlatformsCombinedNativeDependency.class, c -> {
             ListProperty<String> d = c.getDependencies();
-            d.set(List.of("hal_shared", "datalog_shared", "wpimath_shared", "wpinet_shared", "wpiutil_shared"));
+            d.set(List.of("hal_shared", "datalog_shared", "wpimath_shared", "wpinet_shared", "wpiutil_shared", "mrclib_shared"));
         });
 
         configs.register("vision_jni_shared", AllPlatformsCombinedNativeDependency.class, c -> {

src/main/java/org/wpilib/nativeutils/dependencies/WPIHeaderOnlyMavenDependency.java

@@ -7,6 +7,7 @@
 import org.gradle.api.Project;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.provider.Property;
+import org.gradle.api.provider.SetProperty;
 import org.gradle.nativeplatform.BuildType;
 import org.gradle.nativeplatform.platform.NativePlatform;
 
@@ -35,5 +36,5 @@ public Optional<ResolvedNativeDependency> resolveNativeDependency(NativePlatform
         return resolvedDep;
     }
 
-    public abstract Property<Boolean> getSkipAtRuntime();
+    public abstract SetProperty<String> getSkipAtRuntimePlatforms();
 }

src/main/java/org/wpilib/nativeutils/dependencies/WPISharedMavenDependency.java

@@ -10,6 +10,7 @@
 import org.gradle.api.Project;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.provider.Property;
+import org.gradle.api.provider.SetProperty;
 import org.gradle.nativeplatform.BuildType;
 import org.gradle.nativeplatform.platform.NativePlatform;
 
@@ -38,6 +39,9 @@ public Optional<ResolvedNativeDependency> resolveNativeDependency(NativePlatform
         }
 
         String buildTypeName = buildType.getName();
+        if (getNoDebugSplit().getOrElse(false)) {
+            buildTypeName = "release";
+        }
 
         FileCollection headers = getArtifactRoots(getHeaderClassifier().getOrElse(null), ArtifactType.HEADERS, loaderDependencySet);
         FileCollection sources = getArtifactRoots(getSourceClassifier().getOrElse(null), ArtifactType.SOURCES, loaderDependencySet);
@@ -52,7 +56,8 @@ public Optional<ResolvedNativeDependency> resolveNativeDependency(NativePlatform
         FileCollection linkFiles = getArtifactFiles(platformName, buildTypeName, SHARED_MATCHERS, sharedExcludes, ArtifactType.LINK, loaderDependencySet);
 
         FileCollection runtimeFiles;
-        if (getSkipAtRuntime().getOrElse(false)) {
+        Set<String> skipAtRuntimePlatforms = getSkipAtRuntimePlatforms().getOrNull();
+        if (skipAtRuntimePlatforms != null && skipAtRuntimePlatforms.contains(platformName)) {
             runtimeFiles = getProject().files();
         } else {
             runtimeFiles = getArtifactFiles(platformName, buildTypeName, RUNTIME_MATCHERS, RUNTIME_EXCLUDES, ArtifactType.RUNTIME, loaderDependencySet);
@@ -64,5 +69,7 @@ public Optional<ResolvedNativeDependency> resolveNativeDependency(NativePlatform
         return resolvedDep;
     }
 
-    public abstract Property<Boolean> getSkipAtRuntime();
+    public abstract SetProperty<String> getSkipAtRuntimePlatforms();
+
+    public abstract Property<Boolean> getNoDebugSplit();
 }

testing/cpp/build.gradle

@@ -3,7 +3,7 @@ import org.wpilib.nativeutils.vendordeps.WPIVendorDepsPlugin
 
 plugins {
     id "cpp"
-    id "org.wpilib.NativeUtils" version "2027.6.1"
+    id "org.wpilib.NativeUtils" version "2027.7.1"
 }
 
 nativeUtils.addWpiNativeUtils()