js.core: v.io/x/devtools: start to use profile-v23
Switch jiri test and hence all checked in
references to use jiri profile vs jiri v23-profile.
MultiPart: 3/16
Change-Id: I6eed30ed37cbc75bf6b45288ab7fea5365a056fb
diff --git a/Makefile b/Makefile
index 6629ae4..2cc130f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-NODE_DIR := $(shell jiri v23-profile list --info Target.InstallationDir nodejs)
+NODE_DIR := $(shell jiri profile list --info Target.InstallationDir v23:nodejs)
PATH := node_modules/.bin:$(NODE_DIR)/bin:$(PATH)
NODE_BIN := $(JIRI_ROOT)/release/javascript/core/node_modules/.bin
@@ -323,7 +323,7 @@
endif
check-that-npm-is-in-path:
- @which npm > /dev/null || { echo "npm is not in the path. Did you remember to run 'jiri v23-profile install nodejs'?"; exit 1; }
+ @which npm > /dev/null || { echo "npm is not in the path. Did you remember to run 'jiri profile install v23:nodejs'?"; exit 1; }
.PHONY: all build clean dependency-check lint test
.PHONY: test-integration test-integration-node test-integration-browser
diff --git a/extension/Makefile b/extension/Makefile
index 6aa7e88..56771c0 100644
--- a/extension/Makefile
+++ b/extension/Makefile
@@ -1,4 +1,4 @@
-NODE_DIR := $(shell jiri v23-profile list --info Target.InstallationDir nodejs)
+NODE_DIR := $(shell jiri profile list --info Target.InstallationDir v23:nodejs)
PATH := node_modules/.bin:${NODE_DIR}/bin:$(PATH)
VDLPATH := $(JIRI_ROOT)/release/go/src
VDLROOT := $(JIRI_ROOT)/release/go/src/v.io/v23/vdlroot
@@ -20,7 +20,7 @@
define COMPILE-NACL-PLUGIN
mkdir -p $(dir $2)
- unset GOARCH GOOS; jiri -v go -v --profiles=nacl --target=amd64p32-nacl build -v -o $2 $1
+ unset GOARCH GOOS; jiri -v go -v --profiles=v23:nacl --target=amd64p32-nacl build -v -o $2 $1
endef
all: vanadium.zip
@@ -151,7 +151,7 @@
@npm install --quiet
check-that-npm-is-in-path:
- @which npm > /dev/null || { echo "npm is not in the path. Did you remember to run 'jiri v23-profile install nodejs'?"; exit 1; }
+ @which npm > /dev/null || { echo "npm is not in the path. Did you remember to run 'jiri profile install v23:nodejs'?"; exit 1; }
.PHONY: all build build-dev clean dependency-check gen-vdl lint
