diff --git a/gulpfile.js b/gulpfile.js index 44b32f1..031e97d 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -16,13 +16,7 @@ exports.clean = function clean() { }; exports.generate = function generate() { - return new Haxe().haxelib([ - 'run', 'protohx', 'generate', 'protohx.json' - ]); -}; - -exports.install = function install() { - return new Haxe().install(packageInfo.haxeDependencies); + return new Haxe().haxelib(['run', 'protohx', 'generate', 'protohx.json']); }; /** @@ -30,7 +24,6 @@ exports.install = function install() { * windows target * window exe package (innosetup) */ - const config = new Project.Config({ meta: { title: 'Tank\'z', @@ -66,7 +59,8 @@ const client = new Project( sources: ['src/client/haxe'], assets: ['src/client/resources'], main: 'ru.m.tankz.Client', - }) + }), + module.exports.generate ).bind(module); /** @@ -102,8 +96,6 @@ const server = new Project( */ module.exports.default = gulp.series( exports.clean, - exports.install, - exports.generate, module.exports['client:flash:build'], module.exports['client:html5:build'], module.exports['client:linux:build'], diff --git a/package.json b/package.json index 0a5f4d9..8bae11d 100755 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "dateformat": "^3.0.3", "gulp": "^4.0.0", "gulp-clean": "^0.4.0", - "gulp-haxetool": "^0.0.8" + "gulp-haxetool": "^0.0.9" }, "haxeDependencies": { "lime": "6.0.1", @@ -19,5 +19,8 @@ "orm": "2.1.0", "yield": "1.1.2", "haxe-crypto": "0.0.7" + }, + "dependencies": { + "gulp-add": "0.0.2" } }