browser: Remove the -builtin_vdlroot flag.
The vdl tool needs access to its standard packages when compiling
and generating code. It can either find the packages under
VDLROOT/JIRI_ROOT, or it can use the packages built-in to the
tool itself.
The previous behavior was that if -builtin_vdlroot=false (the
default), we'd always look under VDLROOT or JIRI_ROOT. The new
behavior gets rid of the flag, and changes the behavior as if it
were set to true. If VDLROOT or JIRI_ROOT are set, we always use
that value, otherwise we extract the built-in vdlroot to a
temporary directory.
The previous behavior was to write out the data as a
base64/gzipped/tarball with line breaks. The new behavior writes
out a gzipped/tarball as raw binary data, without line breaks.
This is simpler; there's no need for the base64 encoding.
The previous behavior only included *.vdl files in the tarball;
we also need to include vdl.config files, since they affect code
generation for dependant packages.
Added an explicit test to make sure the builtin vdlroot data
contains exactly what we expect; the net result is similar to the
go-generate test (which reminds us when we've forgotten to run
go-generate), but is a bit more localized.
MultiPart: 6/6
Change-Id: I2c8c5e4b80aa5f81c7803d73ced548ff76fdb07e
diff --git a/Makefile b/Makefile
index d02ad05..3cff60a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,6 @@
##
export GOPATH:=$(JIRI_ROOT)/release/projects/browser/go
-export VDLPATH:=$(JIRI_ROOT)/release/projects/browser/go
export GOBIN:=$(JIRI_ROOT)/release/projects/browser/go/bin
export V23_CREDENTIALS=$(JIRI_ROOT)/release/projects/browser/credentials
@@ -72,7 +71,7 @@
make -C $(JIRI_ROOT)/infrastructure/deploy browser-staging
# Creating the bundle JS file.
-public/bundle.js: $(SOURCE_FILES) node_modules src/services/sample-world/ifc
+public/bundle.js: $(SOURCE_FILES) node_modules src/services/sample-world/ifc/index.js
:;jshint src # lint all src JavaScript files.
ifdef NOMINIFY
$(call BROWSERIFY,src/app.js,$@)
@@ -85,10 +84,11 @@
:;vulcanize --output public/bundle.html web-component-dependencies.html --inline
# Generate VDL for JavaScript
-src/services/sample-world/ifc:
- VDLPATH=$(JIRI_ROOT)/release/projects/browser \
- vdl generate -lang=javascript -js-out-dir=$(JIRI_ROOT)/release/projects/browser/src \
- services/sample-world/ifc
+src/services/sample-world/ifc/index.js:
+ VDLPATH=$(JIRI_ROOT)/release/projects/browser/src \
+ vdl generate -lang=javascript \
+ -js-out-dir=$(JIRI_ROOT)/release/projects/browser/src \
+ services/sample-world/ifc
# Install what we need from NPM.
node_modules: package.json
