You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2017/01/09 20:21:01 UTC

[1/2] incubator-trafficcontrol git commit: tar ball dir name is "trafficcontrol-incubating-"

Repository: incubator-trafficcontrol
Updated Branches:
  refs/heads/1.8.x a229af97c -> 2f202a49d


tar ball dir name is "trafficcontrol-incubating-<version>"

(cherry picked from commit 32e33d66d0d77e5dbe2b955d4d08bbcdc70b20b8)


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/2f202a49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/2f202a49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/2f202a49

Branch: refs/heads/1.8.x
Commit: 2f202a49d8482ec2fb7700a5ec34c5d7c1adf145
Parents: fee4216
Author: Dan Kirkwood <da...@gmail.com>
Authored: Mon Jan 9 09:02:30 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Jan 9 13:20:53 2017 -0700

----------------------------------------------------------------------
 build/functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2f202a49/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index fa8c153..8cbdbd5 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -159,7 +159,7 @@ function buildRpm () {
 # ---------------------------------------
 function createTarball() {
 	local projDir=$(cd "$1"; pwd)
-	local projName=incubating-trafficcontrol
+	local projName=trafficcontrol-incubating
 	local version=$(getVersion "$TC_DIR")
 	local tarball="dist/$projName-$version.tar.gz"
 
@@ -168,7 +168,7 @@ function createTarball() {
         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/@" $(git ls-files)
+        tar -czf "$tarball" -C "$bndir" BUILD_NUMBER -C "$projDir" --exclude-vcs --transform "s@^@$projName-$version/@" $(git ls-files)
         rm -r "$bndir"
         echo "$tarball"
 }


[2/2] incubator-trafficcontrol git commit: use "incubating" in tarball name

Posted by da...@apache.org.
use "incubating" in tarball name

(cherry picked from commit 1a932fbd254d0281f8833cb6804394c32f8f877d)


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/fee42163
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/fee42163
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/fee42163

Branch: refs/heads/1.8.x
Commit: fee421633c91742d1ccdf990bd6fac80357aa12c
Parents: a229af9
Author: Dan Kirkwood <da...@gmail.com>
Authored: Mon Jan 9 08:51:24 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Jan 9 13:20:53 2017 -0700

----------------------------------------------------------------------
 build/functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fee42163/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index 816d4c1..fa8c153 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -159,7 +159,7 @@ function buildRpm () {
 # ---------------------------------------
 function createTarball() {
 	local projDir=$(cd "$1"; pwd)
-	local projName=incubation-trafficcontrol
+	local projName=incubating-trafficcontrol
 	local version=$(getVersion "$TC_DIR")
 	local tarball="dist/$projName-$version.tar.gz"