Merge "TBR: todos: Replace V23_ROOT with JIRI_ROOT everywhere."
diff --git a/Makefile b/Makefile
index 3b01572..7cce5a0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
SHELL := /bin/bash -euo pipefail
-# Add $V23_ROOT/devtools/bin to PATH in case the user hasn't done so in their
+# Add $JIRI_ROOT/devtools/bin to PATH in case the user hasn't done so in their
# ~/.bashrc.
-export PATH := node_modules/.bin:$(V23_ROOT)/devtools/bin:$(V23_ROOT)/release/go/bin:$(V23_ROOT)/third_party/cout/node/bin:$(PATH)
+export PATH := node_modules/.bin:$(JIRI_ROOT)/devtools/bin:$(JIRI_ROOT)/release/go/bin:$(JIRI_ROOT)/third_party/cout/node/bin:$(PATH)
# Default browserify options: use sourcemaps.
BROWSERIFY_OPTS := --debug
@@ -18,7 +18,7 @@
# https://github.com/substack/node-browserify/issues/431
INCREASE_FILE_DESC := ulimit -S -n 2560
-# If NOFIND is set, assume that files under V23_ROOT are static. This reduces
+# If NOFIND is set, assume that files under JIRI_ROOT are static. This reduces
# build time dramatically.
ifdef NOFIND
FIND := true
@@ -43,7 +43,7 @@
.DELETE_ON_ERROR:
# Builds mounttabled, principal, and syncbased.
-bin: $(shell $(FIND) $(V23_ROOT) -name "*.go") | env-check
+bin: $(shell $(FIND) $(JIRI_ROOT) -name "*.go") | env-check
v23 go build -a -o $@/mounttabled v.io/x/ref/services/mounttable/mounttabled
v23 go build -a -o $@/principal v.io/x/ref/cmd/principal
v23 go build -a -o $@/syncbased v.io/x/ref/services/syncbase/syncbased
@@ -54,16 +54,16 @@
./bin/principal seekblessings --v23.credentials creds
touch $@
-node_modules: package.json $(shell $(FIND) $(V23_ROOT)/release/javascript/syncbase/{package.json,src} $(V23_ROOT)/release/javascript/core/{package.json,src}) | env-check
+node_modules: package.json $(shell $(FIND) $(JIRI_ROOT)/release/javascript/syncbase/{package.json,src} $(JIRI_ROOT)/release/javascript/core/{package.json,src}) | env-check
npm prune
npm install
-# Link the vanadium and syncbase modules from V23_ROOT.
+# Link the vanadium and syncbase modules from JIRI_ROOT.
rm -rf ./node_modules/{vanadium,syncbase}
- cd "$(V23_ROOT)/release/javascript/core" && npm link
+ cd "$(JIRI_ROOT)/release/javascript/core" && npm link
npm link vanadium
# Note, we run "make node_modules" in the JS syncbase repo to ensure that the
# vanadium module is linked there.
- cd "$(V23_ROOT)/release/javascript/syncbase" && make node_modules && npm link
+ cd "$(JIRI_ROOT)/release/javascript/syncbase" && make node_modules && npm link
npm link syncbase
# Note, browserify 10.2.5 and up will share the vanadium module instance between
# todosapp and syncbase, since their node_modules symlinks point to a common
@@ -93,8 +93,8 @@
.PHONY: env-check
env-check:
-ifndef V23_ROOT
- $(error V23_ROOT is not set. Please install Vanadium per the contributor instructions)
+ifndef JIRI_ROOT
+ $(error JIRI_ROOT is not set. Please install Vanadium per the contributor instructions)
endif
.PHONY: clean
diff --git a/README.md b/README.md
index 49ea90e..8d65643 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
that you've installed the [Vanadium Chrome extension][crx].
The commands below assume that the current working directory is
-`$V23_ROOT/release/projects/todos`.
+`$JIRI_ROOT/release/projects/todos`.
First, build all necessary binaries.
@@ -108,28 +108,28 @@
Signature
- $V23_ROOT/release/go/bin/vrpc -v23.credentials=creds signature /localhost:4002
+ $JIRI_ROOT/release/go/bin/vrpc -v23.credentials=creds signature /localhost:4002
Method call
- $V23_ROOT/release/go/bin/vrpc -v23.credentials=creds call /localhost:4002 GetPermissions
- $V23_ROOT/release/go/bin/vrpc -v23.credentials=creds call /localhost:4002/todos/db/tb Scan '""' '""'
+ $JIRI_ROOT/release/go/bin/vrpc -v23.credentials=creds call /localhost:4002 GetPermissions
+ $JIRI_ROOT/release/go/bin/vrpc -v23.credentials=creds call /localhost:4002/todos/db/tb Scan '""' '""'
Glob
- $V23_ROOT/release/go/bin/namespace -v23.credentials=creds glob "/localhost:4002/..."
+ $JIRI_ROOT/release/go/bin/namespace -v23.credentials=creds glob "/localhost:4002/..."
Debug
- $V23_ROOT/release/go/bin/debug -v23.credentials=creds glob "/localhost:4002/__debug/stats/rpc/server/routing-id/..."
- $V23_ROOT/release/go/bin/debug -v23.credentials=creds stats read "/localhost:4002/__debug/stats/rpc/server/routing-id/c61964ab4c72ee522067eb6d5ddd22fc/methods/BeginBatch/latency-ms"
+ $JIRI_ROOT/release/go/bin/debug -v23.credentials=creds glob "/localhost:4002/__debug/stats/rpc/server/routing-id/..."
+ $JIRI_ROOT/release/go/bin/debug -v23.credentials=creds stats read "/localhost:4002/__debug/stats/rpc/server/routing-id/c61964ab4c72ee522067eb6d5ddd22fc/methods/BeginBatch/latency-ms"
### Integration test setup
For debugging performance issues, it can be helpful to use the JS integration
test configuration. To do so, first run the integration test as follows.
- cd $V23_ROOT/release/javascript/syncbase
+ cd $JIRI_ROOT/release/javascript/syncbase
NOQUIT=1 NOHEADLESS=1 make test-integration-browser
This command starts a local mount table, identityd, and Syncbase mounted at
@@ -140,7 +140,7 @@
particular the mount table endpoint, `V23_NAMESPACE`. Glob the locally mounted
syncbase as follows.
- $V23_ROOT/release/go/bin/namespace -v23.credentials=/usr/local/google/home/sadovsky/vanadium/release/javascript/syncbase/tmp/test-credentials glob "/@5@ws@127.0.0.1:41249@7d24de5a57f6532b184562654ad2c554@m@test/child@@/test/syncbased/..."
+ $JIRI_ROOT/release/go/bin/namespace -v23.credentials=/usr/local/google/home/sadovsky/vanadium/release/javascript/syncbase/tmp/test-credentials glob "/@5@ws@127.0.0.1:41249@7d24de5a57f6532b184562654ad2c554@m@test/child@@/test/syncbased/..."
Visit `http://localhost:4000/?d=syncbase&sb=test/syncbased` in the launched
Chrome instance to talk to your test syncbase.
diff --git a/demo.md b/demo.md
index c7e078b..e1b0200 100644
--- a/demo.md
+++ b/demo.md
@@ -8,7 +8,7 @@
that you've installed the [Vanadium Chrome extension][crx].
The commands below assume that the current working directory is
-`$V23_ROOT/release/projects/todos`.
+`$JIRI_ROOT/release/projects/todos`.
For detailed explanations of the app setup steps, see [README.md](README.md).
