Commit d230625e authored by Joe Beda's avatar Joe Beda

Move third_party code under third_party/src so it can be used in $GOPATH.

parent a40529b3
...@@ -53,7 +53,7 @@ KUBE_GO_PACKAGE_DIR="${GOPATH}/src/${KUBE_GO_PACKAGE}" ...@@ -53,7 +53,7 @@ KUBE_GO_PACKAGE_DIR="${GOPATH}/src/${KUBE_GO_PACKAGE}"
fi fi
rm "${PACKAGE_DIR}" >/dev/null 2>&1 || true rm "${PACKAGE_DIR}" >/dev/null 2>&1 || true
ln -s "${THIRD_PARTY_BASE}/${p}" "${PACKAGE_DIR}" ln -s "${THIRD_PARTY_BASE}/src/${p}" "${PACKAGE_DIR}"
done done
for p in ${PACKAGES}; do for p in ${PACKAGES}; do
......
#!/bin/bash #!/bin/bash
errors=0 errors=0
for file in $(git diff --cached --name-only | grep "\.go"); do for file in $(git diff --cached --name-only --diff-filter ACM | grep "\.go" | grep -v "third_party"); do
diff="$(git show ":${file}" | gofmt -s -d)" diff="$(git show ":${file}" | gofmt -s -d)"
if [[ -n "$diff" ]]; then if [[ -n "$diff" ]]; then
echo "# *** ERROR: *** File ${file} has not been gofmt'd." >> $1 echo "# *** ERROR: *** File ${file} has not been gofmt'd." >> $1
......
...@@ -40,7 +40,7 @@ mkdir -p $MASTER_RELEASE_DIR/third_party/go ...@@ -40,7 +40,7 @@ mkdir -p $MASTER_RELEASE_DIR/third_party/go
echo "Building release tree" echo "Building release tree"
cp release/master-release-install.sh $MASTER_RELEASE_DIR/src/scripts/master-release-install.sh cp release/master-release-install.sh $MASTER_RELEASE_DIR/src/scripts/master-release-install.sh
cp -r cluster/saltbase $MASTER_RELEASE_DIR/src/saltbase cp -r cluster/saltbase $MASTER_RELEASE_DIR/src/saltbase
cp -r third_party $MASTER_RELEASE_DIR/third_party/go/src cp -r third_party/src $MASTER_RELEASE_DIR/third_party/go/src
function find_go_files() { function find_go_files() {
find * -not \( \ find * -not \( \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment