TBR p2b: moving all Go code under v.io prefix and making the v23 tool
aware of all of our Go workspaces
The purpose of this CL is to be able to build / test all of our Go
code by running:
$ v23 go [build|test] v.io/...
MultiPart: 4/8
Change-Id: I09d2949150d91cba73afb4f46feec8412c8bf882
diff --git a/Makefile b/Makefile
index 11791c8..a0a6786 100644
--- a/Makefile
+++ b/Makefile
@@ -11,12 +11,12 @@
all: node_modules browser/third-party browser/build.js browser/index.html $(V23_ROOT)/release/go/bin
# Build vdl.go
-go/src/p2b/vdl/p2b.vdl.go:
+go/src/v.io/x/p2b/vdl/p2b.vdl.go:
v23 run vdl generate -lang=go p2b/vdl
# Compile p2b cli binary
-go/bin/p2b: go/src/p2b/main.go go/src/p2b/vdl/p2b.vdl.go
- v23 go install p2b/...
+go/bin/p2b: go/src/v.io/x/p2b/main.go go/src/v.io/x/p2b/vdl/p2b.vdl.go
+ v23 go install v.io/x/p2b/...
# Install what we need from NPM, tools such as jspm, serve, etc...
node_modules: package.json
@@ -47,7 +47,7 @@
yes | cp -rf browser/libs/ui-components/data-grid browser/third-party/ag-data-grid
browser/services/vdl/index.js:
- v23 run vdl generate --lang=javascript --js-out-dir=browser/services p2b/vdl
+ v23 run vdl generate --lang=javascript --js-out-dir=browser/services v.io/x/p2b/vdl
# Bundle whole app and third-party JavaScript into a single build.js
browser/build.js: $(JS_FILES) browser/services/vdl/index.js browser/third-party node_modules
diff --git a/go/src/p2b/main.go b/go/src/v.io/x/p2b/main.go
similarity index 98%
rename from go/src/p2b/main.go
rename to go/src/v.io/x/p2b/main.go
index da85dc2..f2fbc07 100644
--- a/go/src/p2b/main.go
+++ b/go/src/v.io/x/p2b/main.go
@@ -14,9 +14,8 @@
"v.io/v23"
"v.io/x/lib/vlog"
+ "v.io/x/p2b/vdl"
_ "v.io/x/ref/profiles/static"
-
- "p2b/vdl"
)
const usage = `
diff --git a/go/src/p2b/vdl/p2b.vdl b/go/src/v.io/x/p2b/vdl/p2b.vdl
similarity index 100%
rename from go/src/p2b/vdl/p2b.vdl
rename to go/src/v.io/x/p2b/vdl/p2b.vdl
diff --git a/go/src/p2b/vdl/p2b.vdl.go b/go/src/v.io/x/p2b/vdl/p2b.vdl.go
similarity index 99%
rename from go/src/p2b/vdl/p2b.vdl.go
rename to go/src/v.io/x/p2b/vdl/p2b.vdl.go
index 743e9be..f5859da 100644
--- a/go/src/p2b/vdl/p2b.vdl.go
+++ b/go/src/v.io/x/p2b/vdl/p2b.vdl.go
@@ -188,7 +188,7 @@
// descViewer hides the desc to keep godoc clean.
var descViewer = rpc.InterfaceDesc{
Name: "Viewer",
- PkgPath: "p2b/vdl",
+ PkgPath: "v.io/x/p2b/vdl",
Doc: "// Viewer allows clients to stream data to it and to request a\n// particular viewer to format and display the data.",
Methods: []rpc.MethodDesc{
{
