Using locally built v23 go binaries
Change-Id: I13da792b38b2815e2d46c3bd660ff2448b2a8911
diff --git a/.gitignore b/.gitignore
index e5a20c4..f9f8d06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
/.jiri
#TODO(nlacasse): Get rid of .v23 below once v23->jiri transition is complete.
/.v23
+/bin
/ifc
/node_modules
/server-root
diff --git a/Makefile b/Makefile
index 719e631..29598fd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
PATH := node_modules/.bin:$(PATH)
-PATH := $(V23_ROOT)/third_party/cout/node/bin:$(V23_ROOT)/release/go/bin:$(PATH)
+PATH := $(V23_ROOT)/third_party/cout/node/bin:bin:$(PATH)
.DEFAULT_GOAL := all
@@ -62,19 +62,24 @@
start: all
@static server-root -p $(port)
-.PHONY: bootstrap
-bootstrap: creds syncbase
+bin/principal:
+ jiri go build -a -o $@ v.io/x/ref/cmd/principal
+
+bin/syncbased:
+ jiri go build -a -o $@ v.io/x/ref/services/syncbase/syncbased
.PHONY: creds
-creds:
- @principal seekblessings --v23.credentials tmp/creds/$(creds)
+creds: tmp/creds/$(creds)
+
+tmp/creds/$(creds): bin/principal
+ @principal seekblessings --v23.credentials $@
.PHONY: syncbase
-syncbase:
+syncbase: bin/syncbased creds
@bash ./tools/start_services.sh
.PHONY: clean-all
-clean-all: clean clean-tmp
+clean-all: clean clean-tmp clean-bin
.PHONY: clean
clean:
@@ -91,3 +96,7 @@
.PHONY: clean-creds
clean-creds:
rm -rf tmp/creds
+
+.PHONY: clean-bin
+clean-bin:
+ rm -rf bin
diff --git a/README.md b/README.md
index 41bf2d0..8e11244 100644
--- a/README.md
+++ b/README.md
@@ -12,12 +12,6 @@
Optionally, it is possible to use your own install of Node.js if you would like
to use a more recent version.
-In order to run the local syncbase instance via `make bootstrap` or related
-targets, you will need to ensure that the standard Vanadium binaries have been
-built by running:
-
- v23 go install v.io/...
-
## Building
The default make task will install any modules listed in the `package.json` and
@@ -35,12 +29,11 @@
Local instances require a blessed syncbase instance. To attain blessings and
start syncbase, use:
- make bootstrap [creds=<creds subdir>] [port=<syncbase port>]
+ make syncbase [creds=<creds subdir>] [port=<syncbase port>]
-Related targets:
+Related target:
make creds [creds=<creds subdir>]
- make syncbase [creds=<creds subdir>] [port=<syncbase port>]
You can similarly run with fresh creds or syncbase data via:
@@ -53,4 +46,4 @@
To connect to a syncbase instance other than the default, navigate to:
- localhost:<server port>/?syncbase=<syncbase port>
+ localhost:<server port>/?syncbase=<syncbase name or port>
diff --git a/tools/start_services.sh b/tools/start_services.sh
index 1ecb678..cb89d2b 100644
--- a/tools/start_services.sh
+++ b/tools/start_services.sh
@@ -9,7 +9,7 @@
#
# Optionally, the creds variable can specify a subdirectory.
-PATH=${PATH}:${V23_ROOT}/release/go/bin
+PATH=${PATH}:bin
set -euo pipefail
