From 2e1b86d354dbef0565bc1323626d3d49df92912e Mon Sep 17 00:00:00 2001 From: Jade Date: Tue, 10 Sep 2024 12:32:14 +0800 Subject: [PATCH] Add NativeLibraryArtifact for deploying shared libraries (#25) * First pass at adding NativeLibraryArtifact Based off NativeExecutableArtifact * fix --- build.gradle | 2 +- .../artifact/NativeLibraryArtifact.java | 72 +++++++++++++++++++ testing/cpp/build.gradle | 2 +- 3 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 src/main/java/edu/wpi/first/deployutils/deploy/artifact/NativeLibraryArtifact.java diff --git a/build.gradle b/build.gradle index 40aa2de..0c887a1 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ buildScan { } group = "edu.wpi.first" -version = "2025.0.0" +version = "2025.1.0" base { archivesName = "DeployUtils" diff --git a/src/main/java/edu/wpi/first/deployutils/deploy/artifact/NativeLibraryArtifact.java b/src/main/java/edu/wpi/first/deployutils/deploy/artifact/NativeLibraryArtifact.java new file mode 100644 index 0000000..73cd8dd --- /dev/null +++ b/src/main/java/edu/wpi/first/deployutils/deploy/artifact/NativeLibraryArtifact.java @@ -0,0 +1,72 @@ +package edu.wpi.first.deployutils.deploy.artifact; + +import java.io.File; + +import javax.inject.Inject; + +import org.gradle.api.provider.Property; +import org.gradle.api.tasks.util.PatternFilterable; +import org.gradle.api.tasks.util.PatternSet; +import org.gradle.nativeplatform.SharedLibraryBinarySpec; +import org.gradle.api.Task; +import org.gradle.api.provider.Provider; + +import edu.wpi.first.deployutils.deploy.cache.CacheMethod; +import edu.wpi.first.deployutils.deploy.context.DeployContext; +import edu.wpi.first.deployutils.deploy.target.RemoteTarget; + +public class NativeLibraryArtifact extends AbstractArtifact implements CacheableArtifact { + + private final Property cacheMethod; + + @Inject + public NativeLibraryArtifact(String name, RemoteTarget target) { + super(name, target); + filename = target.getProject().getObjects().property(String.class); + binarySpec = target.getProject().getObjects().property(SharedLibraryBinarySpec.class); + cacheMethod = target.getProject().getObjects().property(CacheMethod.class); + + linkTaskProvider = target.getProject().getProviders().provider(() -> { + return binarySpec.get().getTasks().getLink(); + }); + + dependsOn(linkTaskProvider); + } + + private final Provider linkTaskProvider; + + @Override + public Property getCacheMethod() { + return cacheMethod; + } + + private final Property filename; + + public Property getFilename() { + return filename; + } + + private Property binarySpec; + + public Property getBinary() { + return binarySpec; + } + + private final PatternFilterable libraryFilter = new PatternSet(); + + public PatternFilterable getLibraryFilter() { + return libraryFilter; + } + + protected File getDeployedFile() { + return binarySpec.get().getSharedLibraryFile(); + } + + @Override + public void deploy(DeployContext context) { + CacheMethod cm = cacheMethod.getOrElse(null); + + File libFile = getDeployedFile(); + context.put(libFile, getFilename().getOrElse(libFile.getName()), cm); + } +} diff --git a/testing/cpp/build.gradle b/testing/cpp/build.gradle index bad06fd..6a94fba 100644 --- a/testing/cpp/build.gradle +++ b/testing/cpp/build.gradle @@ -1,5 +1,5 @@ plugins { - id "edu.wpi.first.DeployUtils" version "2025.0.0" + id "edu.wpi.first.DeployUtils" version "2025.1.0" } deploy {