Merge "playground: moving web profile and linux/arm cross-compilation third-party artifacts from the environment repository to the third-party repository"
diff --git a/client/Makefile b/client/Makefile
index 1ec34b4..417762a 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,5 +1,5 @@
PATH := bin:node_modules/.bin:$(PATH)
-PATH := $(PATH):$(V23_ROOT)/environment/cout/node/bin
+PATH := $(PATH):$(V23_ROOT)/third_party/cout/node/bin
SHELL := /bin/bash -euo pipefail
export GOPATH := $(V23_ROOT)/release/projects/playground/go:$(GOPATH)
export VDLPATH := $(GOPATH)
diff --git a/client/lib/shell/pg_test_util.sh b/client/lib/shell/pg_test_util.sh
index 8b9c4b4..a390da2 100755
--- a/client/lib/shell/pg_test_util.sh
+++ b/client/lib/shell/pg_test_util.sh
@@ -14,7 +14,7 @@
setup_environment() {
export GOPATH="$(pwd):$(v23 env GOPATH)"
export VDLPATH="$(pwd):$(v23 env VDLPATH)"
- export PATH="$(pwd):${shell_test_BIN_DIR}:${V23_ROOT}/environment/cout/node/bin:${PATH}"
+ export PATH="$(pwd):${shell_test_BIN_DIR}:${V23_ROOT}/third_party/cout/node/bin:${PATH}"
# We unset all environment variables that supply a principal in order to
# simulate production playground setup.
diff --git a/go/src/v.io/x/playground/Makefile b/go/src/v.io/x/playground/Makefile
index 80ec7cb..03b9fd3 100644
--- a/go/src/v.io/x/playground/Makefile
+++ b/go/src/v.io/x/playground/Makefile
@@ -1,5 +1,5 @@
PATH := bin:node_modules/.bin:$(PATH)
-PATH := $(PATH):$(V23_ROOT)/environment/cout/node/bin
+PATH := $(PATH):$(V23_ROOT)/third_party/cout/node/bin
PATH := $(V23_ROOT)/release/projects/playground/go/bin:$(PATH)
SHELL := /bin/bash -euo pipefail
export GOPATH := $(V23_ROOT)/release/projects/playground/go:$(GOPATH)
diff --git a/go/src/v.io/x/playground/playground_v23_test.go b/go/src/v.io/x/playground/playground_v23_test.go
index 7b03d13..8eb8577 100644
--- a/go/src/v.io/x/playground/playground_v23_test.go
+++ b/go/src/v.io/x/playground/playground_v23_test.go
@@ -26,7 +26,7 @@
if len(vanadiumRoot) == 0 {
panic("V23_ROOT must be set")
}
- nodejsRoot = filepath.Join(vanadiumRoot, "environment/cout/node/bin")
+ nodejsRoot = filepath.Join(vanadiumRoot, "third_party", "cout", "node", "bin")
}
func golist(i *v23tests.T, pkg string) string {
diff --git a/pgbundle/Makefile b/pgbundle/Makefile
index 5ae2f19..424da85 100644
--- a/pgbundle/Makefile
+++ b/pgbundle/Makefile
@@ -1,4 +1,4 @@
-PATH := $(PATH):$(V23_ROOT)/environment/cout/node/bin
+PATH := $(PATH):$(V23_ROOT)/third_party/cout/node/bin
SHELL := /bin/bash -euo pipefail
node_modules: package.json
