jlengrand/jreleaser
1
0
Fork 0
mirror of https://github.com/jlengrand/jreleaser.git synced 2026-03-10 08:31:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[assemble] merge distribution artifacts. Resolves #284

Browse Source
This commit is contained in:
Andres Almiray
2021-07-12 14:08:28 +02:00
parent 8412963cf9
commit 286c04a932
4 changed files with 67 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/jreleaser-model/src/main/java/org/jreleaser/model/AbstractAssembler.java
View File

@@ -18,6 +18,7 @@
package org.jreleaser.model;
import org.jreleaser.util.Constants;
import org.jreleaser.util.PlatformUtils;
import org.jreleaser.util.Version;
import java.util.Collections;

50
core/jreleaser-model/src/main/java/org/jreleaser/model/Artifact.java
View File

@@ -19,7 +19,6 @@ package org.jreleaser.model;
import org.jreleaser.util.Algorithm;
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collections;
@@ -32,8 +31,6 @@ import java.util.Set;
import java.util.stream.Collectors;
import static java.nio.file.Files.exists;
import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES;
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
import static org.jreleaser.model.util.Artifacts.copyFile;
import static org.jreleaser.util.MustacheUtils.applyTemplate;
import static org.jreleaser.util.StringUtils.isBlank;
@@ -123,10 +120,10 @@ public class Artifact implements Domain, ExtraProperties {
return tp;
}
private Path getResolvedPath(JReleaserContext context) {
public Path getResolvedPath(JReleaserContext context) {
if (null == resolvedPath) {
if (path.contains("{{")) {
path = applyTemplate(path, context.props());
path = applyTemplate(path, artifactProps(context.props()));
}
resolvedPath = context.getBasedir().resolve(Paths.get(path)).normalize();
if (!exists(resolvedPath)) {
@@ -136,12 +133,12 @@ public class Artifact implements Domain, ExtraProperties {
return resolvedPath;
}
private Path getResolvedPath(JReleaserContext context, Distribution distribution) {
public Path getResolvedPath(JReleaserContext context, Distribution distribution) {
if (null == resolvedPath) {
if (path.contains("{{")) {
Map<String, Object> props = context.props();
props.putAll(distribution.props());
path = applyTemplate(path, props);
path = applyTemplate(path, artifactProps(props));
}
resolvedPath = context.getBasedir().resolve(Paths.get(path)).normalize();
if (!exists(resolvedPath)) {
@@ -151,12 +148,12 @@ public class Artifact implements Domain, ExtraProperties {
return resolvedPath;
}
private Path getResolvedPath(JReleaserContext context, Assembler assembler) {
public Path getResolvedPath(JReleaserContext context, Assembler assembler) {
if (null == resolvedPath) {
if (path.contains("{{")) {
Map<String, Object> props = context.props();
props.putAll(assembler.props());
path = applyTemplate(path, props);
path = applyTemplate(path, artifactProps(props));
}
resolvedPath = context.getBasedir().resolve(Paths.get(path)).normalize();
if (!exists(resolvedPath)) {
@@ -170,40 +167,48 @@ public class Artifact implements Domain, ExtraProperties {
return resolvedPath;
}
private Path getResolvedTransform(JReleaserContext context) {
public Path getResolvedTransform(JReleaserContext context) {
if (null == resolvedTransform && isNotBlank(transform)) {
if (transform.contains("{{")) {
transform = applyTemplate(transform, context.props());
transform = applyTemplate(transform, artifactProps(context.props()));
}
resolvedTransform = context.getArtifactsDirectory().resolve(Paths.get(transform)).normalize();
}
return resolvedTransform;
}
private Path getResolvedTransform(JReleaserContext context, Distribution distribution) {
public Path getResolvedTransform(JReleaserContext context, Distribution distribution) {
if (null == resolvedTransform && isNotBlank(transform)) {
if (transform.contains("{{")) {
Map<String, Object> props = context.props();
props.putAll(distribution.props());
transform = applyTemplate(transform, props);
transform = applyTemplate(transform, artifactProps(props));
}
resolvedTransform = context.getArtifactsDirectory().resolve(Paths.get(transform)).normalize();
}
return resolvedTransform;
}
private Path getResolvedTransform(JReleaserContext context, Assembler assembler) {
public Path getResolvedTransform(JReleaserContext context, Assembler assembler) {
if (null == resolvedTransform && isNotBlank(transform)) {
if (transform.contains("{{")) {
Map<String, Object> props = context.props();
props.putAll(assembler.props());
transform = applyTemplate(transform, props);
transform = applyTemplate(transform, artifactProps(props));
}
resolvedTransform = context.getArtifactsDirectory().resolve(Paths.get(transform)).normalize();
}
return resolvedTransform;
}
private Map<String,Object> artifactProps(Map<String, Object> props) {
props.putAll(getExtraProperties());
props.putAll(getResolvedExtraProperties());
props.put("platform", platform);
props.put("artifactPlatform", platform);
return props;
}
public Path getResolvedTransform() {
return resolvedTransform;
}
@@ -280,6 +285,14 @@ public class Artifact implements Domain, ExtraProperties {
this.extraProperties.putAll(extraProperties);
}
public void mergeExtraProperties(Map<String, Object> extraProperties) {
extraProperties.forEach((k, v) -> {
if (!this.extraProperties.containsKey(k)) {
this.extraProperties.put(k, v);
}
});
}
@Override
public Map<String, Object> asMap(boolean full) {
Map<String, Object> map = new LinkedHashMap<>();
@@ -303,6 +316,13 @@ public class Artifact implements Domain, ExtraProperties {
return Objects.hash(path);
}
public void merge(Artifact other) {
if (this == other) return;
if (isBlank(this.platform)) this.platform = other.platform;
if (isBlank(this.transform)) this.transform = other.transform;
mergeExtraProperties(other.extraProperties);
}
public static Set<Artifact> sortArtifacts(Set<Artifact> artifacts) {
return artifacts.stream()
.sorted(Artifact.comparatorByPlatform())

9
core/jreleaser-model/src/main/java/org/jreleaser/model/Distribution.java
View File

@@ -18,6 +18,7 @@
package org.jreleaser.model;
import org.jreleaser.util.Constants;
import org.jreleaser.util.PlatformUtils;
import org.jreleaser.util.Version;
import java.util.ArrayList;
@@ -237,6 +238,14 @@ public class Distribution extends Packagers implements ExtraProperties, Activata
this.extraProperties.putAll(extraProperties);
}
public void mergeExtraProperties(Map<String, Object> extraProperties) {
extraProperties.forEach((k, v) -> {
if (!this.extraProperties.containsKey(k)) {
this.extraProperties.put(k, v);
}
});
}
// --== TOOLs ==--
public <T extends Tool> T findTool(String name) {

24
core/jreleaser-model/src/main/java/org/jreleaser/model/JReleaserContext.java
View File

@@ -21,6 +21,7 @@ import org.bouncycastle.openpgp.PGPException;
import org.jreleaser.util.Constants;
import org.jreleaser.util.Errors;
import org.jreleaser.util.JReleaserLogger;
import org.jreleaser.util.PlatformUtils;
import org.jreleaser.util.Version;
import org.jreleaser.util.signing.FilesKeyring;
import org.jreleaser.util.signing.InMemoryKeyring;
@@ -37,6 +38,7 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Properties;
import java.util.Set;
import java.util.TreeMap;
@@ -152,15 +154,33 @@ public class JReleaserContext {
distribution.setName(assembler.getName());
model.getDistributions().put(assembler.getName(), distribution);
}
distribution.setName(assembler.getName());
distribution.setType(assembler.getType());
distribution.setExecutable(assembler.getExecutable());
distribution.setActive(assembler.getActive());
distribution.setJava(assembler.getJava());
distribution.setArtifacts(assembler.getOutputs());
mergeArtifacts(assembler, distribution);
Map<String, Object> extraProperties = new LinkedHashMap<>(distribution.getExtraProperties());
extraProperties.putAll(assembler.getExtraProperties());
distribution.setExtraProperties(extraProperties);
distribution.mergeExtraProperties(extraProperties);
}
}
private void mergeArtifacts(Assembler assembler, Distribution distribution) {
for (Artifact incoming : assembler.getOutputs()) {
Optional<Artifact> artifact = distribution.getArtifacts().stream()
.filter(a -> {
Path p1 = incoming.getResolvedPath(this, assembler);
Path p2 = a.getResolvedPath(this, distribution);
return p1.equals(p2);
})
.findFirst();
if (artifact.isPresent()) {
artifact.get().merge(incoming);
} else {
distribution.addArtifact(incoming);
}
}
}