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/24 20:56:16 UTC
[05/13] incubator-trafficcontrol git commit: Replaced vendored
traffic_ops with a symlink.
Replaced vendored traffic_ops with a symlink.
Depending on how people configure their gopath, the previous vendored
directory could have allowed builds to use an out-dated version of
traffic_ops/client.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/283d0dbf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/283d0dbf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/283d0dbf
Branch: refs/heads/master
Commit: 283d0dbfb4424fcb0b227c2e127d2aed5b78f368
Parents: d969e13
Author: Chris Lemmons <al...@gmail.com>
Authored: Thu Jan 19 14:20:22 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jan 24 13:55:18 2017 -0700
----------------------------------------------------------------------
traffic_stats/build/build_rpm.sh | 4 +-
traffic_stats/build/traffic_stats.spec | 10 +-
.../incubator-trafficcontrol/traffic_ops/client | 1 +
.../traffic_ops/client/cachegroup.go | 52 ----
.../traffic_ops/client/cdn.go | 66 ----
.../traffic_ops/client/crconfig.go | 30 --
.../traffic_ops/client/delivery_service.go | 189 ------------
.../client/delivery_service_endpoints.go | 59 ----
.../client/delivery_service_resources.go | 227 --------------
.../traffic_ops/client/fixtures/cachegroup.go | 35 ---
.../traffic_ops/client/fixtures/cdn.go | 31 --
.../client/fixtures/delivery_service.go | 210 -------------
.../traffic_ops/client/fixtures/hardware.go | 40 ---
.../traffic_ops/client/fixtures/parameter.go | 32 --
.../traffic_ops/client/fixtures/profile.go | 32 --
.../traffic_ops/client/fixtures/server.go | 151 ---------
.../client/fixtures/stats_summary.go | 33 --
.../client/fixtures/traffic_monitor_config.go | 116 -------
.../client/fixtures/traffic_router_config.go | 162 ----------
.../traffic_ops/client/fixtures/types.go | 32 --
.../traffic_ops/client/fixtures/user.go | 34 ---
.../traffic_ops/client/hardware.go | 54 ----
.../traffic_ops/client/parameter.go | 51 ----
.../traffic_ops/client/profile.go | 48 ---
.../traffic_ops/client/server.go | 138 ---------
.../traffic_ops/client/stats_summary.go | 126 --------
.../client/traffic_monitor_config.go | 161 ----------
.../traffic_ops/client/traffic_ops.go | 305 -------------------
.../traffic_ops/client/traffic_router_config.go | 236 --------------
.../traffic_ops/client/type.go | 68 -----
.../traffic_ops/client/user.go | 56 ----
31 files changed, 4 insertions(+), 2785 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/283d0dbf/traffic_stats/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_stats/build/build_rpm.sh b/traffic_stats/build/build_rpm.sh
index 5f9f81d..d4f6bff 100755
--- a/traffic_stats/build/build_rpm.sh
+++ b/traffic_stats/build/build_rpm.sh
@@ -37,12 +37,12 @@ function initBuildArea() {
local ts_dest=$(createSourceDir traffic_stats)
cd "$TS_DIR" || \
{ echo "Could not cd to $TS_DIR: $?"; exit 1; }
- rsync -av ./ "$ts_dest"/ || \
+ rsync -aLv ./ "$ts_dest"/ || \
{ echo "Could not copy to $ts_dest: $?"; exit 1; }
cp "$TS_DIR"/build/*.spec "$RPMBUILD"/SPECS/. || \
{ echo "Could not copy spec files: $?"; exit 1; }
- cp -r "$TS_DIR"/ "$ts_dest" || { echo "Could not copy $TS_DIR to $ts_dest: $?"; exit 1; }
+ cp -L -r "$TS_DIR"/ "$ts_dest" || { echo "Could not copy $TS_DIR to $ts_dest: $?"; exit 1; }
tar -czvf "$ts_dest".tgz -C "$RPMBUILD"/SOURCES $(basename $ts_dest) || { echo "Could not create tar archive $ts_dest.tgz: $?"; exit 1; }
cp "$TS_DIR"/build/*.spec "$RPMBUILD"/SPECS/. || { echo "Could not copy spec files: $?"; exit 1; }
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/283d0dbf/traffic_stats/build/traffic_stats.spec
----------------------------------------------------------------------
diff --git a/traffic_stats/build/traffic_stats.spec b/traffic_stats/build/traffic_stats.spec
index 24f75d5..b6b28df 100644
--- a/traffic_stats/build/traffic_stats.spec
+++ b/traffic_stats/build/traffic_stats.spec
@@ -51,20 +51,12 @@ go_get_version() {
)
}
-# get traffic_ops client
-godir=src/github.com/apache/incubator-trafficcontrol/traffic_ops/client
-( mkdir -p "$godir" && \
- cd "$godir" && \
- cp -r "$TC_DIR"/traffic_ops/client/* . && \
- go get -v \
-) || { echo "Could not build go program at $(pwd): $!"; exit 1; }
-
#get traffic_stats client
godir=src/github.com/apache/incubator-trafficcontrol/traffic_stats
oldpwd=$(pwd)
( mkdir -p "$godir" && \
cd "$godir" && \
- cp -r "$TC_DIR"/traffic_stats/* . && \
+ cp -L -r "$TC_DIR"/traffic_stats/* . && \
go get -d -v && \
go install -v \
) || { echo "Could not build go program at $(pwd): $!"; exit 1; }