Reorganization of VANADIUM_ROOT relative paths.
diff --git a/Makefile b/Makefile
index 5dbe062..b4d6296 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,10 @@
HTML_FILES = $(shell find browser -name "*.css" -a -not -path "*third-party*" -o -name "*.html" -a -not -name "index.html" -a -not -path "*third-party*")
# Builds everything
-all: node_modules browser/third-party browser/third-party/veyron browser/build.js browser/index.html $(VANADIUM_ROOT)/veyron/go/bin
+all: node_modules browser/third-party browser/third-party/veyron browser/build.js browser/index.html $(VANADIUM_ROOT)/release/go/bin
# Build p2b cli binary
-$(VANADIUM_ROOT)/veyron/go/bin: p2b/main.go
+$(VANADIUM_ROOT)/release/go/bin: p2b/main.go
veyron go install veyron/...
# Install what we need from NPM, tools such as jspm, serve, etc...
diff --git a/browser/app.html b/browser/app.html
index ffe2062..4bf859c 100644
--- a/browser/app.html
+++ b/browser/app.html
@@ -10,7 +10,7 @@
<script src="third-party/platform/platform.js"></script>
<!-- TODO(aghassemi) use CJS version of Veyron and provide an ES6 shim -->
- <script src="third-party/veyron/veyron.js"></script>
+ <script src="third-party/veyron/release/javascript/core"></script>
<script src="third-party/traceur-runtime@0.0.49.js"></script>
<script src="third-party/system@0.6.js"></script>
diff --git a/p2b.vdl.go b/p2b.vdl.go
index db2afac..e837b78 100644
--- a/p2b.vdl.go
+++ b/p2b.vdl.go
@@ -9,12 +9,12 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_io "io"
- _gen_veyron2 "v.io/veyron/veyron2"
- _gen_context "v.io/veyron/veyron2/context"
- _gen_ipc "v.io/veyron/veyron2/ipc"
- _gen_naming "v.io/veyron/veyron2/naming"
- _gen_vdlutil "v.io/veyron/veyron2/vdl/vdlutil"
- _gen_wiretype "v.io/veyron/veyron2/wiretype"
+ _gen_veyron2 "v.io/core/veyron2"
+ _gen_context "v.io/core/veyron2/context"
+ _gen_ipc "v.io/core/veyron2/ipc"
+ _gen_naming "v.io/core/veyron2/naming"
+ _gen_vdlutil "v.io/core/veyron2/vdl/vdlutil"
+ _gen_wiretype "v.io/core/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
diff --git a/p2b/main.go b/p2b/main.go
index 55b78b6..ec989cc 100644
--- a/p2b/main.go
+++ b/p2b/main.go
@@ -8,8 +8,8 @@
"io"
"os"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/rt"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/rt"
"v.io/examples/pipetobrowser"
)
diff --git a/package.json b/package.json
index c38e890..7e1b621 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"version": "0.0.1",
"description": "P2B allows one to pipe anything from shell console to the browser. Data being piped to the browser then is displayed in a graphical and formatted way by a 'viewer' Viewers are pluggable pieces of code that know how to handle and display a stream of data.",
"dependencies": {
- "veyron": "git+ssh://git@github.com:veyron/veyron.js.git"
+ "veyron": "git+ssh://git@github.com:veyron/release/javascript/core.git"
},
"devDependencies": {
"jspm": "~0.6.7",
diff --git a/services.sh b/services.sh
index d271f51..094733b 100755
--- a/services.sh
+++ b/services.sh
@@ -2,7 +2,7 @@
source "${VANADIUM_ROOT}/scripts/lib/shell.sh"
-export PATH="node_modules/.bin:${VANADIUM_ROOT}/veyron/go/bin:${PATH}"
+export PATH="node_modules/.bin:${VANADIUM_ROOT}/release/go/bin:${PATH}"
main() {
local -r VEYRON_PROXY_ADDR=proxy.envyor.com:8100
