Merge pull request #4166 from elemoine/upgrade-closure
Use version 20150920 of Closure Compiler
This commit is contained in:
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
{
|
{
|
||||||
"library_url": "https://github.com/google/closure-library/archive/a5f9b8a.zip"
|
"library_url": "https://github.com/google/closure-library/archive/5b25e65.zip"
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -27,7 +27,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"async": "0.9.0",
|
"async": "0.9.0",
|
||||||
"browserify": "9.0.3",
|
"browserify": "9.0.3",
|
||||||
"closure-util": "1.7.0",
|
"closure-util": "1.8.0",
|
||||||
"fs-extra": "0.12.0",
|
"fs-extra": "0.12.0",
|
||||||
"glob": "5.0.3",
|
"glob": "5.0.3",
|
||||||
"graceful-fs": "3.0.2",
|
"graceful-fs": "3.0.2",
|
||||||
|
|||||||
+2
-2
@@ -232,8 +232,8 @@ ol.WEBGL_EXTENSIONS; // value is set in `ol.has`
|
|||||||
* // Other code here.
|
* // Other code here.
|
||||||
* };
|
* };
|
||||||
*
|
*
|
||||||
* @param {Function} childCtor Child constructor.
|
* @param {!Function} childCtor Child constructor.
|
||||||
* @param {Function} parentCtor Parent constructor.
|
* @param {!Function} parentCtor Parent constructor.
|
||||||
* @function
|
* @function
|
||||||
* @api
|
* @api
|
||||||
*/
|
*/
|
||||||
|
|||||||
+6
-18
@@ -39,26 +39,14 @@ serve.createServer(function(err, server) {
|
|||||||
url + '/test_rendering/index.html'
|
url + '/test_rendering/index.html'
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// The current version of slimerjs is 0.9.6, but this version does not work
|
||||||
|
// for us because of https://github.com/laurentj/slimerjs/issues/333. This
|
||||||
|
// issue is now fixed in master and slimerjs-edge (nightly builds) works for
|
||||||
|
// us. But we should use slimerjs instead of slimerjs-edge when a new
|
||||||
|
// release is published.
|
||||||
var child = spawn(slimerjs.path, args, {stdio: 'inherit'});
|
var child = spawn(slimerjs.path, args, {stdio: 'inherit'});
|
||||||
child.on('exit', function(code) {
|
child.on('exit', function(code) {
|
||||||
// FIXME SlimerJS has a problem with returning the correct return
|
process.exit(code);
|
||||||
// code when using a custom profile, see
|
|
||||||
// https://github.com/laurentj/slimerjs/issues/333
|
|
||||||
// as a work-around we are currently reading the return code from
|
|
||||||
// a file created in the profile directory.
|
|
||||||
// if this issue is fixed we should use the npm package 'slimerjs'
|
|
||||||
// instead of the nightly build 'slimerjs-edge'.
|
|
||||||
var exitstatus = path.join(profile, 'exitstatus');
|
|
||||||
fs.readFile(exitstatus, {encoding: 'utf-8'}, function(err, data) {
|
|
||||||
if (err) {
|
|
||||||
process.stderr.write(
|
|
||||||
'Error getting the exit status of SlimerJS' + '\n');
|
|
||||||
process.stderr.write(err.stack + '\n');
|
|
||||||
process.exit(1);
|
|
||||||
} else {
|
|
||||||
process.exit(data);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user