TBR playground: s/VANADIUM_ROOT/V23_ROOT/
MultiPart: 8/10
Change-Id: I1a5f67f7fe072c231486906fa59e426972ec7e3f
diff --git a/client/Makefile b/client/Makefile
index 3e46715..5b65b96 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,7 +1,7 @@
PATH := bin:node_modules/.bin:$(PATH)
-PATH := $(PATH):$(VANADIUM_ROOT)/environment/cout/node/bin
+PATH := $(PATH):$(V23_ROOT)/environment/cout/node/bin
SHELL := /bin/bash -euo pipefail
-export GOPATH := $(VANADIUM_ROOT)/release/projects/playground/go:$(GOPATH)
+export GOPATH := $(V23_ROOT)/release/projects/playground/go:$(GOPATH)
export VDLPATH := $(GOPATH)
js_files := $(shell find browser -name "*.js")
@@ -57,7 +57,7 @@
node_modules: package.json
@npm prune
# Temporary workaround: install pgbundle directly from source.
- @npm install $(VANADIUM_ROOT)/release/projects/playground/pgbundle
+ @npm install $(V23_ROOT)/release/projects/playground/pgbundle
@npm install
@touch $@
diff --git a/client/lib/shell/pg_test_util.sh b/client/lib/shell/pg_test_util.sh
index 2722adc..4aec0b2 100755
--- a/client/lib/shell/pg_test_util.sh
+++ b/client/lib/shell/pg_test_util.sh
@@ -17,7 +17,7 @@
setup_environment() {
export GOPATH="$(pwd):$(v23 env GOPATH)"
export VDLPATH="$(pwd):$(v23 env VDLPATH)"
- export PATH="$(pwd):${shell_test_BIN_DIR}:${VANADIUM_ROOT}/environment/cout/node/bin:${PATH}"
+ export PATH="$(pwd):${shell_test_BIN_DIR}:${V23_ROOT}/environment/cout/node/bin:${PATH}"
# We unset all environment variables that supply a principal in order to
# simulate production playground setup.
@@ -31,7 +31,7 @@
install_vanadium_js() {
# TODO(nlacasse): Once release/javascript/core is publicly available in npm, replace this
# with "npm install vanadium".
- npm install --production "${VANADIUM_ROOT}/release/javascript/core"
+ npm install --production "${V23_ROOT}/release/javascript/core"
}
# Installs the pgbundle tool.
diff --git a/go/src/playground/Dockerfile b/go/src/playground/Dockerfile
index 765c3f2..8af2303 100644
--- a/go/src/playground/Dockerfile
+++ b/go/src/playground/Dockerfile
@@ -13,10 +13,10 @@
ENV PATH /usr/local/go/bin:$PATH
ENV HOME /root
-ENV VANADIUM_ROOT /usr/local/vanadium
-ENV GOPATH $VANADIUM_ROOT/release/projects/playground/go
+ENV V23_ROOT /usr/local/vanadium
+ENV GOPATH $V23_ROOT/release/projects/playground/go
ENV VDLPATH $GOPATH
-ENV PATH $VANADIUM_ROOT/release/projects/playground/go/bin:$VANADIUM_ROOT/release/go/bin:$VANADIUM_ROOT/bin:$PATH
+ENV PATH $V23_ROOT/release/projects/playground/go/bin:$V23_ROOT/release/go/bin:$V23_ROOT/bin:$PATH
# Setup Vanadium.
# Note: This will be cached! If you want to re-build the docker image using
@@ -32,7 +32,7 @@
# NOTE(sadovsky): NPM is flaky. If any of the NPM commands below fail, simply
# retry them.
WORKDIR /home/playground
-RUN npm install --production $VANADIUM_ROOT/release/javascript/core
+RUN npm install --production $V23_ROOT/release/javascript/core
# Install Vanadium libraries and playground binaries.
RUN v23 go install -v v.io/...
@@ -41,13 +41,13 @@
# Uncomment the following lines to install a version of the builder tool using
# your local version of the code. This is useful when developing and testing
# local changes.
-#RUN rm -f $VANADIUM_ROOT/release/projects/playground/go/bin/builder
-#RUN rm -rf $VANADIUM_ROOT/release/projects/playground/go/src/playground/Makefile
-#RUN rm -rf $VANADIUM_ROOT/release/projects/playground/go/src/playground/builder/
-#RUN rm -rf $VANADIUM_ROOT/release/projects/playground/go/src/playground/lib/
-#ADD Makefile $VANADIUM_ROOT/release/projects/playground/go/src/playground/Makefile
-#ADD builder/ $VANADIUM_ROOT/release/projects/playground/go/src/playground/builder/
-#ADD lib/ $VANADIUM_ROOT/release/projects/playground/go/src/playground/lib/
+#RUN rm -f $V23_ROOT/release/projects/playground/go/bin/builder
+#RUN rm -rf $V23_ROOT/release/projects/playground/go/src/playground/Makefile
+#RUN rm -rf $V23_ROOT/release/projects/playground/go/src/playground/builder/
+#RUN rm -rf $V23_ROOT/release/projects/playground/go/src/playground/lib/
+#ADD Makefile $V23_ROOT/release/projects/playground/go/src/playground/Makefile
+#ADD builder/ $V23_ROOT/release/projects/playground/go/src/playground/builder/
+#ADD lib/ $V23_ROOT/release/projects/playground/go/src/playground/lib/
#RUN make builder
USER playground
diff --git a/go/src/playground/Makefile b/go/src/playground/Makefile
index abab1c3..b8d33f6 100644
--- a/go/src/playground/Makefile
+++ b/go/src/playground/Makefile
@@ -1,8 +1,8 @@
PATH := bin:node_modules/.bin:$(PATH)
-PATH := $(PATH):$(VANADIUM_ROOT)/environment/cout/node/bin
-PATH := $(VANADIUM_ROOT)/release/projects/playground/go/bin:$(PATH)
+PATH := $(PATH):$(V23_ROOT)/environment/cout/node/bin
+PATH := $(V23_ROOT)/release/projects/playground/go/bin:$(PATH)
SHELL := /bin/bash -euo pipefail
-export GOPATH := $(VANADIUM_ROOT)/release/projects/playground/go:$(GOPATH)
+export GOPATH := $(V23_ROOT)/release/projects/playground/go:$(GOPATH)
export VDLPATH := $(GOPATH)
host ?= 127.0.0.1
diff --git a/go/src/playground/README.md b/go/src/playground/README.md
index 2f21342..a838980 100644
--- a/go/src/playground/README.md
+++ b/go/src/playground/README.md
@@ -23,8 +23,8 @@
Build the playground Docker image (this will take a while...):
- $ cp ~/.netrc $VANADIUM_ROOT/release/projects/playground/go/src/playground/netrc
- $ docker build -t playground $VANADIUM_ROOT/release/projects/playground/go/src/playground/.
+ $ cp ~/.netrc $V23_ROOT/release/projects/playground/go/src/playground/netrc
+ $ docker build -t playground $V23_ROOT/release/projects/playground/go/src/playground/.
Note: If you want to ensure an up-to-date version of Vanadium is installed in
the Docker image, run the above command with the "--no-cache" flag.
@@ -42,22 +42,22 @@
Test your image (without running compilerd):
- $ cd $VANADIUM_ROOT/release/projects/playground/client && make src/example_bundles
- $ docker run -i playground < $VANADIUM_ROOT/release/projects/playground/client/bundles/fortune/bundle_js_go.json
+ $ cd $V23_ROOT/release/projects/playground/client && make src/example_bundles
+ $ docker run -i playground < $V23_ROOT/release/projects/playground/client/bundles/fortune/bundle_js_go.json
## Running the playground server (compilerd)
Install the playground binaries:
- $ GOPATH=$VANADIUM_ROOT/release/projects/playground/go v23 go install playground/...
+ $ GOPATH=$V23_ROOT/release/projects/playground/go v23 go install playground/...
Run the compiler binary:
- $ $VANADIUM_ROOT/release/projects/playground/go/bin/compilerd --listen-timeout=0 --address=localhost:8181
+ $ $V23_ROOT/release/projects/playground/go/bin/compilerd --listen-timeout=0 --address=localhost:8181
Or, run it without Docker (for faster iterations during development):
- $ PATH=$VANADIUM_ROOT/release/go/bin:$VANADIUM_ROOT/release/projects/playground/go/bin:$PATH compilerd --listen-timeout=0 --address=localhost:8181 --use-docker=false
+ $ PATH=$V23_ROOT/release/go/bin:$V23_ROOT/release/projects/playground/go/bin:$PATH compilerd --listen-timeout=0 --address=localhost:8181 --use-docker=false
The server should now be running at http://localhost:8181 and responding to
compile requests at http://localhost:8181/compile.
diff --git a/go/src/playground/compilerd/jobqueue/jobqueue_test.go b/go/src/playground/compilerd/jobqueue/jobqueue_test.go
index f5bfd44..4619318 100644
--- a/go/src/playground/compilerd/jobqueue/jobqueue_test.go
+++ b/go/src/playground/compilerd/jobqueue/jobqueue_test.go
@@ -27,7 +27,7 @@
func init() {
// Compile builder binary and put in path.
- pgDir := os.ExpandEnv("${VANADIUM_ROOT}/release/projects/playground/go")
+ pgDir := os.ExpandEnv("${V23_ROOT}/release/projects/playground/go")
cmd := exec.Command("make", "builder")
cmd.Dir = path.Join(pgDir, "src", "playground")
diff --git a/go/src/playground/playground_v23_test.go b/go/src/playground/playground_v23_test.go
index f105a00..c1fde73 100644
--- a/go/src/playground/playground_v23_test.go
+++ b/go/src/playground/playground_v23_test.go
@@ -22,9 +22,9 @@
)
func init() {
- vanadiumRoot = os.Getenv("VANADIUM_ROOT")
+ vanadiumRoot = os.Getenv("V23_ROOT")
if len(vanadiumRoot) == 0 {
- panic("VANADIUM_ROOT must be set")
+ panic("V23_ROOT must be set")
}
nodejsRoot = filepath.Join(vanadiumRoot, "environment/cout/node/bin")
}
diff --git a/pgbundle/Makefile b/pgbundle/Makefile
index e0b5132..5ae2f19 100644
--- a/pgbundle/Makefile
+++ b/pgbundle/Makefile
@@ -1,4 +1,4 @@
-PATH := $(PATH):$(VANADIUM_ROOT)/environment/cout/node/bin
+PATH := $(PATH):$(V23_ROOT)/environment/cout/node/bin
SHELL := /bin/bash -euo pipefail
node_modules: package.json
