Repository: bigtop Updated Branches: refs/heads/master 533926084 -> ea8561dfb
BIGTOP-2557: BIGTOP-2536 broke DataFu, QFS and YCSB Signed-off-by: Konstantin Boudnik <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ea8561df Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ea8561df Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ea8561df Branch: refs/heads/master Commit: ea8561dfb370812a423efa3bc0131b3b025b8684 Parents: 5339260 Author: Kengo Seki <[email protected]> Authored: Sat Oct 22 22:48:43 2016 +0900 Committer: Konstantin Boudnik <[email protected]> Committed: Wed Oct 26 11:28:12 2016 -0700 ---------------------------------------------------------------------- packages.gradle | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/ea8561df/packages.gradle ---------------------------------------------------------------------- diff --git a/packages.gradle b/packages.gradle index e2ddb21..c00efc6 100644 --- a/packages.gradle +++ b/packages.gradle @@ -178,7 +178,7 @@ def genTasks = { target -> description: "Download $target artifacts", group: PACKAGES_GROUP) << { - def final TARBALL_SRC = config.bigtop.components[target].tarball.source + def final TARBALL_DST = config.bigtop.components[target].tarball.destination def final DOWNLOAD_DST = config.bigtop.components[target].downloaddst def final DOWNLOAD_URL = config.bigtop.components[target].downloadurl @@ -186,18 +186,18 @@ def genTasks = { target -> def final GIT_REF = config.bigtop.components[target].git.ref def final GIT_DIR = config.bigtop.components[target].git.dir - if (!DOWNLOAD_DST) + if (!DOWNLOAD_URL) return mkdir(DL_DIR) - if (TARBALL_SRC?.isEmpty() || new File(DOWNLOAD_DST)?.exists() || new File(config.bigtop.components[target].targetdl)?.exists()) { + if (TARBALL_DST?.isEmpty() || new File(DOWNLOAD_DST)?.exists() || new File(config.bigtop.components[target].targetdl)?.exists()) { println "\tFile $DOWNLOAD_DST appears to be already downloaded. Exiting..." return } if (GIT_REPO && GIT_REF) { def dir = GIT_DIR if (dir == null || dir.isEmpty()) { - dir = TARBALL_SRC.substring(0, TARBALL_SRC.lastIndexOf(".t")) + dir = TARBALL_DST.substring(0, TARBALL_DST.lastIndexOf(".t")) } delete("${DL_DIR}/${dir}") Grgit.clone( @@ -208,7 +208,7 @@ def genTasks = { target -> delete("${DL_DIR}/${dir}/.git") exec { workingDir DL_DIR - commandLine "tar -czf ${TARBALL_SRC} ${dir}".split() + commandLine "tar -czf ${TARBALL_DST} ${dir}".split() } delete("${DL_DIR}/${dir}") } @@ -229,6 +229,7 @@ def genTasks = { target -> } def final TAR_DIR = config.bigtop.components[target].tardir def final TARBALL_SRC = config.bigtop.components[target].tarball.source ?: "" + def final TARBALL_DST = config.bigtop.components[target].tarball.destination def final DOWNLOAD_DST = config.bigtop.components[target].downloaddst ?: "" def final SEED_TAR = config.bigtop.components[target].seedtar @@ -269,7 +270,7 @@ def genTasks = { target -> copy { from DOWNLOAD_DST into config.bigtop.builddir + "/$target/tar/" - rename TARBALL_SRC, SEED_TAR + rename TARBALL_DST, SEED_TAR } } touchTargetFile(config.bigtop.components[target].targettar) @@ -334,6 +335,8 @@ def genTasks = { target -> println "\tNothing to do. Exiting..." return } + 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 def final NAME = config.bigtop.components[target].name def final PKG_NAME = config.bigtop.components[target].pkg @@ -347,7 +350,7 @@ def genTasks = { target -> copy { from SEED_TAR into "$PKG_BUILD_DIR/deb/" - rename config.bigtop.components[target].tarball.destination, "${PKG_NAME}_${PKG_VERSION}.orig.tar.gz" + rename TARBALL_DST, "${PKG_NAME}_${PKG_VERSION}.orig.tar.gz" } exec { workingDir DEB_BLD_DIR
