TBR: playground: Replace V23_ROOT with JIRI_ROOT everywhere.
MultiPart: 19/23
Change-Id: I1525e96a8794a0903b7451ecc404928465e6d735
diff --git a/client/Makefile b/client/Makefile
index 37ddc20..46b29de 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,5 +1,5 @@
PATH := bin:node_modules/.bin:$(PATH)
-PATH := $(PATH):$(V23_ROOT)/third_party/cout/node/bin
+PATH := $(PATH):$(JIRI_ROOT)/third_party/cout/node/bin
SHELL := /bin/bash -euo pipefail
js_files := $(shell find browser -name "*.js")
@@ -17,11 +17,11 @@
.PHONY: deploy-production
deploy-production: all
- make -C $(V23_ROOT)/infrastructure/deploy playground-production
+ make -C $(JIRI_ROOT)/infrastructure/deploy playground-production
.PHONY: deploy-staging
deploy-staging: all
- make -C $(V23_ROOT)/infrastructure/deploy playground-staging
+ make -C $(JIRI_ROOT)/infrastructure/deploy playground-staging
public/bundle.js: browser/index.js $(js_files) node_modules
browserify --debug $< 1> $@
diff --git a/go/src/v.io/x/playground/Dockerfile b/go/src/v.io/x/playground/Dockerfile
index db06d5f..5341ca3 100644
--- a/go/src/v.io/x/playground/Dockerfile
+++ b/go/src/v.io/x/playground/Dockerfile
@@ -11,10 +11,10 @@
ENV PATH /usr/local/go/bin:$PATH
ENV HOME /root
-ENV V23_ROOT /usr/local/vanadium
-ENV GOPATH $V23_ROOT/release/projects/playground/go
-ENV VDLPATH $V23_ROOT/release/projects/playground/go/src
-ENV PATH $V23_ROOT/release/projects/playground/go/bin:$V23_ROOT/release/go/bin:$V23_ROOT/devtools/bin:$PATH
+ENV JIRI_ROOT /usr/local/vanadium
+ENV GOPATH $JIRI_ROOT/release/projects/playground/go
+ENV VDLPATH $JIRI_ROOT/release/projects/playground/go/src
+ENV PATH $JIRI_ROOT/release/projects/playground/go/bin:$JIRI_ROOT/release/go/bin:$JIRI_ROOT/devtools/bin:$PATH
# Setup Vanadium.
# Note: This will be cached! If you want to re-build the docker image using
@@ -30,7 +30,7 @@
# NOTE(sadovsky): NPM is flaky. If any of the NPM commands below fail, simply
# retry them.
WORKDIR /home/playground
-RUN npm install --production $V23_ROOT/release/javascript/core
+RUN npm install --production $JIRI_ROOT/release/javascript/core
# Install Vanadium libraries and playground binaries.
RUN v23 go install -a -tags wspr -v v.io/x/ref/services/wspr/...
@@ -39,13 +39,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 $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 rm -f $JIRI_ROOT/release/projects/playground/go/bin/builder
+#RUN rm -rf $JIRI_ROOT/release/projects/playground/go/src/playground/Makefile
+#RUN rm -rf $JIRI_ROOT/release/projects/playground/go/src/playground/builder/
+#RUN rm -rf $JIRI_ROOT/release/projects/playground/go/src/playground/lib/
+#ADD Makefile $JIRI_ROOT/release/projects/playground/go/src/playground/Makefile
+#ADD builder/ $JIRI_ROOT/release/projects/playground/go/src/playground/builder/
+#ADD lib/ $JIRI_ROOT/release/projects/playground/go/src/playground/lib/
#RUN make builder
USER playground
diff --git a/go/src/v.io/x/playground/Makefile b/go/src/v.io/x/playground/Makefile
index 5572cfe..9350c6b 100644
--- a/go/src/v.io/x/playground/Makefile
+++ b/go/src/v.io/x/playground/Makefile
@@ -1,7 +1,7 @@
-PATH := $(V23_ROOT)/release/projects/playground/go/bin:$(PATH)
+PATH := $(JIRI_ROOT)/release/projects/playground/go/bin:$(PATH)
SHELL := /bin/bash -euo pipefail
-export GOPATH := $(V23_ROOT)/release/projects/playground/go:$(GOPATH)
-export VDLPATH := $(V23_ROOT)/release/projects/playground/go/src:$(VDLPATH)
+export GOPATH := $(JIRI_ROOT)/release/projects/playground/go:$(GOPATH)
+export VDLPATH := $(JIRI_ROOT)/release/projects/playground/go/src:$(VDLPATH)
host ?= 127.0.0.1
port ?= 8181
diff --git a/go/src/v.io/x/playground/README.md b/go/src/v.io/x/playground/README.md
index a26c74f..27f0fb9 100644
--- a/go/src/v.io/x/playground/README.md
+++ b/go/src/v.io/x/playground/README.md
@@ -23,8 +23,8 @@
Build the playground Docker image (this will take a while...):
- $ cp ~/.netrc $V23_ROOT/release/projects/playground/go/src/v.io/x/playground/netrc
- $ docker build -t playground $V23_ROOT/release/projects/playground/go/src/v.io/x/playground/.
+ $ cp ~/.netrc $JIRI_ROOT/release/projects/playground/go/src/v.io/x/playground/netrc
+ $ docker build -t playground $JIRI_ROOT/release/projects/playground/go/src/v.io/x/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):
- $ $V23_ROOT/release/projects/playground/go/bin/pgadmin bundle make fortune js-go | docker run -i playground
+ $ $JIRI_ROOT/release/projects/playground/go/bin/pgadmin bundle make fortune js-go | docker run -i playground
## Running the playground server (compilerd)
Install the playground binaries:
- $ GOPATH=$V23_ROOT/release/projects/playground/go v23 go install v.io/x/playground/...
+ $ GOPATH=$JIRI_ROOT/release/projects/playground/go v23 go install v.io/x/playground/...
Run the compilerd binary:
- $ $V23_ROOT/release/projects/playground/go/bin/compilerd --listen-timeout=0 --address=localhost:8181 --origin='*'
+ $ $JIRI_ROOT/release/projects/playground/go/bin/compilerd --listen-timeout=0 --address=localhost:8181 --origin='*'
Or, run it without Docker (for faster iterations during development):
- $ PATH=$V23_ROOT/release/go/bin:$V23_ROOT/release/projects/playground/go/bin:$PATH compilerd --listen-timeout=0 --address=localhost:8181 --origin='*' --use-docker=false
+ $ PATH=$JIRI_ROOT/release/go/bin:$JIRI_ROOT/release/projects/playground/go/bin:$PATH compilerd --listen-timeout=0 --address=localhost:8181 --origin='*' --use-docker=false
The server should now be running at http://localhost:8181 and responding to
compile requests at http://localhost:8181/compile.
@@ -114,7 +114,7 @@
Run the tests:
- $ GOPATH=$V23_ROOT/release/projects/playground/go v23 go test v.io/x/playground/compilerd/...
+ $ GOPATH=$JIRI_ROOT/release/projects/playground/go v23 go test v.io/x/playground/compilerd/...
# Database migrations
@@ -128,7 +128,7 @@
To migrate up, first run with -n (dry run):
- $ $V23_ROOT/release/projects/playground/go/bin/pgadmin -sqlconf=./config/db.json migrate up -n
+ $ $JIRI_ROOT/release/projects/playground/go/bin/pgadmin -sqlconf=./config/db.json migrate up -n
If everything looks good, run the same command without -n; alternatively, run:
@@ -136,11 +136,11 @@
You can undo the last migration with:
- $ $V23_ROOT/release/projects/playground/go/bin/pgadmin -sqlconf=./config/db.json migrate down -limit=1
+ $ $JIRI_ROOT/release/projects/playground/go/bin/pgadmin -sqlconf=./config/db.json migrate down -limit=1
For more options and infomation, run:
- $ $V23_ROOT/release/projects/playground/go/bin/pgadmin help
+ $ $JIRI_ROOT/release/projects/playground/go/bin/pgadmin help
and see https://github.com/rubenv/sql-migrate
@@ -175,7 +175,7 @@
Bundling and loading the examples into a fresh database, as well as updating,
is handled by the `pgadmin` tool:
- $ $V23_ROOT/release/projects/playground/go/bin/pgadmin -sqlconf=./config/db.json bundle bootstrap
+ $ $JIRI_ROOT/release/projects/playground/go/bin/pgadmin -sqlconf=./config/db.json bundle bootstrap
Or simply:
@@ -185,4 +185,4 @@
`bundles/config.json` must also be edited to include them in bootstrapping and
tests. For config file format documentation, see:
- $ $V23_ROOT/release/projects/playground/go/bin/pgadmin bundle help bootstrap
+ $ $JIRI_ROOT/release/projects/playground/go/bin/pgadmin bundle help bootstrap
diff --git a/go/src/v.io/x/playground/builder/builder_v23_test.go b/go/src/v.io/x/playground/builder/builder_v23_test.go
index ccdd8df..26a289f 100644
--- a/go/src/v.io/x/playground/builder/builder_v23_test.go
+++ b/go/src/v.io/x/playground/builder/builder_v23_test.go
@@ -24,9 +24,9 @@
)
func initTest(i *v23tests.T) (builder *v23tests.Binary) {
- vanadiumRoot = os.Getenv("V23_ROOT")
+ vanadiumRoot = os.Getenv("JIRI_ROOT")
if len(vanadiumRoot) == 0 {
- i.Fatal("V23_ROOT must be set")
+ i.Fatal("JIRI_ROOT must be set")
}
nodejsRoot = filepath.Join(vanadiumRoot, "third_party", "cout", "node", "bin")
diff --git a/go/src/v.io/x/playground/compilerd/jobqueue/jobqueue_test.go b/go/src/v.io/x/playground/compilerd/jobqueue/jobqueue_test.go
index 0a17ab5..43b2983 100644
--- a/go/src/v.io/x/playground/compilerd/jobqueue/jobqueue_test.go
+++ b/go/src/v.io/x/playground/compilerd/jobqueue/jobqueue_test.go
@@ -27,7 +27,7 @@
func init() {
// Compile builder binary and put in path.
- pgDir := os.ExpandEnv("${V23_ROOT}/release/projects/playground/go")
+ pgDir := os.ExpandEnv("${JIRI_ROOT}/release/projects/playground/go")
cmd := exec.Command("make", "builder")
cmd.Dir = path.Join(pgDir, "src", "v.io", "x", "playground")
diff --git a/go/src/v.io/x/playground/pgadmin/bundle.go b/go/src/v.io/x/playground/pgadmin/bundle.go
index e0d9a79..41d2762 100644
--- a/go/src/v.io/x/playground/pgadmin/bundle.go
+++ b/go/src/v.io/x/playground/pgadmin/bundle.go
@@ -64,7 +64,7 @@
}
const (
- defaultBundleCfg = "${V23_ROOT}/release/projects/playground/go/src/v.io/x/playground/bundles/config.json"
+ defaultBundleCfg = "${JIRI_ROOT}/release/projects/playground/go/src/v.io/x/playground/bundles/config.json"
)
var (
diff --git a/go/src/v.io/x/playground/pgadmin/migrate.go b/go/src/v.io/x/playground/pgadmin/migrate.go
index 1542791..a72c872 100644
--- a/go/src/v.io/x/playground/pgadmin/migrate.go
+++ b/go/src/v.io/x/playground/pgadmin/migrate.go
@@ -63,7 +63,7 @@
const (
migrationsTable = "migrations"
sqlDialect = "mysql"
- pgMigrationsDir = "${V23_ROOT}/release/projects/playground/go/src/v.io/x/playground/migrations"
+ pgMigrationsDir = "${JIRI_ROOT}/release/projects/playground/go/src/v.io/x/playground/migrations"
)
var (
