This is an automated email from the ASF dual-hosted git repository.

slawrence pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git


The following commit(s) were added to refs/heads/master by this push:
     new a56215b  Change names of zip/tar/rpm binary artifacts
a56215b is described below

commit a56215bcd697706bae5ab14661d37019f2e67ab8
Author: Steve Lawrence <slawre...@apache.org>
AuthorDate: Thu Feb 8 13:03:49 2018 -0500

    Change names of zip/tar/rpm binary artifacts
    
    Change the names of the zip, tgz, and rpm binary artifacts to include
    "apache" and "incubating". Note that this does not affect the naming of
    the jar artifacts at all (e.g. daffodil-lib_2.11-2.1.0.jar stays the
    same). The names now look like this:
    
      apache-daffodil-2.1.0-incubating-bin.zip
      apache-daffodil-2.1.0-incubating-bin.tgz
      apache-daffodil-2.1.0.incubating-1.noarch.rpm
    
    Note that the rpm file has a slightly different naming convention due to
    restrictions imposed by rpm.
    
    DAFFODIL-1896
---
 daffodil-cli/build.sbt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/daffodil-cli/build.sbt b/daffodil-cli/build.sbt
index c855c88..0894451 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"
 }
 

-- 
To stop receiving notification emails like this one, please contact
slawre...@apache.org.

Reply via email to