[build] fixes for windows

This commit is contained in:
2019-09-03 20:57:28 +03:00
parent c2b0618c93
commit 42fd008a54
3 changed files with 41 additions and 15 deletions

View File

@@ -4,7 +4,7 @@ const foreach = require('gulp-foreach');
const gulpClean = require('gulp-clean');
const Config = require('./config.json');
const packageInfo = require('./package.json');
const {Sdk, Haxe, Project, FlashPlayer} = require('gulp-haxetool');
const {System, Sdk, Haxe, Project} = require('gulp-haxetool');
const path = require('path');
const dateformat = require('dateformat');
const argv = require('yargs').argv;
@@ -125,7 +125,11 @@ const editor = new Project(
],
config.branch({
name: 'editor',
sources: ['src/client/haxe', 'src/editor/haxe'],
sources: [
'src/fixes/haxe',
'src/client/haxe',
'src/editor/haxe',
],
main: 'ru.m.tankz.editor.Editor',
preloader: 'ru.m.tankz.Preloader',
assets: [
@@ -159,27 +163,46 @@ const server = new Project(
/**
* publish
*/
module.exports.publish = publish(config.name, config.version, Config.PublishDir);
module.exports.publish = publish(packageInfo.name, packageInfo.version, Config.PublishDir, Config.PublishUrl);
/**
* default
*/
module.exports.default = gulp.series(
const defaultSeries = [
exports.clean,
exports.levels,
exports.generate,
module.exports['client:flash:build'],
module.exports['client:flash:html'],
module.exports['client:html5:build'],
module.exports['client:linux:build'],
module.exports['client:linux:deb'],
module.exports['client:linux:archive'],
module.exports['client:android:build'],
module.exports['editor:flash:build'],
module.exports['editor:flash:html'],
module.exports['editor:html5:build'],
module.exports['server:neko:build'],
];
if (System.isLinux) {
defaultSeries.push(
module.exports['client:linux:build'],
module.exports['client:linux:archive'],
module.exports['client:linux:deb'],
module.exports['client:android:build'],
);
}
if (System.isWindows) {
defaultSeries.push(
module.exports['client:windows:build'],
module.exports['client:windows:archive'],
module.exports['client:windows:installer'],
);
}
defaultSeries.push(
exports.publish,
);
module.exports.default = gulp.series(defaultSeries);