"npm link" vanadium instead of "npm install"
"npm install" puts a full copy of vanadium inside the travel repo,
including the .jiri metadata file.
This confuses jiri tool because it finds two projects with the same name
at different paths in the project tree.
"npm link" creates symlinks, which jiri will not follow, thus avoiding
this issue.
All of our projects currently use "npm link", except for travel. At
some point we will want to do something better than "npm link", but this
is good enough for now.
Change-Id: Iad79f57a81b64908176e94d6487877b8cfbb5bc0
diff --git a/Makefile b/Makefile
index 7fad1ab..e6aeac7 100644
--- a/Makefile
+++ b/Makefile
@@ -32,9 +32,12 @@
node_modules: package.json
@npm prune
@npm install
- @ # TODO(rosswang): remove these two
- @npm install $(JIRI_ROOT)/release/javascript/core/
- @npm install $(JIRI_ROOT)/release/javascript/syncbase/
+ # Link Vanadium and Syncbase from JIRI_ROOT.
+ @rm -rf ./node_modules/{vanadium,syncbase}
+ @cd "$(JIRI_ROOT)/release/javascript/core" && npm link
+ @npm link vanadium
+ @cd "$(JIRI_ROOT)/release/javascript/syncbase" && make node_modules && npm link
+ @npm link syncbase
@touch $@ # if npm does nothing, we don't want to keep trying
server-root:
