Support OpenCV binaries

They have rpath differences, as well as needing the year

Author: ThadHouse

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 group 'edu.wpi.first'
-version '1.2.0'
+version '1.3.0'
 
 if (project.hasProperty('publishVersion')) {
     version = project.publishVersion

src/main/java/edu/wpi/first/tools/FixupNativeResources.java

@@ -146,8 +146,14 @@ public void execute(CopySpec copySpec) {
 
                 // Fixup any dependencies
                 for (String fixupFile : filesToFixup) {
+                    String outputName = fixupFile;
+                    // Handle the special case of opencv libraries already containing rpath
+                    if (outputName.startsWith("@rpath/")) {
+                        outputName = outputName.substring("@rpath/".length());
+                    }
+                    String outputNameFinal = outputName;
                     project.exec((ex) -> {
-                        ex.commandLine("install_name_tool", "-change", fixupFile, "@loader_path/" + fixupFile,
+                        ex.commandLine("install_name_tool", "-change", fixupFile, "@loader_path/" + outputNameFinal,
                                 file.toString());
                     });
                 }

src/main/java/edu/wpi/first/tools/NativeConfigurator.java

@@ -3,7 +3,6 @@
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.dsl.DependencyHandler;
 
-
 public class NativeConfigurator {
     private final PlatformMapper platformMapper;
     private String defaultJavaFxVersion = "17.0.2";
@@ -15,6 +14,15 @@ public NativeConfigurator(PlatformMapper mapper, DependencyHandler handler) {
         this.handler = handler;
     }
 
+    public Dependency wpilibOpenCvJava(String frcYear, String version) {
+        return handler.create("edu.wpi.first.thirdparty." + frcYear + ".opencv:opencv-java:" + version);
+    }
+
+    public Dependency wpilibOpenCv(String frcYear, String version) {
+        return handler.create("edu.wpi.first.thirdparty." + frcYear + ".opencv:opencv-cpp:" + version + ":"
+                + platformMapper.getWpilibClassifier() + "@zip");
+    }
+
     public Dependency wpilibJava(String name) {
         return wpilibJava(name, wpilibVersion);
     }
@@ -24,15 +32,17 @@ public Dependency wpilibJava(String name, String version) {
     }
 
     public Dependency wpilib(String name, String version) {
-        return handler.create("edu.wpi.first." + name + ":" + name + "-cpp:" + version + ":" + platformMapper.getWpilibClassifier() + "@zip");
+        return handler.create("edu.wpi.first." + name + ":" + name + "-cpp:" + version + ":"
+                + platformMapper.getWpilibClassifier() + "@zip");
     }
 
     public Dependency wpilib(String name) {
         return wpilib(name, this.wpilibVersion);
     }
 
     public Dependency cscore(String version) {
-        return handler.create("edu.wpi.first.cscore:cscore-jnicvstatic:" + version + ":" + platformMapper.getWpilibClassifier()  + "@zip");
+        return handler.create("edu.wpi.first.cscore:cscore-jnicvstatic:" + version + ":"
+                + platformMapper.getWpilibClassifier() + "@zip");
     }
 
     public Dependency cscore() {
@@ -41,7 +51,8 @@ public Dependency cscore() {
 
     public Dependency javafx(String name, String version) {
         String groupName = "org.openjfx";
-        return handler.create(groupName + ":javafx-" + name + ":" + version + ":" + platformMapper.getJavaFxClassifier());
+        return handler
+                .create(groupName + ":javafx-" + name + ":" + version + ":" + platformMapper.getJavaFxClassifier());
     }
 
     public Dependency javafx(String name) {
@@ -56,9 +67,12 @@ public void setWpilibVersion(String version) {
         this.wpilibVersion = version;
     }
 
-    // public static Dependency nativeDependency(DependencyHandler handler, String group, String name, String version, Function<NativePlatforms, String> classiferFunction) {
-    //     NativePlatforms currentPlatform = PlatformMapper.getCurrentPlatform();
-    //     return handler.add(currentPlatform.getPlatformName(),
-    //         group + ":" + name + ":" + version + ":" + classiferFunction.apply(currentPlatform));
+    // public static Dependency nativeDependency(DependencyHandler handler, String
+    // group, String name, String version, Function<NativePlatforms, String>
+    // classiferFunction) {
+    // NativePlatforms currentPlatform = PlatformMapper.getCurrentPlatform();
+    // return handler.add(currentPlatform.getPlatformName(),
+    // group + ":" + name + ":" + version + ":" +
+    // classiferFunction.apply(currentPlatform));
     // }
 }