build: use ruffle

2026-07-13 22:20:27 +03:00
3 changed files with 7484 additions and 7502 deletions
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,11 +1,13 @@
-const gulp = require('gulp');
-const gulpClean = require('gulp-clean');
-const Config = require('./config.json');
-const packageInfo = require('./package.json');
-const {System, Sdk, Haxe, Project} = require('gulp-haxetool');
-const dateformat = require('dateformat');
-const argv = require('yargs').argv;
-const publish = require('./tasks/gulp-publish');
+const gulp = require("gulp");
+const gulpClean = require("gulp-clean");
+const Config = require("./config.json");
+const packageInfo = require("./package.json");
+const { System, Sdk, Haxe, Project } = require("gulp-haxetool");
+const dateformat = require("dateformat");
+const argv = require("yargs").argv;
+const publish = require("./tasks/gulp-publish");
+
+Project.useRuffle();

 if (packageInfo.haxe) {
  Haxe.VERSION = packageInfo.haxe;
@@ -20,7 +22,7 @@ if (Config.BuildDir) {
 }

 exports.clean = function clean() {
-    return gulp.src('target/*', {read: false}).pipe(gulpClean());
+  return gulp.src("target/*", { read: false }).pipe(gulpClean());
 };

 exports.setup = function setup() {
@@ -49,32 +51,25 @@ exports.generate = function generate() {
 */
 const config = new Project.Config({
  meta: {
-        title: 'Tank\'z',
-        filename: 'tankz',
-        icon: 'src/client/resources/icon.png',
-        pack: 'ru.m.tankz',
-        author: 'shmyga <shmyga.z@gmail.com>',
-        company: 'MegaLoMania',
-        version: packageInfo.version + (Config.Develop ? '-SNAPSHOT' : ''),
+    title: "Tank'z",
+    filename: "tankz",
+    icon: "src/client/resources/icon.png",
+    pack: "ru.m.tankz",
+    author: "shmyga <shmyga.z@gmail.com>",
+    company: "MegaLoMania",
+    version: packageInfo.version + (Config.Develop ? "-SNAPSHOT" : ""),
  },
  key: Config.Key,
  libs: packageInfo.haxeDependencies,
-    sources: [
-        'src/common/haxe',
-        'src-gen/haxe',
-    ],
-    assets: [
-        'src/common/resources/config',
-    ],
-    flags: [
-        'proto_debug',
-    ],
+  sources: ["src/common/haxe", "src-gen/haxe"],
+  assets: ["src/common/resources/config"],
+  flags: ["proto_debug"],
  macros: [
-        `CompilationOption.set('build','${dateformat(new Date(), 'yyyy-mm-dd HH:MM:ss')}')`,
-    ]
+    `CompilationOption.set('build','${dateformat(new Date(), "yyyy-mm-dd HH:MM:ss")}')`,
+  ],
 });

-const host = argv.host || 'localhost';
+const host = argv.host || "localhost";
 const port = argv.port || 5000;

 /**
@@ -90,16 +85,11 @@ const client = new Project(
    Project.Platform.ANDROID,
  ],
  config.branch({
-        name: 'client',
-        sources: [
-            'src/client/haxe',
-        ],
-        main: 'ru.m.tankz.Client',
-        preloader: 'ru.m.tankz.Preloader',
-        assets: [
-            'src/common/resources/level',
-            'src/client/resources',
-        ],
+    name: "client",
+    sources: ["src/client/haxe"],
+    main: "ru.m.tankz.Client",
+    preloader: "ru.m.tankz.Preloader",
+    assets: ["src/common/resources/level", "src/client/resources"],
    meta: {
      width: 1024,
      height: 576,
@@ -113,7 +103,7 @@ const client = new Project(
    macros: [
      `CompilationOption.set('host','${host}')`,
      `CompilationOption.set('port',${port})`,
-        ]
+    ],
  }),
 ).bind(module, gulp);

@@ -122,33 +112,23 @@ const client = new Project(
 */
 const editor = new Project(
  Project.BuildSystem.OPENFL,
-    [
-        Project.Platform.FLASH,
-        Project.Platform.HTML5,
-        Project.Platform.LINUX,
-    ],
+  [Project.Platform.FLASH, Project.Platform.HTML5, Project.Platform.LINUX],
  config.branch({
-        name: 'editor',
-        sources: [
-            'src/client/haxe',
-            'src/editor/haxe',
-        ],
-        main: 'ru.m.tankz.editor.Editor',
-        preloader: 'ru.m.tankz.Preloader',
-        assets: [
-            'src/client/resources',
-            'src/editor/resources',
-        ],
+    name: "editor",
+    sources: ["src/client/haxe", "src/editor/haxe"],
+    main: "ru.m.tankz.editor.Editor",
+    preloader: "ru.m.tankz.Preloader",
+    assets: ["src/client/resources", "src/editor/resources"],
    meta: {
-            filename: 'editor',
-            pack: 'ru.m.tankz.editor',
+      filename: "editor",
+      pack: "ru.m.tankz.editor",
      width: 1024,
      height: 768,
    },
    flags: [
      //'dev_layout',
-        ]
-    })
+    ],
+  }),
 ).bind(module, gulp);

 /**
@@ -158,19 +138,22 @@ const server = new Project(
  Project.BuildSystem.HAXE,
  Project.Platform.CPP,
  config.branch({
-        name: 'server',
-        sources: ['src/server/haxe'],
-        main: 'ru.m.tankz.server.Server',
-        assets: [
-            'src/common/resources/level',
-        ]
+    name: "server",
+    sources: ["src/server/haxe"],
+    main: "ru.m.tankz.server.Server",
+    assets: ["src/common/resources/level"],
  }),
 ).bind(module, gulp);

 /**
 * publish
 */
