Moving browser app files to their own directory
Change-Id: Ib850ef20911e1dd5f30872942306314b5eafcc4f
diff --git a/Makefile b/Makefile
index 93eba0c..7fad1ab 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,11 @@
port ?= 1058
-js_files := $(shell find src -name "*.js")
-server_static := $(patsubst src/static/%,server-root/%,$(wildcard src/static/*))
-tests := $(patsubst %.js,%,$(shell find test -name "*.js"))
+js_files := $(shell find browser/src -name "*.js")
+server_static := $(patsubst browser/src/static/%,server-root/%,$(wildcard browser/src/static/*))
+js_tests := $(patsubst %.js,%,$(shell find browser/test -name "*.js"))
-out_dirs := ifc server-root node_modules
+out_dirs := browser/ifc server-root node_modules
.DELETE_ON_ERROR:
@@ -24,10 +24,10 @@
js: server-root/bundle.js
.PHONY: ifc
-ifc: ifc/index.js
+ifc: browser/ifc/index.js
-ifc/index.js: src/ifc/*
- @VDLPATH=src vdl generate -lang=javascript -js-out-dir=. ifc
+browser/ifc/index.js: common/ifc/*
+ @VDLPATH=common vdl generate -lang=javascript -js-out-dir=browser ifc
node_modules: package.json
@npm prune
@@ -40,22 +40,22 @@
server-root:
@mkdir server-root
-server-root/bundle.js: ifc/index.js node_modules $(js_files) | server-root
- browserify --debug src/index.js 1> $@
+server-root/bundle.js: browser/ifc/index.js node_modules $(js_files) | server-root
+ browserify --debug browser/src/index.js 1> $@
-$(server_static): server-root/%: src/static/% | server-root
+$(server_static): server-root/%: browser/src/static/% | server-root
@cp $< $@
@echo "Copying static file $<"
.PHONY: lint
lint: node_modules
- @jshint .
+ @jshint browser/{src,mocks,test}
.PHONY: test
-test: lint $(tests)
+test: lint $(js_tests)
-.PHONY: $(tests)
-$(tests): test/%: test/%.js test/* mocks/* ifc/index.js node_modules $(js_files)
+.PHONY: $(js_tests)
+$(js_tests): browser/test/%: browser/test/%.js browser/test/* browser/mocks/* browser/ifc/index.js node_modules $(js_files)
@tape $<
.PHONY: start
diff --git a/mocks/google-maps.js b/browser/mocks/google-maps.js
similarity index 100%
rename from mocks/google-maps.js
rename to browser/mocks/google-maps.js
diff --git a/mocks/navigator.js b/browser/mocks/navigator.js
similarity index 100%
rename from mocks/navigator.js
rename to browser/mocks/navigator.js
diff --git a/mocks/syncbase-wrapper.js b/browser/mocks/syncbase-wrapper.js
similarity index 100%
rename from mocks/syncbase-wrapper.js
rename to browser/mocks/syncbase-wrapper.js
diff --git a/mocks/vanadium-wrapper.js b/browser/mocks/vanadium-wrapper.js
similarity index 100%
rename from mocks/vanadium-wrapper.js
rename to browser/mocks/vanadium-wrapper.js
diff --git a/mocks/vanadium.js b/browser/mocks/vanadium.js
similarity index 100%
rename from mocks/vanadium.js
rename to browser/mocks/vanadium.js
diff --git a/src/casting-manager.js b/browser/src/casting-manager.js
similarity index 100%
rename from src/casting-manager.js
rename to browser/src/casting-manager.js
diff --git a/src/components/add-button.js b/browser/src/components/add-button.js
similarity index 100%
rename from src/components/add-button.js
rename to browser/src/components/add-button.js
diff --git a/src/components/destination-info.js b/browser/src/components/destination-info.js
similarity index 100%
rename from src/components/destination-info.js
rename to browser/src/components/destination-info.js
diff --git a/src/components/destination-marker.js b/browser/src/components/destination-marker.js
similarity index 100%
rename from src/components/destination-marker.js
rename to browser/src/components/destination-marker.js
diff --git a/src/components/destination-search.js b/browser/src/components/destination-search.js
similarity index 100%
rename from src/components/destination-search.js
rename to browser/src/components/destination-search.js
diff --git a/src/components/map-widget.js b/browser/src/components/map-widget.js
similarity index 100%
rename from src/components/map-widget.js
rename to browser/src/components/map-widget.js
diff --git a/src/components/message.js b/browser/src/components/message.js
similarity index 100%
rename from src/components/message.js
rename to browser/src/components/message.js
diff --git a/src/components/messages.js b/browser/src/components/messages.js
similarity index 100%
rename from src/components/messages.js
rename to browser/src/components/messages.js
diff --git a/src/components/suggestion.js b/browser/src/components/suggestion.js
similarity index 100%
rename from src/components/suggestion.js
rename to browser/src/components/suggestion.js
diff --git a/src/components/suggestions.js b/browser/src/components/suggestions.js
similarity index 100%
rename from src/components/suggestions.js
rename to browser/src/components/suggestions.js
diff --git a/src/components/timeline-client.js b/browser/src/components/timeline-client.js
similarity index 100%
rename from src/components/timeline-client.js
rename to browser/src/components/timeline-client.js
diff --git a/src/components/timeline-server.js b/browser/src/components/timeline-server.js
similarity index 100%
rename from src/components/timeline-server.js
rename to browser/src/components/timeline-server.js
diff --git a/src/components/timeline.js b/browser/src/components/timeline.js
similarity index 100%
rename from src/components/timeline.js
rename to browser/src/components/timeline.js
diff --git a/src/debug.js b/browser/src/debug.js
similarity index 100%
rename from src/debug.js
rename to browser/src/debug.js
diff --git a/src/describe-destination.js b/browser/src/describe-destination.js
similarity index 100%
rename from src/describe-destination.js
rename to browser/src/describe-destination.js
diff --git a/src/destination.js b/browser/src/destination.js
similarity index 100%
rename from src/destination.js
rename to browser/src/destination.js
diff --git a/src/destinations.js b/browser/src/destinations.js
similarity index 100%
rename from src/destinations.js
rename to browser/src/destinations.js
diff --git a/src/identity.js b/browser/src/identity.js
similarity index 100%
rename from src/identity.js
rename to browser/src/identity.js
diff --git a/src/ifc/conversions.js b/browser/src/ifc/conversions.js
similarity index 100%
rename from src/ifc/conversions.js
rename to browser/src/ifc/conversions.js
diff --git a/src/index.js b/browser/src/index.js
similarity index 100%
rename from src/index.js
rename to browser/src/index.js
diff --git a/src/invitation-manager.js b/browser/src/invitation-manager.js
similarity index 100%
rename from src/invitation-manager.js
rename to browser/src/invitation-manager.js
diff --git a/src/naming.js b/browser/src/naming.js
similarity index 100%
rename from src/naming.js
rename to browser/src/naming.js
diff --git a/src/place.js b/browser/src/place.js
similarity index 100%
rename from src/place.js
rename to browser/src/place.js
diff --git a/src/static/index.css b/browser/src/static/index.css
similarity index 100%
rename from src/static/index.css
rename to browser/src/static/index.css
diff --git a/src/static/index.html b/browser/src/static/index.html
similarity index 100%
rename from src/static/index.html
rename to browser/src/static/index.html
diff --git a/src/strings.js b/browser/src/strings.js
similarity index 100%
rename from src/strings.js
rename to browser/src/strings.js
diff --git a/src/sync-util/deferred-sb-wrapper.js b/browser/src/sync-util/deferred-sb-wrapper.js
similarity index 100%
rename from src/sync-util/deferred-sb-wrapper.js
rename to browser/src/sync-util/deferred-sb-wrapper.js
diff --git a/src/sync-util/destination-sync.js b/browser/src/sync-util/destination-sync.js
similarity index 100%
rename from src/sync-util/destination-sync.js
rename to browser/src/sync-util/destination-sync.js
diff --git a/src/sync-util/device-sync.js b/browser/src/sync-util/device-sync.js
similarity index 100%
rename from src/sync-util/device-sync.js
rename to browser/src/sync-util/device-sync.js
diff --git a/src/sync-util/get-trip-length.js b/browser/src/sync-util/get-trip-length.js
similarity index 100%
rename from src/sync-util/get-trip-length.js
rename to browser/src/sync-util/get-trip-length.js
diff --git a/src/sync-util/marshalling.js b/browser/src/sync-util/marshalling.js
similarity index 100%
rename from src/sync-util/marshalling.js
rename to browser/src/sync-util/marshalling.js
diff --git a/src/sync-util/message-sync.js b/browser/src/sync-util/message-sync.js
similarity index 100%
rename from src/sync-util/message-sync.js
rename to browser/src/sync-util/message-sync.js
diff --git a/src/sync-util/trip-comparator.js b/browser/src/sync-util/trip-comparator.js
similarity index 100%
rename from src/sync-util/trip-comparator.js
rename to browser/src/sync-util/trip-comparator.js
diff --git a/src/sync-util/trip-manager.js b/browser/src/sync-util/trip-manager.js
similarity index 100%
rename from src/sync-util/trip-manager.js
rename to browser/src/sync-util/trip-manager.js
diff --git a/src/syncgroup-manager.js b/browser/src/syncgroup-manager.js
similarity index 100%
rename from src/syncgroup-manager.js
rename to browser/src/syncgroup-manager.js
diff --git a/src/travel.js b/browser/src/travel.js
similarity index 100%
rename from src/travel.js
rename to browser/src/travel.js
diff --git a/src/travelsync.js b/browser/src/travelsync.js
similarity index 100%
rename from src/travelsync.js
rename to browser/src/travelsync.js
diff --git a/src/util/define-class.js b/browser/src/util/define-class.js
similarity index 100%
rename from src/util/define-class.js
rename to browser/src/util/define-class.js
diff --git a/src/util/jquery.js b/browser/src/util/jquery.js
similarity index 100%
rename from src/util/jquery.js
rename to browser/src/util/jquery.js
diff --git a/src/vanadium-wrapper/index.js b/browser/src/vanadium-wrapper/index.js
similarity index 100%
rename from src/vanadium-wrapper/index.js
rename to browser/src/vanadium-wrapper/index.js
diff --git a/src/vanadium-wrapper/syncbase-wrapper.js b/browser/src/vanadium-wrapper/syncbase-wrapper.js
similarity index 100%
rename from src/vanadium-wrapper/syncbase-wrapper.js
rename to browser/src/vanadium-wrapper/syncbase-wrapper.js
diff --git a/test/components/destination-info.js b/browser/test/components/destination-info.js
similarity index 100%
rename from test/components/destination-info.js
rename to browser/test/components/destination-info.js
diff --git a/test/components/destination-marker.js b/browser/test/components/destination-marker.js
similarity index 100%
rename from test/components/destination-marker.js
rename to browser/test/components/destination-marker.js
diff --git a/test/components/map-widget.js b/browser/test/components/map-widget.js
similarity index 100%
rename from test/components/map-widget.js
rename to browser/test/components/map-widget.js
diff --git a/test/components/message.js b/browser/test/components/message.js
similarity index 100%
rename from test/components/message.js
rename to browser/test/components/message.js
diff --git a/test/identity.js b/browser/test/identity.js
similarity index 100%
rename from test/identity.js
rename to browser/test/identity.js
diff --git a/test/sync-util/trip-comparator.js b/browser/test/sync-util/trip-comparator.js
similarity index 100%
rename from test/sync-util/trip-comparator.js
rename to browser/test/sync-util/trip-comparator.js
diff --git a/test/travel.js b/browser/test/travel.js
similarity index 100%
rename from test/travel.js
rename to browser/test/travel.js
diff --git a/test/util/define-class.js b/browser/test/util/define-class.js
similarity index 100%
rename from test/util/define-class.js
rename to browser/test/util/define-class.js
diff --git a/test/util/jquery.js b/browser/test/util/jquery.js
similarity index 100%
rename from test/util/jquery.js
rename to browser/test/util/jquery.js
diff --git a/test/vanadium-wrapper.js b/browser/test/vanadium-wrapper.js
similarity index 100%
rename from test/vanadium-wrapper.js
rename to browser/test/vanadium-wrapper.js
diff --git a/src/ifc/ops.vdl b/common/ifc/ops.vdl
similarity index 100%
rename from src/ifc/ops.vdl
rename to common/ifc/ops.vdl
diff --git a/src/ifc/timeline.vdl b/common/ifc/timeline.vdl
similarity index 100%
rename from src/ifc/timeline.vdl
rename to common/ifc/timeline.vdl
diff --git a/src/ifc/types.vdl b/common/ifc/types.vdl
similarity index 100%
rename from src/ifc/types.vdl
rename to common/ifc/types.vdl
