Rename output/ directory to _output/

go build ./... will ignore any directory starting with an underscore.
This commit is contained in:
Joe Beda
2014-08-29 13:51:16 -07:00
parent c5520dd39d
commit 843ae1fbe2
20 changed files with 53 additions and 50 deletions

View File

@@ -108,7 +108,7 @@ KUBE_REPO_ROOT=$(
)
export KUBE_REPO_ROOT
KUBE_TARGET="${KUBE_REPO_ROOT}/output/go"
KUBE_TARGET="${KUBE_REPO_ROOT}/_output/go"
mkdir -p "${KUBE_TARGET}"
export KUBE_TARGET
@@ -116,7 +116,7 @@ KUBE_GO_PACKAGE=github.com/GoogleCloudPlatform/kubernetes
export KUBE_GO_PACKAGE
(
# Create symlink named ${KUBE_GO_PACKAGE} under output/go/src.
# Create symlink named ${KUBE_GO_PACKAGE} under _output/go/src.
# So that Go knows how to import Kubernetes sources by full path.
# Use a subshell to avoid leaking these variables.

View File

@@ -41,7 +41,7 @@ API_PORT=${API_PORT:-8080}
API_HOST=${API_HOST:-127.0.0.1}
KUBELET_PORT=${KUBELET_PORT:-10250}
GO_OUT=$(dirname $0)/../output/go/bin
GO_OUT=$(dirname $0)/../_output/go/bin
APISERVER_LOG=/tmp/apiserver.log
"${GO_OUT}/apiserver" \

View File

@@ -44,7 +44,7 @@ ETCD_PORT=${ETCD_PORT:-4001}
API_PORT=${API_PORT:-8080}
API_HOST=${API_HOST:-127.0.0.1}
KUBELET_PORT=${KUBELET_PORT:-10250}
GO_OUT=$(dirname $0)/../output/go/bin
GO_OUT=$(dirname $0)/../_output/go/bin
# Check kubecfg
out=$(${GO_OUT}/kubecfg -version)

View File

@@ -31,6 +31,7 @@ find_test_dirs() {
find . -not \( \
\( \
-wholename './output' \
-o -wholename './_output' \
-o -wholename './release' \
-o -wholename './target' \
-o -wholename '*/third_party/*' \

View File

@@ -43,7 +43,7 @@ trap "echo etcd still running" EXIT
echo
echo Integration scenario ...
echo
$(dirname $0)/../output/go/bin/integration
$(dirname $0)/../_output/go/bin/integration
# nuke etcd
trap cleanup EXIT SIGINT

View File

@@ -18,7 +18,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../" && pwd -P)"
result=0
gofiles="$(find ${REPO_ROOT} -type f | grep "[.]go$" | grep -v "Godeps/\|third_party/\|release/\|output/\|target/")"
gofiles="$(find ${REPO_ROOT} -type f | grep "[.]go$" | grep -v "Godeps/\|third_party/\|release/\|_?output/|target/")"
for file in ${gofiles}; do
if [[ "$(${REPO_ROOT}/hooks/boilerplate.sh "${file}")" -eq "0" ]]; then
echo "Boilerplate header is wrong for: ${file}"

View File

@@ -26,7 +26,7 @@ fi
REPO_ROOT="$(cd "$(dirname "$0")/../" && pwd -P)"
files="$(find ${REPO_ROOT} -type f | grep "[.]go$" | grep -v "third_party/\|release/\|output/\|target/\|Godeps/")"
files="$(find ${REPO_ROOT} -type f | grep "[.]go$" | grep -v "third_party/\|release/\|_?output/\|target/\|Godeps/")"
bad=$(gofmt -s -l ${files})
if [[ -n "${bad}" ]]; then
echo "$bad"