diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-02-23 11:32:16 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-03-01 07:43:11 -0800 |
| commit | 671e075c5e642627ccbd03cf71226d8d5f2ec897 (patch) | |
| tree | 1ed30b82de5a9e5dcb3d852b47d5f6d75486a261 /js/commonjs | |
| parent | 7339fc04c49a055ec0688cd0cb24cf7ea64f7783 (diff) | |
Use closurebuilder.py in favor of calcdeps.py for compiling JavaScript
There are two motivations for this:
1) calcdeps.py is deprecated and replaced by closurebuilder.py.
2) As part of this I was able to tweak things so that the Closure
compiler does not attempt to examine every .js file in the tree under
js/. This makes it possible to put compatibility tests and related files
in a subdirectory without them getting mixed up with the main .js files
we care about.
Diffstat (limited to 'js/commonjs')
| -rw-r--r-- | js/commonjs/export.js | 4 | ||||
| -rw-r--r-- | js/commonjs/export_asserts.js | 4 | ||||
| -rw-r--r-- | js/commonjs/export_testdeps.js | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/js/commonjs/export.js b/js/commonjs/export.js index 1eaab5d5..a93ee928 100644 --- a/js/commonjs/export.js +++ b/js/commonjs/export.js @@ -5,6 +5,10 @@ * the google-protobuf.js file that we build at distribution time. */ +// Include a dummy provide statement so that closurebuilder.py does not skip over this +// file. +goog.provide('jspb.Export'); + goog.require('goog.object'); goog.require('jspb.BinaryReader'); goog.require('jspb.BinaryWriter'); diff --git a/js/commonjs/export_asserts.js b/js/commonjs/export_asserts.js index 5219d120..ad9446c7 100644 --- a/js/commonjs/export_asserts.js +++ b/js/commonjs/export_asserts.js @@ -6,6 +6,10 @@ * closure_asserts_commonjs.js that is only used at testing time. */ +// Include a dummy provide statement so that closurebuilder.py does not skip over this +// file. +goog.provide('jspb.ExportAsserts'); + goog.require('goog.testing.asserts'); var global = Function('return this')(); diff --git a/js/commonjs/export_testdeps.js b/js/commonjs/export_testdeps.js index 174c61e6..6f5cd083 100644 --- a/js/commonjs/export_testdeps.js +++ b/js/commonjs/export_testdeps.js @@ -7,6 +7,10 @@ * export_asserts.js. */ +// Include a dummy provide statement so that closurebuilder.py does not skip over this +// file. +goog.provide('jspb.ExportTestDeps'); + goog.require('goog.crypt.base64'); goog.require('jspb.arith.Int64'); goog.require('jspb.arith.UInt64'); |