TBR chat: s/VANADIUM_ROOT/V23_ROOT/
MultiPart: 6/10
Change-Id: I61eeb0a1dad768549c7eaff1a69b458679ed497d
diff --git a/Makefile b/Makefile
index c26dd67..72d9902 100644
--- a/Makefile
+++ b/Makefile
@@ -3,27 +3,27 @@
export GOPATH := $(shell pwd)/clients/shell:$(GOPATH)
export VDLPATH := $(GOPATH)
-# Don't use VANADIUM_ROOT if NO_VANADIUM_ROOT is set.
-# This is equivalent to "VANADIUM_ROOT= make ..."
-ifdef NO_VANADIUM_ROOT
- VANADIUM_ROOT :=
+# Don't use V23_ROOT if NO_V23_ROOT is set.
+# This is equivalent to "V23_ROOT= make ..."
+ifdef NO_V23_ROOT
+ V23_ROOT :=
endif
-# If VANADIUM_ROOT is defined, we should compile/build our clients against the
+# If V23_ROOT is defined, we should compile/build our clients against the
# code there. This allows us to test our clients againts the current code, and
# simplifies debugging. In order to make this work, we must change our PATHs
-# and go compiler depending on whether VANADIUM_ROOT is set.
-ifdef VANADIUM_ROOT
+# and go compiler depending on whether V23_ROOT is set.
+ifdef V23_ROOT
# Use "v23" go compiler wrapper.
GO := v23 go
- # v23 puts binaries in $(VANADIUM_ROOT)/release/go/bin, so add that to the PATH.
- PATH := $(VANADIUM_ROOT)/release/go/bin:$(PATH)
+ # v23 puts binaries in $(V23_ROOT)/release/go/bin, so add that to the PATH.
+ PATH := $(V23_ROOT)/release/go/bin:$(PATH)
# Add location of node and npm from environment repo.
- export PATH := $(VANADIUM_ROOT)/environment/cout/node/bin:$(PATH)
+ export PATH := $(V23_ROOT)/environment/cout/node/bin:$(PATH)
else
# Use standard go compiler.
GO := go
- # The vdl tool needs either VANADIUM_ROOT or VDLROOT, so set VDLROOT.
+ # The vdl tool needs either V23_ROOT or VDLROOT, so set VDLROOT.
export VDLROOT := $(shell pwd)/clients/shell/src/v.io/v23/vdlroot
endif
@@ -110,13 +110,13 @@
node_modules: package.json
npm prune
npm install
-ifdef VANADIUM_ROOT
- # If VANADIUM_ROOT is defined, link vanadium from it.
+ifdef V23_ROOT
+ # If V23_ROOT is defined, link vanadium from it.
rm -rf ./node_modules/vanadium
- cd "$(VANADIUM_ROOT)/release/javascript/core" && npm link
+ cd "$(V23_ROOT)/release/javascript/core" && npm link
npm link vanadium
else
- # If VANADIUM_ROOT is not defined, install veyron.js from github.
+ # If V23_ROOT is not defined, install veyron.js from github.
npm install git+ssh://git@github.com:veyron/veyron.js.git
endif
touch node_modules
@@ -143,8 +143,8 @@
$(GO) get github.com/nlacasse/gocui
clients/shell/src/v.io:
-# Only go get v.io go repo if VANADIUM_ROOT is not defined.
-ifndef VANADIUM_ROOT
+# Only go get v.io go repo if V23_ROOT is not defined.
+ifndef V23_ROOT
$(GO) get v.io/x/ref/...
endif
@@ -210,15 +210,15 @@
# runner.js. We should restructure things so that runner.js is its own npm
# package with its own deps.
test-web: lint build-web
-ifndef VANADIUM_ROOT
+ifndef V23_ROOT
# The js tests needs the extension built into a folder so that it can be
# loaded with chrome on startup. The extension build process currently
- # depends on v23, the Vanadium "web" profile, and VANADIUM_ROOT.
+ # depends on v23, the Vanadium "web" profile, and V23_ROOT.
#
# TODO(nlacasse): Either make the extension build process have less
# dependencies, or distribute a version of the extension that can be
# unpacked into a directory and used in tests by other projects like chat.
- @echo "The test-web make task requires VANADIUM_ROOT to be set."
+ @echo "The test-web make task requires V23_ROOT to be set."
exit 1
else
node ./node_modules/vanadium/test/integration/runner.js -- \
@@ -230,7 +230,7 @@
# command so that we can then reference these vars in the Vanadium extension
# and our prova command.
test-web-runner: APP_FRAME := "./build/index.html?mtname=$(V23_NAMESPACE)"
-test-web-runner: VANADIUM_JS := $(VANADIUM_ROOT)/release/javascript/core
+test-web-runner: VANADIUM_JS := $(V23_ROOT)/release/javascript/core
test-web-runner: BROWSER_OPTS := --options="--load-extension=$(VANADIUM_JS)/extension/build-test/,--ignore-certificate-errors,--enable-logging=stderr" $(BROWSER_OPTS)
test-web-runner:
$(MAKE) -C $(VANADIUM_JS)/extension clean
diff --git a/README.md b/README.md
index 92406f5..8aeac40 100644
--- a/README.md
+++ b/README.md
@@ -21,24 +21,24 @@
### Running the shell client
These instructions assume you have an up-to-date [Vanadium development
-environment][vanadium-installation] inside `$VANADIUM_ROOT`.
+environment][vanadium-installation] inside `$V23_ROOT`.
In order to install the shell client, please do the following:
1. Build the chat binary.
- cd $VANADIUM_ROOT/release/projects/chat
+ cd $V23_ROOT/release/projects/chat
make build-shell
2. Start the Vanadium Security Agent
- $VANADIUM_ROOT/release/go/src/v.io/x/ref/cmd/vbash
+ $V23_ROOT/release/go/src/v.io/x/ref/cmd/vbash
You may be prompted for a password, and may have to select blessing caveats
in your web browser.
TODO(nlacasse): Is there a better way to get the agent that does not require
- $VANADIUM_ROOT ?
+ $V23_ROOT ?
3. Run the chat binary.
@@ -184,7 +184,7 @@
will need to get an identity from the identity server:
export V23_CREDENTIALS=/tmp/vanadium-credentials
- $VANADIUM_ROOT/release/go/bin/principal seekblessings
+ $V23_ROOT/release/go/bin/principal seekblessings
Then run the binary and pass in the v23.namespace.root and v23.proxy flags.
TODO(nlacasse): Update the flag names when they change.
diff --git a/tools/services.sh b/tools/services.sh
index 0c6afa3..5899623 100755
--- a/tools/services.sh
+++ b/tools/services.sh
@@ -7,7 +7,7 @@
# Generate identities and starts daemons for chat app host.
# TODO(nlacasse): Consider re-writing this in Go.
-source $VANADIUM_ROOT/release/projects/chat/tools/shell.sh
+source $V23_ROOT/release/projects/chat/tools/shell.sh
trap at_exit INT TERM EXIT
@@ -29,7 +29,7 @@
make vanadium-binaries
- local -r VANADIUM_BIN="${VANADIUM_ROOT}/release/go/bin"
+ local -r VANADIUM_BIN="${V23_ROOT}/release/go/bin"
# Generate a self-signed identity to run identityd as.
local -r VANADIUM_CREDENTIALS=$(shell::tmp_dir)
