chat: Cleanup makefile and vdl locations.
Building Chat now requires V23_ROOT, so all the branches in the Makefile
that checked for V23_ROOT are now gone.
Fixed some issues with gitignore and jshintignore.
Added clarification to README about permissions tool.
Change-Id: I735369045ae499927fc024d51a3b49d6b8726fce
diff --git a/.gitignore b/.gitignore
index add7e7c..8db837f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,6 @@
-build
-clients/shell/bin
-clients/shell/pkg
-clients/shell/src/code.google.com
-clients/shell/src/github.com
-clients/shell/src/golang.org
-clients/shell/src/v.io
-node_modules
-tmp
+/build
+/clients/shell/go/bin
+/clients/shell/go/pkg
+/node_modules
+/tmp
/.v23
diff --git a/.jshintignore b/.jshintignore
index bef2848..334994a 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,3 +1,3 @@
build
node_modules
-clients/web/js/chat/vdl
+clients/web/js/v.io/x/chat/vdl
diff --git a/Makefile b/Makefile
index a1bfa14..f10ec4e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,8 @@
SHELL := /bin/bash -euo pipefail
-export PATH := node_modules/.bin:clients/shell/go/bin:$(PATH)
+export PATH := $(V23_ROOT)/release/go/bin:node_modules/.bin:$(V23_ROOT)/environment/cout/node/bin:clients/shell/go/bin:$(PATH)
export GOPATH := $(shell pwd)/clients/shell/go:$(GOPATH)
export VDLPATH := $(GOPATH)
-
-# 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 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 V23_ROOT is set.
-ifdef V23_ROOT
- # Use "v23" go compiler wrapper.
- GO := v23 go
- # 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 := $(V23_ROOT)/environment/cout/node/bin:$(PATH)
-else
- # Use standard go compiler.
- GO := go
- # The vdl tool needs either V23_ROOT or VDLROOT, so set VDLROOT.
- export VDLROOT := $(shell pwd)/clients/shell/go/src/v.io/v23/vdlroot
-endif
-
+GO := v23 go
# This target causes any target files to be deleted if the target task fails.
# This is especially useful for browserify, which creates files even if it
@@ -110,20 +86,15 @@
node_modules: package.json
npm prune
npm install
-ifdef V23_ROOT
- # If V23_ROOT is defined, link vanadium from it.
+ # Link Vanadium from V23_ROOT.
rm -rf ./node_modules/vanadium
cd "$(V23_ROOT)/release/javascript/core" && npm link
npm link vanadium
-else
- # 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
# TODO(sadovsky): Make it so we only run "go install" when binaries are out of
# date.
-vanadium-binaries: clients/shell/go/src/v.io
+vanadium-binaries:
$(GO) install \
v.io/x/ref/services/mounttable/mounttabled \
v.io/x/ref/services/proxy/proxyd \
@@ -133,25 +104,7 @@
vdl generate --lang=go v.io/x/chat/vdl
vdl generate --lang=javascript --js-out-dir=clients/web/js v.io/x/chat/vdl
-clients/shell/go/src/github.com/fatih/color:
- $(GO) get github.com/fatih/color
-
-clients/shell/go/src/github.com/kr/text:
- $(GO) get github.com/kr/text
-
-clients/shell/go/src/github.com/nlacasse/gocui:
- $(GO) get github.com/nlacasse/gocui
-
-clients/shell/go/src/v.io:
-# Only go get v.io go repo if V23_ROOT is not defined.
-ifndef V23_ROOT
- $(GO) get v.io/x/ref/...
-endif
-
clients/shell/go/bin/chat: vanadium-binaries gen-vdl
-clients/shell/go/bin/chat: clients/shell/go/src/github.com/fatih/color
-clients/shell/go/bin/chat: clients/shell/go/src/github.com/kr/text
-clients/shell/go/bin/chat: clients/shell/go/src/github.com/nlacasse/gocui
clients/shell/go/bin/chat: $(shell find clients/shell/go/src -name "*.go")
$(GO) install v.io/x/chat
@@ -210,20 +163,8 @@
# 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 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 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 V23_ROOT to be set."
- exit 1
-else
node ./node_modules/vanadium/test/integration/runner.js -- \
make test-web-runner
-endif
# Note: runner.js sets the V23_NAMESPACE and PROXY_ADDR env vars for the
# spawned test subprocess; we specify "make test-web-runner" as the test
@@ -239,9 +180,8 @@
clean:
rm -rf node_modules
- rm -rf clients/shell/go/{bin,pkg,src/code.google.com,src/github.com,src/golang.org}
+ rm -rf clients/shell/go/{bin,pkg}
rm -rf build
- rm -rf vanadium.js
lint: node_modules
jshint .
diff --git a/README.md b/README.md
index 68a2e4d..f42f1ce 100644
--- a/README.md
+++ b/README.md
@@ -73,8 +73,40 @@
`users/vanadium.bot@gmail.com/apps/chat/public` -- has been created with
permissions that allow anybody to mount and glob inside that directory.
-TODO(nlacasse): Describe permissions set up once permission settings are
-finalized. (See go/vcl/9767)
+The following command sets the `Resolve` permission on
+`users/vanadium.bot@gmail.com` to allow anybody to resolve names inside that
+directory.
+
+ namespace permissions set users/vanadium.bot@gmail.com - << EOF
+ {
+ "Admin":{
+ "In":["dev.v.io/root/users/vanadium.bot@gmail.com"]
+ },
+ "Resolve":{
+ "In":["..."]
+ }
+ }
+ EOF
+
+
+The next command sets the `Read` and `Create` permissions for
+`users/vanadium.bot@gmail.com/apps/chat`, to allow anybody to list the names
+inside that directory, and create a new name in that directory.
+
+ namespace permissions set users/vanadium.bot@gmail.com/apps/chat - << EOF
+ {
+ "Admin":{
+ "In":["dev.v.io/root/users/vanadium.bot@gmail.com"]
+ },
+ "Read":{
+ "In":["..."]
+ },
+ "Create":{
+ "In":["..."]
+ }
+ }
+ EOF
+
When a client joins the chat room, it generates a random string and attempts to
mount itself in the public [mounttable server][mounttable] under the name
diff --git a/clients/web/js/channel.js b/clients/web/js/channel.js
index ac75f9b..51d5acc 100644
--- a/clients/web/js/channel.js
+++ b/clients/web/js/channel.js
@@ -13,7 +13,7 @@
var access = require('vanadium/src/gen-vdl/v.io/v23/security/access');
var naming = require('vanadium').naming;
var noop = require('./noop');
-var ServiceVdl = require('./chat/vdl');
+var ServiceVdl = require('./v.io/x/chat/vdl');
var util = require('./util');
// Default channel name. Override by setting "channel" query param in url.
diff --git a/clients/web/js/chat/vdl/index.js b/clients/web/js/v.io/x/chat/vdl/index.js
similarity index 96%
rename from clients/web/js/chat/vdl/index.js
rename to clients/web/js/v.io/x/chat/vdl/index.js
index f8309f0..2d58831 100644
--- a/clients/web/js/chat/vdl/index.js
+++ b/clients/web/js/v.io/x/chat/vdl/index.js
@@ -44,7 +44,7 @@
Chat.prototype._serviceDescription = {
name: 'Chat',
- pkgPath: 'chat/vdl',
+ pkgPath: 'v.io/x/chat/vdl',
doc: "",
embeds: [],
methods: [
