Merge "veyron/examples/mdb: simple test.sh"
diff --git a/examples/pipetobrowser/Makefile b/examples/pipetobrowser/Makefile
index e80138b..0953b87 100644
--- a/examples/pipetobrowser/Makefile
+++ b/examples/pipetobrowser/Makefile
@@ -1,7 +1,6 @@
PATH:=$(VEYRON_ROOT)/environment/cout/node/bin:$(PATH)
PATH:=node_modules/.bin:../node_modules/.bin:$(PATH)
-VEYRON_JS_API=$(VEYRON_ROOT)/veyron/javascript/api
VEYRON_BUILD_SCRIPT=$(VEYRON_ROOT)/veyron/scripts/build/go
# All JS files except build.js and third party
@@ -24,11 +23,8 @@
export
# Build and copies Veyron from local source
-browser/third-party/veyron: $(VEYRON_JS_API)
- mkdir -p browser/third-party
- (cd $(VEYRON_JS_API) && ./vgrunt build)
- mkdir -p browser/third-party/veyron
- cp -rf $(VEYRON_JS_API)/dist/*.* browser/third-party/veyron
+browser/third-party/veyron: node_modules
+ cp -rf $</veyron/dist/ $@
# Install JSPM and Bower packages as listed in browser/package.json from JSPM and browser/bower.json from bower
browser/third-party: browser/package.json browser/bower.json
diff --git a/examples/pipetobrowser/package.json b/examples/pipetobrowser/package.json
index add9381..c38e890 100644
--- a/examples/pipetobrowser/package.json
+++ b/examples/pipetobrowser/package.json
@@ -2,10 +2,13 @@
"name": "pipe-to-browser",
"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"
+ },
"devDependencies": {
"jspm": "~0.6.7",
"vulcanize": "~0.3.0",
"serve": "~1.4.0",
"bower": "~1.3.8"
}
-}
\ No newline at end of file
+}
diff --git a/examples/todos/Makefile b/examples/todos/Makefile
index 700b32c..76f0c00 100644
--- a/examples/todos/Makefile
+++ b/examples/todos/Makefile
@@ -15,8 +15,6 @@
buildapp: node_modules
browserify -d todos_appd/browser/*.js -p [minifyify --map bundle.js.map --output ${BUNDLE_JS}.map] -o ${BUNDLE_JS}
- (cd ${VEYRON_JS_API} && ./vgrunt build)
- cp -rf ${VEYRON_JS_API}/dist/veyron.* todos_appd/third_party/
build: buildgo buildapp
diff --git a/examples/todos/package.json b/examples/todos/package.json
index 97ab0b9..431c8ce 100644
--- a/examples/todos/package.json
+++ b/examples/todos/package.json
@@ -1,6 +1,9 @@
{
"name": "todos",
"version": "0.0.1",
+ "dependencies": {
+ "veyron": "git+ssh://git@github.com:veyron/veyron.js.git"
+ },
"devDependencies": {
"browserify": "^5.9.1",
"jshint": "^2.5.2",
diff --git a/examples/todos/todos_appd/index.html b/examples/todos/todos_appd/index.html
index 9d6f6b1..0edab81 100644
--- a/examples/todos/todos_appd/index.html
+++ b/examples/todos/todos_appd/index.html
@@ -13,7 +13,6 @@
<script src="/third_party/backbone-min.js"></script>
<!--<script src="public/third_party/react-0.11.1.min.js"></script>-->
<script src="/third_party/react-0.11.1.js"></script>
- <script src="/third_party/veyron.min.js"></script>
<script src="/public/bundle.js"></script>
</body>
</html>
