You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by fr...@apache.org on 2017/06/15 17:13:35 UTC
[1/2] incubator-trafficcontrol git commit: make dir in tarball match
tarball name
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master f5f04a058 -> ae046c89d
make dir in tarball match tarball name
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/d388a139
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/d388a139
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/d388a139
Branch: refs/heads/master
Commit: d388a139662bc84d3585bee9ab5201a5a72ac2bf
Parents: f5f04a0
Author: Dan Kirkwood <da...@gmail.com>
Authored: Thu Jun 15 10:34:14 2017 -0600
Committer: Eric Friedrich <fr...@apache.org>
Committed: Thu Jun 15 13:13:07 2017 -0400
----------------------------------------------------------------------
build/functions.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d388a139/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index 72f2bab..cdf8670 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -162,13 +162,14 @@ function createTarball() {
local projName=trafficcontrol
local version=$(getVersion "$TC_DIR")
local tarball="dist/apache-$projName-$version-incubating.tar.gz"
+ local tardir=$(basename $tarball .tar.gz)
# Create a BULDNUMBER file and add to tarball
local bndir=$(mktemp -d)
getBuildNumber >"$bndir/BUILD_NUMBER"
# create the tarball only from files in repo and BUILD_NUMBER
- tar -czf "$tarball" -C "$bndir" BUILD_NUMBER -C "$projDir" --exclude-vcs --transform "s@^@$projName-$version-incubating/@S" $(git ls-files)
+ tar -czf "$tarball" -C "$bndir" BUILD_NUMBER -C "$projDir" --exclude-vcs --transform "s@^@$tardir/@S" $(git ls-files)
rm -r "$bndir"
echo "$tarball"
}
[2/2] incubator-trafficcontrol git commit: This closes #685
Posted by fr...@apache.org.
This closes #685
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/ae046c89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/ae046c89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/ae046c89
Branch: refs/heads/master
Commit: ae046c89dc59d4d6fbe16da391985599282b86be
Parents: d388a13
Author: Eric Friedrich <fr...@apache.org>
Authored: Thu Jun 15 13:13:21 2017 -0400
Committer: Eric Friedrich <fr...@apache.org>
Committed: Thu Jun 15 13:13:21 2017 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------