diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index fd470b55da56443491d80636c34cbcd80a878697..fc896f9a11faec45f3fb579261f64ddea3258fa8 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -11,7 +11,7 @@ const path = require('path'); const es = require('event-stream'); const azure = require('gulp-azure-storage'); const electron = require('gulp-atom-electron'); -const symdest = require('gulp-symdest'); +const vfs = require('vinyl-fs'); const rename = require('gulp-rename'); const replace = require('gulp-replace'); const filter = require('gulp-filter'); @@ -130,7 +130,7 @@ gulp.task('electron', ['clean-electron'], () => { .pipe(json({ name })) .pipe(electron(opts)) .pipe(filter(['**', '!**/app/package.json'])) - .pipe(symdest('.build/electron')); + .pipe(vfs.dest('.build/electron')); }); const languages = ['chs', 'cht', 'jpn', 'kor', 'deu', 'fra', 'esn', 'rus', 'ita']; @@ -243,7 +243,7 @@ function packageTask(platform, arch, opts) { .pipe(rename('bin/' + product.applicationName))); } - return result.pipe(symdest(destination)); + return result.pipe(vfs.dest(destination)); }; } diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js index b34f7475aa46f21437c26e837eb435b8df4646cd..c1e220382b8b062f3525bfb4b9a332861d71b87e 100644 --- a/build/gulpfile.vscode.linux.js +++ b/build/gulpfile.vscode.linux.js @@ -10,7 +10,7 @@ const replace = require('gulp-replace'); const rename = require('gulp-rename'); const shell = require('gulp-shell'); const es = require('event-stream'); -const symdest = require('gulp-symdest'); +const vfs = require('vinyl-fs'); const util = require('./lib/util'); const packageJson = require('../package.json'); const product = require('../product.json'); @@ -55,22 +55,22 @@ function prepareDebPackage(arch) { const prerm = gulp.src('resources/linux/debian/prerm.template', { base: '.' }) .pipe(replace('@@NAME@@', product.applicationName)) - .pipe(rename('DEBIAN/prerm')) + .pipe(rename('DEBIAN/prerm')); const postrm = gulp.src('resources/linux/debian/postrm.template', { base: '.' }) .pipe(replace('@@NAME@@', product.applicationName)) - .pipe(rename('DEBIAN/postrm')) + .pipe(rename('DEBIAN/postrm')); const postinst = gulp.src('resources/linux/debian/postinst.template', { base: '.' }) .pipe(replace('@@NAME@@', product.applicationName)) .pipe(replace('@@ARCHITECTURE@@', debArch)) .pipe(replace('@@QUALITY@@', product.quality || '@@QUALITY@@')) .pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@')) - .pipe(rename('DEBIAN/postinst')) + .pipe(rename('DEBIAN/postinst')); const all = es.merge(control, postinst, postrm, prerm, desktop, icon, code); - return all.pipe(symdest(destination)); + return all.pipe(vfs.dest(destination)); }; } @@ -124,8 +124,8 @@ function prepareRpmPackage(arch) { const all = es.merge(code, desktop, icon, spec, specIcon); - return all.pipe(symdest(getRpmBuildPath(rpmArch))); - } + return all.pipe(vfs.dest(getRpmBuildPath(rpmArch))); + }; } function buildRpmPackage(arch) { @@ -133,6 +133,7 @@ function buildRpmPackage(arch) { const rpmBuildPath = getRpmBuildPath(rpmArch); const rpmOut = rpmBuildPath + '/RPMS/' + rpmArch; const destination = '.build/linux/rpm/' + rpmArch; + return shell.task([ 'mkdir -p ' + destination, 'HOME="$(pwd)/' + destination + '" fakeroot rpmbuild -bb ' + rpmBuildPath + '/SPECS/' + product.applicationName + '.spec --target=' + rpmArch, diff --git a/package.json b/package.json index cebef197ac0f7d73ab3a1ee8676c2676f743873f..0f2e300fff6c0173c716d6e827e8a8d6a9a1bee2 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,6 @@ "gulp-replace": "^0.5.4", "gulp-shell": "^0.5.2", "gulp-sourcemaps": "^1.6.0", - "gulp-symdest": "^1.1.0", "gulp-tsb": "^1.10.1", "gulp-tslint": "^4.3.0", "gulp-uglify": "^1.4.1", @@ -91,6 +90,7 @@ "uglify-js": "2.4.8", "underscore": "^1.8.2", "vinyl": "^0.4.5", + "vinyl-fs": "^2.4.3", "vscode-nls-dev": "^1.0.0" }, "repository": {