bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From evan...@apache.org
Subject [bigtop] branch master updated: BIGTOP-3141. Release number is not honored by the build system (#452)
Date Wed, 30 Jan 2019 09:32:24 GMT
This is an automated email from the ASF dual-hosted git repository.

evansye pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new c934170  BIGTOP-3141. Release number is not honored by the build system (#452)
c934170 is described below

commit c934170e86e05d63714b8816bc51329544d52aea
Author: Evans Ye <evansye@apache.org>
AuthorDate: Wed Jan 30 17:32:20 2019 +0800

    BIGTOP-3141. Release number is not honored by the build system (#452)
---
 packages.gradle | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages.gradle b/packages.gradle
index 5929f72..ac2c430 100644
--- a/packages.gradle
+++ b/packages.gradle
@@ -39,7 +39,6 @@ config.bigtop.builddir = projectDir.absolutePath + "/build"
 config.bigtop.outputdir = projectDir.absolutePath + "/output"
 config.bigtop.distdir = projectDir.absolutePath + "/dist"
 config.bigtop.dldir = projectDir.absolutePath + "/dl"
-if(!config.bigtop.buildstamp) config.bigtop.buildstamp = 1
 
 def bomVersions = []
 
@@ -49,7 +48,6 @@ def final BUILD_DIR = config.bigtop.builddir
 def final OUTPUT_DIR = config.bigtop.outputdir
 def final DIST_DIR = config.bigtop.distdir
 def final DL_DIR = config.bigtop.dldir
-def final BIGTOP_BUILD_STAMP = System.getenv('BIGTOP_BUILD_STAMP') ?: config.bigtop.buildstamp
 
 // List of tasks derived from the BOM file is used to preserve the natural order
 def bomTasks = []
@@ -308,6 +306,8 @@ def genTasks = { target ->
       println "\tNothing to do. Exiting..."
       return
     }
+    def final BIGTOP_BUILD_STAMP = System.getenv('BIGTOP_BUILD_STAMP') ?:
+            config.bigtop.components[target].version.release
     def final PKG_NAME = config.bigtop.components[target].pkg
     def final PKG_VERSION = config.bigtop.components[target].version.pkg
     def final PKG_OUTPUT_DIR = config.bigtop.components[target].outputdir
@@ -360,6 +360,8 @@ def genTasks = { target ->
       println "\tNothing to do. Exiting..."
       return
     }
+     def final BIGTOP_BUILD_STAMP = System.getenv('BIGTOP_BUILD_STAMP') ?:
+             config.bigtop.components[target].version.release
     def final TARBALL_SRC = config.bigtop.components[target].tarball.source
     def final TARBALL_DST = config.bigtop.components[target].tarball.destination ?: TARBALL_SRC
     def final PKG_BUILD_DIR = config.bigtop.components[target].builddir
@@ -444,6 +446,8 @@ def genTasks = { target ->
       println "\tNothing to do. Exiting..."
       return
     }
+    def final BIGTOP_BUILD_STAMP = System.getenv('BIGTOP_BUILD_STAMP') ?:
+            config.bigtop.components[target].version.release
     def final PKG_BUILD_DIR = config.bigtop.components[target].builddir
     def final NAME = config.bigtop.components[target].name
     def final PKG_NAME = config.bigtop.components[target].pkg
@@ -501,6 +505,8 @@ def genTasks = { target ->
       println "\tNothing to do. Exiting..."
       return
     }
+    def final BIGTOP_BUILD_STAMP = System.getenv('BIGTOP_BUILD_STAMP') ?:
+            config.bigtop.components[target].version.release
     def final NAME = config.bigtop.components[target].name
     def final PKG_NAME = config.bigtop.components[target].pkg
     def final PKG_NAME_FOR_PKG = NAME.replaceAll("-", "_")


Mime
View raw message