-module.exports.publish = publish(packageInfo.name, packageInfo.version, Config.PublishDir, Config.PublishUrl);
+module.exports.publish = publish(
+  packageInfo.name,
+  packageInfo.version,
+  Config.PublishDir,
+  Config.PublishUrl,
+);

 /**
 * default
@@ -178,37 +161,35 @@ module.exports.publish = publish(packageInfo.name, packageInfo.version, Config.P
 const defaultSeries = [
  exports.clean,
  exports.generate,
-    module.exports['client:flash:build'],
-    module.exports['client:flash:html'],
-    module.exports['client:html5:build'],
+  module.exports["client:flash:build"],
+  module.exports["client:flash:html"],
+  module.exports["client:html5:build"],

-    module.exports['editor:flash:build'],
-    module.exports['editor:flash:html'],
-    module.exports['editor:html5:build'],
+  module.exports["editor:flash:build"],
+  module.exports["editor:flash:html"],
+  module.exports["editor:html5:build"],

-    module.exports['server:cpp:build'],
+  module.exports["server:cpp:build"],
 ];

 if (System.isLinux) {
  defaultSeries.push(
-        module.exports['client:linux:build'],
-        module.exports['client:linux:archive'],
-        module.exports['client:linux:deb'],
+    module.exports["client:linux:build"],
+    module.exports["client:linux:archive"],
+    module.exports["client:linux:deb"],

-        module.exports['client:android:build'],
+    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'],
+    module.exports["client:windows:build"],
+    module.exports["client:windows:archive"],
+    module.exports["client:windows:installer"],
  );
 }

-defaultSeries.push(
-    exports.publish,
-);
+defaultSeries.push(exports.publish);

 module.exports.default = gulp.series(defaultSeries);
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,18 +1,18 @@
 {
  "name": "tankz",
-    "version": "0.17.6",
+  "version": "0.18.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "tankz",
-            "version": "0.17.6",
+      "version": "0.18.0",
      "devDependencies": {
        "dateformat": "^3.0.3",
        "gulp": "^4.0.0",
        "gulp-add": "0.0.2",
        "gulp-clean": "^0.4.0",
-                "gulp-haxetool": "^0.1.9",
+        "gulp-haxetool": "^0.2.1",
        "yargs": "^13.2.4"
      }
    },
@@ -3296,10 +3296,11 @@
      }
    },
    "node_modules/gulp-haxetool": {
-            "version": "0.1.9",
-            "resolved": "https://registry.npmjs.org/gulp-haxetool/-/gulp-haxetool-0.1.9.tgz",
-            "integrity": "sha512-ABS3nWVrGMA0iLnIoOHl06zp6OOB9BCE5Nda0cpuaKVX2LGMPnJMhxPJNDQXvMhYTDnX90z2EpyIFDH6Pyv37A==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/gulp-haxetool/-/gulp-haxetool-0.2.1.tgz",
+      "integrity": "sha512-+p38E66G67AxYY1V8ZHRGlNG08EnfdEJezteKhocjBFjnGIguJrwFc0paGvL/zlyWJV1vSyfiLWN8J5HYZLjYg==",
      "dev": true,
+      "license": "ISC",
      "dependencies": {
        "ansi-colors": "^1.1.0",
        "async": "^2.6.0",
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
    "gulp": "^4.0.0",
    "gulp-add": "0.0.2",
    "gulp-clean": "^0.4.0",
-    "gulp-haxetool": "^0.1.9",
+    "gulp-haxetool": "^0.2.1",
    "yargs": "^13.2.4"
  },
  "haxeDependencies": {