[GitHub] stevedlawrence closed pull request #36: Change names of zip/tar/rpm binary artifacts

[GitBox <gi...@apache.org>]

stevedlawrence closed pull request #36: Change names of zip/tar/rpm binary artifacts
URL: https://github.com/apache/incubator-daffodil/pull/36
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/daffodil-cli/build.sbt b/daffodil-cli/build.sbt
index c855c8827..089445180 100644
--- a/daffodil-cli/build.sbt
+++ b/daffodil-cli/build.sbt
@@ -25,11 +25,11 @@ enablePlugins(RpmPlugin)
 
 executableScriptName := "daffodil"
 
-packageName in Universal := "daffodil-" + version.value + "-bin" //tarball name
+packageName in Universal := "apache-daffodil-" + version.value + "-incubating-bin" //tarball name
 
 packageName in Linux := executableScriptName.value
 
-packageName in Rpm := executableScriptName.value
+packageName in Rpm := "apache-" + executableScriptName.value
 
 mappings in Universal ++= Seq(
   baseDirectory.value / "LICENSE" -> "LICENSE",
@@ -59,11 +59,12 @@ and validation.
 
 version in Rpm := {
   val parts = version.value.split("-", 2)
-  parts(0) // removes snapshot/beta/rc/etc, that should only be in the rpmRelease
+  val ver = parts(0) // removes snapshot if it exists
+  ver + ".incubating"
 }
 
 rpmRelease := {
-  val parts = version.value.split("-", 2) // parts(0) is the version, parse(1) is snapshot/beta/rc/etc if it exists
+  val parts = version.value.split("-", 2) // parts(0) is the version, parse(1) is snapshot if it exists
   if (parts.length > 1) "0." + parts(1).toLowerCase else "1"
 }
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services