TBR: playground: Replace "v23" (the tool name) with "jiri".
Change-Id: I004bb95b192e345e0d068c3bf23c2c4a2cb973c3
MultiPart: 14/17
diff --git a/go/src/v.io/x/playground/Dockerfile b/go/src/v.io/x/playground/Dockerfile
index 5341ca3..ee3f586 100644
--- a/go/src/v.io/x/playground/Dockerfile
+++ b/go/src/v.io/x/playground/Dockerfile
@@ -33,8 +33,8 @@
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/...
-RUN v23 go install -v v.io/...
+RUN jiri go install -a -tags wspr -v v.io/x/ref/services/wspr/...
+RUN jiri go install -v v.io/...
# 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
diff --git a/go/src/v.io/x/playground/README.md b/go/src/v.io/x/playground/README.md
index 27f0fb9..ad41187 100644
--- a/go/src/v.io/x/playground/README.md
+++ b/go/src/v.io/x/playground/README.md
@@ -49,7 +49,7 @@
Install the playground binaries:
- $ GOPATH=$JIRI_ROOT/release/projects/playground/go v23 go install v.io/x/playground/...
+ $ GOPATH=$JIRI_ROOT/release/projects/playground/go jiri go install v.io/x/playground/...
Run the compilerd binary:
@@ -114,7 +114,7 @@
Run the tests:
- $ GOPATH=$JIRI_ROOT/release/projects/playground/go v23 go test v.io/x/playground/compilerd/...
+ $ GOPATH=$JIRI_ROOT/release/projects/playground/go jiri go test v.io/x/playground/compilerd/...
# Database migrations
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 26a289f..0391485 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
@@ -17,7 +17,7 @@
"v.io/x/ref/test/v23tests"
)
-//go:generate v23 test generate
+//go:generate jiri test generate
var (
vanadiumRoot, nodejsRoot, playgroundRoot string
diff --git a/go/src/v.io/x/playground/builder/main.go b/go/src/v.io/x/playground/builder/main.go
index e9dee17..b0da8e6 100644
--- a/go/src/v.io/x/playground/builder/main.go
+++ b/go/src/v.io/x/playground/builder/main.go
@@ -44,7 +44,7 @@
var (
verbose = flag.Bool("verbose", true, "Whether to output debug messages.")
includeServiceOutput = flag.Bool("includeServiceOutput", false, "Whether to stream service (mounttable, wspr, proxy) output to clients.")
- includeV23Env = flag.Bool("includeV23Env", false, "Whether to log the output of \"v23 env\" before compilation.")
+ includeV23Env = flag.Bool("includeV23Env", false, "Whether to log the output of \"jiri env\" before compilation.")
// TODO(ivanpi): Separate out mounttable, proxy, wspr timeouts. Add compile timeout. Revise default.
runTimeout = flag.Duration("runTimeout", 3*time.Second, "Time limit for running user code.")
@@ -102,7 +102,7 @@
func logV23Env() error {
if *includeV23Env {
- return makeCmd("<environment>", false, "", "v23", "env").Run()
+ return makeCmd("<environment>", false, "", "jiri", "env").Run()
}
return nil
}
@@ -237,7 +237,7 @@
if found["go"] {
debug("Generating VDL for Go and compiling Go")
err = makeCmd("<compile>", false, "",
- "v23", "go", "install", "./...").Run()
+ "jiri", "go", "install", "./...").Run()
if _, ok := err.(*exec.ExitError); ok {
return true, nil
} else if err != nil {
