提交 b76da24d 编写于 作者: J Joao Moreno

clean up pty.js on packaging

fixes #6963
上级 54a692ae
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
var gulp = require('gulp'); var gulp = require('gulp');
var fs = require('fs'); var fs = require('fs');
var path = require('path'); var path = require('path');
var os = require('os');
var es = require('event-stream'); var es = require('event-stream');
var azure = require('gulp-azure-storage'); var azure = require('gulp-azure-storage');
var electron = require('gulp-atom-electron'); var electron = require('gulp-atom-electron');
...@@ -202,10 +201,11 @@ function packageTask(platform, arch, opts) { ...@@ -202,10 +201,11 @@ function packageTask(platform, arch, opts) {
.map(function (d) { return ['node_modules/' + d + '/**', '!node_modules/' + d + '/**/{test,tests}/**']; })); .map(function (d) { return ['node_modules/' + d + '/**', '!node_modules/' + d + '/**/{test,tests}/**']; }));
var deps = gulp.src(depsSrc, { base: '.', dot: true }) var deps = gulp.src(depsSrc, { base: '.', dot: true })
.pipe(util.cleanNodeModule('fsevents', ['binding.gyp', 'fsevents.cc', 'build/**', 'src/**', 'test/**'], true)) .pipe(util.cleanNodeModule('fsevents', ['binding.gyp', 'fsevents.cc', 'build/**', 'src/**', 'test/**'], ['**/*.node']))
.pipe(util.cleanNodeModule('oniguruma', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], true)) .pipe(util.cleanNodeModule('oniguruma', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node']))
.pipe(util.cleanNodeModule('windows-mutex', ['binding.gyp', 'build/**', 'src/**'], true)) .pipe(util.cleanNodeModule('windows-mutex', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
.pipe(util.cleanNodeModule('native-keymap', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], true)); .pipe(util.cleanNodeModule('native-keymap', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node']))
.pipe(util.cleanNodeModule('pty.js', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['build/Release/**']));
var all = es.merge( var all = es.merge(
api, api,
......
...@@ -183,7 +183,7 @@ exports.skipDirectories = function () { ...@@ -183,7 +183,7 @@ exports.skipDirectories = function () {
}); });
}; };
exports.cleanNodeModule = function (name, excludes, isNative) { exports.cleanNodeModule = function (name, excludes, includes) {
var glob = function (path) { return '**/node_modules/' + name + (path ? '/' + path : ''); }; var glob = function (path) { return '**/node_modules/' + name + (path ? '/' + path : ''); };
var negate = function (str) { return '!' + str; }; var negate = function (str) { return '!' + str; };
...@@ -194,8 +194,9 @@ exports.cleanNodeModule = function (name, excludes, isNative) { ...@@ -194,8 +194,9 @@ exports.cleanNodeModule = function (name, excludes, isNative) {
var nodeModuleInput = input.pipe(allFilter); var nodeModuleInput = input.pipe(allFilter);
var output = nodeModuleInput.pipe(filter(globs)); var output = nodeModuleInput.pipe(filter(globs));
if (isNative) { if (includes) {
output = es.merge(output, nodeModuleInput.pipe(filter(glob('**/*.node')))); var includeGlobs = includes.map(glob);
output = es.merge(output, nodeModuleInput.pipe(filter(includeGlobs)));
} }
output = output.pipe(allFilter.restore); output = output.pipe(allFilter.restore);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册