aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2016-04-19 23:42:06 -0700
committerJoshua Haberman <jhaberman@gmail.com>2016-04-19 23:42:06 -0700
commit36978c39388e4dedc7d6ee88aa38b81bcee50ced (patch)
tree4205b67cda1b3372276a591714efca78f0e69a0a
parent1dc81948f50f74d441a37ad189e294878ca3f360 (diff)
parent7ff229fa4e7774ee7fa86965fc943c19ace575c3 (diff)
downloadprotobuf-36978c39388e4dedc7d6ee88aa38b81bcee50ced.tar.gz
protobuf-36978c39388e4dedc7d6ee88aa38b81bcee50ced.tar.bz2
protobuf-36978c39388e4dedc7d6ee88aa38b81bcee50ced.zip
Merge pull request #1417 from seishun/windows2
Support Windows in gulpfile.js
-rw-r--r--js/gulpfile.js6
-rw-r--r--js/package.json2
2 files changed, 6 insertions, 2 deletions
diff --git a/js/gulpfile.js b/js/gulpfile.js
index 7e44aa76..c5220153 100644
--- a/js/gulpfile.js
+++ b/js/gulpfile.js
@@ -1,7 +1,11 @@
var gulp = require('gulp');
-var exec = require('child_process').exec;
+var execFile = require('child_process').execFile;
var glob = require('glob');
+function exec(command, cb) {
+ execFile('sh', ['-c', command], cb);
+}
+
var protoc = process.env.PROTOC || '../src/protoc';
gulp.task('genproto_closure', function (cb) {
diff --git a/js/package.json b/js/package.json
index 6418e507..c16417ca 100644
--- a/js/package.json
+++ b/js/package.json
@@ -13,7 +13,7 @@
"glob": "~6.0.4"
},
"scripts": {
- "test": "./node_modules/gulp/bin/gulp.js test"
+ "test": "node ./node_modules/gulp/bin/gulp.js test"
},
"repository": {
"type": "git",