diff --git a/core/jreleaser-templates/src/main/resources/META-INF/jreleaser/templates/java-binary/macports/Portfile.tpl b/core/jreleaser-templates/src/main/resources/META-INF/jreleaser/templates/java-binary/macports/Portfile.tpl index c174f1f6a..3895434e2 100644 --- a/core/jreleaser-templates/src/main/resources/META-INF/jreleaser/templates/java-binary/macports/Portfile.tpl +++ b/core/jreleaser-templates/src/main/resources/META-INF/jreleaser/templates/java-binary/macports/Portfile.tpl @@ -20,6 +20,7 @@ long_description {{projectLongDescription}} homepage {{projectWebsite}} master_sites {{macportsDistributionUrl}} +distname {{macportsDistname}} use_zip yes checksums rmd160 {{distributionChecksumRmd160}} \ diff --git a/core/jreleaser-templates/src/main/resources/META-INF/jreleaser/templates/native-image/macports/Portfile.tpl b/core/jreleaser-templates/src/main/resources/META-INF/jreleaser/templates/native-image/macports/Portfile.tpl index f6baf7384..d00c47723 100644 --- a/core/jreleaser-templates/src/main/resources/META-INF/jreleaser/templates/native-image/macports/Portfile.tpl +++ b/core/jreleaser-templates/src/main/resources/META-INF/jreleaser/templates/native-image/macports/Portfile.tpl @@ -19,6 +19,7 @@ long_description {{projectLongDescription}} homepage {{projectWebsite}} master_sites {{macportsDistributionUrl}} +distname {{macportsDistname}} use_zip yes checksums rmd160 {{distributionChecksumRmd160}} \ diff --git a/core/jreleaser-tools/src/main/java/org/jreleaser/tools/AbstractToolProcessor.java b/core/jreleaser-tools/src/main/java/org/jreleaser/tools/AbstractToolProcessor.java index bdc081f45..5221b8632 100644 --- a/core/jreleaser-tools/src/main/java/org/jreleaser/tools/AbstractToolProcessor.java +++ b/core/jreleaser-tools/src/main/java/org/jreleaser/tools/AbstractToolProcessor.java @@ -330,6 +330,7 @@ protected boolean verifyAndAddArtifacts(Map props, if (artifactName.endsWith("-")) { artifactName = artifactName.substring(0, artifactName.length() - 1); } + artifactVersion = projectVersion; } projectVersion = context.getModel().getProject().getVersion(); if (isBlank(artifactName) && isNotBlank(projectVersion) && artifactFileName.contains(projectVersion)) { @@ -337,6 +338,7 @@ protected boolean verifyAndAddArtifacts(Map props, if (artifactName.endsWith("-")) { artifactName = artifactName.substring(0, artifactName.length() - 1); } + artifactVersion = projectVersion; } String artifactOs = ""; diff --git a/core/jreleaser-tools/src/main/java/org/jreleaser/tools/MacportsToolProcessor.java b/core/jreleaser-tools/src/main/java/org/jreleaser/tools/MacportsToolProcessor.java index c6c7e76e7..447f4693b 100644 --- a/core/jreleaser-tools/src/main/java/org/jreleaser/tools/MacportsToolProcessor.java +++ b/core/jreleaser-tools/src/main/java/org/jreleaser/tools/MacportsToolProcessor.java @@ -31,8 +31,12 @@ import static org.jreleaser.templates.TemplateUtils.trimTplExtension; import static org.jreleaser.util.Constants.KEY_DISTRIBUTION_ARTIFACT_FILE; +import static org.jreleaser.util.Constants.KEY_DISTRIBUTION_ARTIFACT_FILE_NAME; +import static org.jreleaser.util.Constants.KEY_DISTRIBUTION_ARTIFACT_NAME; +import static org.jreleaser.util.Constants.KEY_DISTRIBUTION_ARTIFACT_VERSION; import static org.jreleaser.util.Constants.KEY_DISTRIBUTION_URL; import static org.jreleaser.util.Constants.KEY_MACPORTS_CATEGORIES; +import static org.jreleaser.util.Constants.KEY_MACPORTS_DISTNAME; import static org.jreleaser.util.Constants.KEY_MACPORTS_DISTRIBUTION_URL; import static org.jreleaser.util.Constants.KEY_MACPORTS_JAVA_VERSION; import static org.jreleaser.util.Constants.KEY_MACPORTS_MAINTAINERS; @@ -87,6 +91,12 @@ protected void fillToolProperties(Map props, Distribution distri } distributionUrl = distributionUrl.replace(context.getModel().getProject().getEffectiveVersion(), "${version}"); props.put(KEY_MACPORTS_DISTRIBUTION_URL, distributionUrl); + + String artifactFileName = (String) props.get(KEY_DISTRIBUTION_ARTIFACT_FILE_NAME); + String artifactName = (String) props.get(KEY_DISTRIBUTION_ARTIFACT_NAME); + String artifactVersion = (String) props.get(KEY_DISTRIBUTION_ARTIFACT_VERSION); + props.put(KEY_MACPORTS_DISTNAME, artifactFileName.replace(artifactName, "${name}") + .replace(artifactVersion, "${version}")); } private String resolveJavaVersion(Distribution distribution) { diff --git a/core/jreleaser-utils/src/main/java/org/jreleaser/util/Constants.java b/core/jreleaser-utils/src/main/java/org/jreleaser/util/Constants.java index 5c6d2d897..fed38cdc5 100644 --- a/core/jreleaser-utils/src/main/java/org/jreleaser/util/Constants.java +++ b/core/jreleaser-utils/src/main/java/org/jreleaser/util/Constants.java @@ -222,6 +222,7 @@ public interface Constants { String KEY_MACPORTS_CATEGORIES = "macportsCategories"; String KEY_MACPORTS_MAINTAINERS = "macportsMaintainers"; String KEY_MACPORTS_DISTRIBUTION_URL = "macportsDistributionUrl"; + String KEY_MACPORTS_DISTNAME = "macportsDistname"; String KEY_MACPORTS_JAVA_VERSION = "macportsJavaVersion"; String KEY_MACPORTS_REPOSITORY_REPO_URL = "macportsRepositoryRepoUrl"; String KEY_MACPORTS_REPOSITORY_REPO_CLONE_URL = "macportsRepositoryRepoCloneUrl"; diff --git a/src/jreleaser/distributions/jreleaser/macports/Portfile.tpl b/src/jreleaser/distributions/jreleaser/macports/Portfile.tpl index 3c7f18f3f..86480485f 100644 --- a/src/jreleaser/distributions/jreleaser/macports/Portfile.tpl +++ b/src/jreleaser/distributions/jreleaser/macports/Portfile.tpl @@ -19,6 +19,7 @@ long_description {{projectLongDescription}} homepage {{projectWebsite}} master_sites {{macportsDistributionUrl}} +distname {{macportsDistname}} use_zip yes checksums rmd160 {{distributionChecksumRmd160}} \