Compare commits

..
1 Commits
Author SHA1 Message Date
shmyga 6d269e3c82 feat: add task module
test / test (push) Successful in 59s
2026-11-10 15:34:23 +03:00
19 changed files with 160 additions and 153 deletions
+29
View File
@@ -0,0 +1,29 @@
## v0.2.0 (2026-05-15)
### Feat
- **ruffle**: add alternative ruffle flash target runner
## 0.1.9 (2021-05-24)
### Feat
- **android**: up android sdk version
## 0.1.8 (2020-03-30)
## 0.1.7 (2020-03-25)
## 0.1.6 (2020-02-19)
## 0.1.5 (2020-02-18)
## 0.1.0 (2019-09-03)
## 0.0.18 (2019-05-20)
## 0.0.17 (2019-03-28)
## 0.0.16 (2019-03-14)
## 0.0.15 (2019-03-14)
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "gulp-haxetool", "name": "gulp-haxetool",
"version": "2.1.0", "version": "2.0.4",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "gulp-haxetool", "name": "gulp-haxetool",
"version": "2.1.0", "version": "2.0.4",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"ajv": "^8.20.0", "ajv": "^8.20.0",
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"name": "gulp-haxetool", "name": "gulp-haxetool",
"type": "module", "type": "module",
"version": "2.1.0", "version": "2.0.4",
"description": "HaXe Tool with Gulp", "description": "HaXe Tool with Gulp",
"exports": { "exports": {
"./bin/cli": "./dist/bin/cli.mjs", "./bin/cli": "./dist/bin/cli.mjs",
+2 -2
View File
@@ -84,8 +84,8 @@ export const branch = (config: Config, source: ConfigSource | Config): Config =>
if (source.haxe !== undefined) { if (source.haxe !== undefined) {
result.haxe = source.haxe; result.haxe = source.haxe;
} }
if (result.icon) { if (result.meta.icon) {
result.icon = absolutePath(result.icon); result.icon = absolutePath(result.meta.icon);
} }
if (!result.meta.mobileWidth) { if (!result.meta.mobileWidth) {
+3 -5
View File
@@ -18,7 +18,7 @@ export class Sdk {
} }
static path(name: string, version: string) { static path(name: string, version: string) {
return path.resolve(path.join(this.dir, name, version)); return path.join(this.dir, name, version);
} }
public name: string; public name: string;
@@ -26,8 +26,6 @@ export class Sdk {
public log: Logger; public log: Logger;
public path: string; public path: string;
protected strip: number = 1;
constructor(name: string, version: string) { constructor(name: string, version: string) {
this.name = name; this.name = name;
this.log = new Logger(name); this.log = new Logger(name);
@@ -57,14 +55,14 @@ export class Sdk {
}; };
} }
prepare(): Promise<any> { prepare(strip = 1): Promise<any> {
this.log.i("version: *%s*", this.version); this.log.i("version: *%s*", this.version);
if (this.prepared) { if (this.prepared) {
return Promise.resolve(); return Promise.resolve();
} else { } else {
const url = resolveLink(this.link, { name: this.name, version: this.version }); const url = resolveLink(this.link, { name: this.name, version: this.version });
this.log.i("download: *%s*", url); this.log.i("download: *%s*", url);
return download(url, this.path, { strip: this.strip }); return download(url, this.path, { strip });
} }
} }
} }
+2 -1
View File
@@ -24,6 +24,7 @@ export interface LibDef {
export interface ConfigMeta { export interface ConfigMeta {
title?: string; title?: string;
filename?: string; filename?: string;
icon?: string;
version?: string; version?: string;
pack?: string; pack?: string;
author?: string; author?: string;
@@ -73,7 +74,7 @@ export interface Config {
libs: LibDef[]; libs: LibDef[];
macros: string[]; macros: string[];
flags: string[]; flags: string[];
icon: string; icon: string | null;
meta: ConfigMeta; meta: ConfigMeta;
key: SignKey | null; key: SignKey | null;
android: AndroidPreset[]; android: AndroidPreset[];
+1 -3
View File
@@ -40,8 +40,6 @@ export class Android extends Sdk {
url = "https://dl.google.com/android/repository/commandlinetools-<%= os_name %>-<%= version %>_latest.zip"; url = "https://dl.google.com/android/repository/commandlinetools-<%= os_name %>-<%= version %>_latest.zip";
protected strip = 0;
constructor(version?: string, ndkVersion?: string) { constructor(version?: string, ndkVersion?: string) {
super(Android.ID, version || Android.VERSION); super(Android.ID, version || Android.VERSION);
this.ndk = new AndroidNdk(ndkVersion); this.ndk = new AndroidNdk(ndkVersion);
@@ -69,7 +67,7 @@ export class Android extends Sdk {
prepare(): Promise<any> { prepare(): Promise<any> {
const result = []; const result = [];
result.push(super.prepare()); result.push(super.prepare(0));
result.push(this.ndk.prepare()); result.push(this.ndk.prepare());
return Promise.all(result); return Promise.all(result);
} }
+4 -2
View File
@@ -26,8 +26,6 @@ export class FlashPlayer extends Sdk {
private debug: boolean; private debug: boolean;
protected strip = 0;
url = url =
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/" +
"<%= version %>/" + "<%= version %>/" +
@@ -38,6 +36,10 @@ export class FlashPlayer extends Sdk {
this.debug = debug; this.debug = debug;
} }
prepare() {
return super.prepare(0);
}
get prepared() { get prepared() {
try { try {
return fs.existsSync(this.flashPlayerBin); return fs.existsSync(this.flashPlayerBin);
+2 -2
View File
@@ -19,8 +19,8 @@ export class InnoSetup extends Sdk {
return "http://www.jrsoftware.org/download.php/is.exe"; return "http://www.jrsoftware.org/download.php/is.exe";
} }
prepare() { prepare(strip = 1) {
let result = super.prepare(); let result = super.prepare(strip);
if (!this.prepared) { if (!this.prepared) {
result = result.then(() => { result = result.then(() => {
return exec(this.path, `is.exe /VERYSILENT /SUPPRESSMSGBOXES /DIR=${this.path}`); return exec(this.path, `is.exe /VERYSILENT /SUPPRESSMSGBOXES /DIR=${this.path}`);
+26 -20
View File
@@ -1,4 +1,3 @@
import type Stream from "stream";
import vfs from "vinyl-fs"; import vfs from "vinyl-fs";
import exec from "../../../common/exec"; import exec from "../../../common/exec";
import { streamToPromise } from "../../../common/util"; import { streamToPromise } from "../../../common/util";
@@ -17,43 +16,50 @@ export class HaxeBuilder extends Builder {
this.android = new Android(); this.android = new Android();
} }
async setup(): Promise<any> { setup() {
await this.haxe.prepare(); let result: Promise<any> = this.haxe.prepare().then(() => this.haxe.install(this.config.libs));
await this.haxe.install(this.config.libs);
if (this.buildSystem === BuildSystem.OPENFL) { if (this.buildSystem === BuildSystem.OPENFL) {
if (this.platform === Platform.ANDROID) { if (this.platform === Platform.ANDROID) {
await this.android.prepare(); result = result
this.android.activate(); .then(() => this.android.prepare())
await this.android.sdkmanager([ .then(() => this.android.activate())
// TODO: android sdk dependencies config? .then(() =>
this.android.sdkmanager([
// ToDo: android sdk dependencies config?
//'tools',
"platform-tools", "platform-tools",
"build-tools;27.0.3", "build-tools;27.0.3",
"platforms;android-28", "platforms;android-28", //ToDo: lime version 7.6.0 -> 28; 7.0.0 -> 26
//'ndk-bundle',
//'lldb;3.1',
"cmake;3.6.4111459", "cmake;3.6.4111459",
]); ]),
);
const AndroidSDK = this.android.android_home; const AndroidSDK = this.android.android_home;
const AndroidNDK = this.android.ndk_home; const AndroidNDK = this.android.ndk_home;
const answer = `echo "${[AndroidSDK, AndroidNDK].join("\n")}"`; const answer = `echo "${[AndroidSDK, AndroidNDK].join("\n")}"`;
await exec(".", [answer, "|", this.haxe.haxelibBin, "run", "openfl", "setup", this.platform].join(" ")); result = result.then(() => {
return exec(".", [answer, "|", this.haxe.haxelibBin, "run", "openfl", "setup", this.platform].join(" "));
});
} }
} }
return result;
} }
async call(): Promise<any> { call() {
const target = this.targetPath; const target = this.targetPath;
let stream: Stream;
switch (this.buildSystem) { switch (this.buildSystem) {
case BuildSystem.OPENFL: case BuildSystem.OPENFL:
stream = await this.haxe.openfl("build", this.platform, this.config, this.debug); return this.haxe.openfl("build", this.platform, this.config, this.debug).then((result) => {
if (this.platform === Platform.ANDROID && this.config.key) { if (this.platform === Platform.ANDROID && this.config.key) {
stream = stream.pipe(this.android.sign(this.config.key.store, this.config.key.pass)); result = result.pipe(this.android.sign(this.config.key.store, this.config.key.pass));
} }
return streamToPromise(stream.pipe(vfs.dest(target))); return streamToPromise(result.pipe(vfs.dest(target)));
});
case BuildSystem.HAXE: case BuildSystem.HAXE:
stream = await this.haxe.build(this.platform, this.config, this.debug); return this.haxe
return streamToPromise(stream.pipe(vfs.dest(target))); .build(this.platform, this.config, this.debug)
default: .then((result) => streamToPromise(result.pipe(vfs.dest(target))));
return super.call();
} }
} }
} }
+6 -8
View File
@@ -8,12 +8,6 @@ import template from "../../../../common/template";
import { type Config, Platform } from "../../../../core/type"; import { type Config, Platform } from "../../../../core/type";
import { Packer } from "../../../core/packer"; import { Packer } from "../../../core/packer";
const UPDATE_MENUS = `
if [ "$1" = "configure" ] && [ -x "\`which update-menus 2>/dev/null\`" ] ; then
update-menus
fi
`;
export class LinuxDEBPacker extends Packer { export class LinuxDEBPacker extends Packer {
static NAME = "deb"; static NAME = "deb";
@@ -24,7 +18,7 @@ export class LinuxDEBPacker extends Packer {
call() { call() {
const target = this.targetPath; const target = this.targetPath;
const buildDir = path.join(os.tmpdir(), "build", this.config.name, "debian"); const buildDir = path.join(os.tmpdir(), "build", this.config.name, "debian");
const icon = this.config.icon; const icon = this.config.meta.icon!;
const iconfile = `${this.config.meta.filename}${path.extname(icon)}`; const iconfile = `${this.config.meta.filename}${path.extname(icon)}`;
const desktop = template.render("linux/app.desktop", { iconfile: iconfile, ...this.config }); const desktop = template.render("linux/app.desktop", { iconfile: iconfile, ...this.config });
fse.ensureDirSync(`${buildDir}/usr/share/applications`); fse.ensureDirSync(`${buildDir}/usr/share/applications`);
@@ -41,7 +35,11 @@ export class LinuxDEBPacker extends Packer {
maintainer: this.config.meta.author, maintainer: this.config.meta.author,
description: this.config.meta.title, description: this.config.meta.title,
changelog: [], changelog: [],
postinst: [UPDATE_MENUS], postinst: [
'if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ] ; then\n' +
" update-menus\n" +
"fi",
],
_target: "/", _target: "/",
_out: this.resolveTargetPath("debian"), _out: this.resolveTargetPath("debian"),
_clean: true, _clean: true,
+11 -5
View File
@@ -1,6 +1,6 @@
import { branch, compile } from "../core/config"; import { branch, compile } from "../core/config";
import type { Config } from "../core/type"; import type { Config } from "../core/type";
import type { TaskCompilerType, TaskDef } from "./core"; import type { TaskBundle, TaskCompilerType } from "./core";
import { CleanTaskCompiler } from "./impl/clean"; import { CleanTaskCompiler } from "./impl/clean";
import { FormatTaskCompiler } from "./impl/format"; import { FormatTaskCompiler } from "./impl/format";
import { ProjectTaskCompiler } from "./impl/project"; import { ProjectTaskCompiler } from "./impl/project";
@@ -10,14 +10,20 @@ import { SetupTaskCompiler } from "./impl/setup";
const COMPILERS: TaskCompilerType[] = [FormatTaskCompiler, CleanTaskCompiler, SetupTaskCompiler, ProtoTaskCompiler]; const COMPILERS: TaskCompilerType[] = [FormatTaskCompiler, CleanTaskCompiler, SetupTaskCompiler, ProtoTaskCompiler];
const PROJECT_COMPILERS: TaskCompilerType[] = [ProjectTaskCompiler]; const PROJECT_COMPILERS: TaskCompilerType[] = [ProjectTaskCompiler];
export default function* (projects: Config[]): Iterable<TaskDef> { export default (projects: Config[]): TaskBundle => {
const bundle: TaskBundle = {};
const config = projects.reduce((config, project) => branch(config, project), compile({})); const config = projects.reduce((config, project) => branch(config, project), compile({}));
for (const compiler of COMPILERS) { for (const compiler of COMPILERS) {
yield* new compiler(config).compile(); for (const [name, task] of Object.entries(new compiler(config).compile())) {
bundle[name] = task;
}
} }
for (const compiler of PROJECT_COMPILERS) { for (const compiler of PROJECT_COMPILERS) {
for (const project of projects) { for (const project of projects) {
yield* new compiler(project).compile(); for (const [name, task] of Object.entries(new compiler(project).compile())) {
bundle[name] = task;
} }
} }
} }
return bundle;
};
+4 -4
View File
@@ -1,22 +1,22 @@
import type { TaskFunction } from "gulp"; import type { TaskFunction } from "gulp";
import type { Config } from "../core/type"; import type { Config } from "../core/type";
export type TaskBundle = Record<string, TaskFunction>;
export interface TaskCompiler { export interface TaskCompiler {
config: Config; config: Config;
debug?: boolean; debug?: boolean;
compile(): Iterable<TaskDef>; compile(): TaskBundle;
} }
export type TaskDef = readonly [string, TaskFunction] | readonly [string, TaskFunction, boolean];
export abstract class TaskCompilerImpl implements TaskCompiler { export abstract class TaskCompilerImpl implements TaskCompiler {
constructor( constructor(
public config: Config, public config: Config,
public debug?: boolean, public debug?: boolean,
) {} ) {}
abstract compile(): Iterable<TaskDef>; abstract compile(): TaskBundle;
} }
export type TaskCompilerType = new (config: Config, debug?: boolean) => TaskCompiler; export type TaskCompilerType = new (config: Config, debug?: boolean) => TaskCompiler;
+7 -3
View File
@@ -1,9 +1,13 @@
import gulp from "gulp"; import gulp from "gulp";
import gulpClean from "gulp-clean"; import gulpClean from "gulp-clean";
import { TaskCompilerImpl, type TaskDef } from "../core"; import { TaskCompilerImpl, type TaskBundle } from "../core";
export class CleanTaskCompiler extends TaskCompilerImpl { export class CleanTaskCompiler extends TaskCompilerImpl {
*compile(): Iterable<TaskDef> { compile(): TaskBundle {
yield ["clean", () => gulp.src("target/*", { read: false }).pipe(gulpClean()), true]; return {
clean: () => {
return gulp.src("target/*", { read: false }).pipe(gulpClean());
},
};
} }
} }
+6 -15
View File
@@ -1,15 +1,10 @@
import fs from "fs";
import path from "path";
import { Haxe } from "../../impl/haxe"; import { Haxe } from "../../impl/haxe";
import { TaskCompilerImpl, type TaskDef } from "../core"; import { TaskCompilerImpl, type TaskBundle } from "../core";
export class FormatTaskCompiler extends TaskCompilerImpl { export class FormatTaskCompiler extends TaskCompilerImpl {
*compile(): Iterable<TaskDef> { compile(): TaskBundle {
const hxformatFile = path.join(".", "hxformat.json"); return {
if (fs.existsSync(hxformatFile)) { check: async () => {
yield [
"check",
async () => {
const haxe = new Haxe(this.config.haxe); const haxe = new Haxe(this.config.haxe);
await haxe.install({ formatter: "" }); await haxe.install({ formatter: "" });
await haxe.haxelib( await haxe.haxelib(
@@ -18,10 +13,7 @@ export class FormatTaskCompiler extends TaskCompilerImpl {
), ),
); );
}, },
]; format: async () => {
yield [
"format",
async () => {
const haxe = new Haxe(this.config.haxe); const haxe = new Haxe(this.config.haxe);
await haxe.install({ formatter: "" }); await haxe.install({ formatter: "" });
await haxe.haxelib( await haxe.haxelib(
@@ -30,7 +22,6 @@ export class FormatTaskCompiler extends TaskCompilerImpl {
), ),
); );
}, },
]; };
}
} }
} }
+9 -20
View File
@@ -1,42 +1,31 @@
import gulp from "gulp"; import gulp from "gulp";
import os from "os";
import { Platform } from "../../core/type";
import { Builder, Packer, Runner } from "../../project"; import { Builder, Packer, Runner } from "../../project";
import { TaskCompilerImpl, type TaskDef } from "../core"; import { TaskCompilerImpl, type TaskBundle } from "../core";
const isPlatformSupported = (platform: Platform): boolean => {
switch (platform) {
case Platform.LINUX:
return os.type() === "Linux";
case Platform.WINDOWS:
return os.type() === "Windows_NT";
default:
return true;
}
};
export class ProjectTaskCompiler extends TaskCompilerImpl { export class ProjectTaskCompiler extends TaskCompilerImpl {
*compile(): Iterable<TaskDef> { compile(): TaskBundle {
for (const platform of this.config.platforms.filter(isPlatformSupported)) { const tasks: TaskBundle = {};
for (const platform of this.config.platforms) {
const builder = Builder.new(this.config, platform, this.config.buildSystem, this.debug); const builder = Builder.new(this.config, platform, this.config.buildSystem, this.debug);
const setupKey = `${this.config.name}:${platform}:setup`; const setupKey = `${this.config.name}:${platform}:setup`;
const buildKey = `${this.config.name}:${platform}:build`; const buildKey = `${this.config.name}:${platform}:build`;
yield [setupKey, builder.setup.bind(builder)]; tasks[setupKey] = builder.setup.bind(builder);
yield [buildKey, gulp.series(builder.setup.bind(builder), builder.call.bind(builder)), true]; tasks[buildKey] = gulp.series(builder.setup.bind(builder), builder.call.bind(builder));
if (Runner.factory[platform]) { if (Runner.factory[platform]) {
const testKey = `${this.config.name}:${platform}:test`; const testKey = `${this.config.name}:${platform}:test`;
const runner = Runner.new(this.config, platform, this.debug); const runner = Runner.new(this.config, platform, this.debug);
yield [testKey, gulp.series(builder.setup.bind(builder), runner.setup.bind(runner), runner.call.bind(runner))]; tasks[testKey] = gulp.series(builder.setup.bind(builder), runner.setup.bind(runner), runner.call.bind(runner));
} }
if (Packer.factory[platform]) { if (Packer.factory[platform]) {
for (const name of Object.keys(Packer.factory[platform])) { for (const name of Object.keys(Packer.factory[platform])) {
const packKey = `${this.config.name}:${platform}:${name}`; const packKey = `${this.config.name}:${platform}:${name}`;
const packer = Packer.new(this.config, platform, name); const packer = Packer.new(this.config, platform, name);
yield [packKey, gulp.series(packer.setup.bind(packer), packer.call.bind(packer)), true]; tasks[packKey] = gulp.series(packer.setup.bind(packer), packer.call.bind(packer));
} }
} }
} }
return tasks;
} }
} }
+5 -12
View File
@@ -1,23 +1,16 @@
import fs from "fs";
import path from "path";
import { Haxe } from "../../impl/haxe"; import { Haxe } from "../../impl/haxe";
import { TaskCompilerImpl, type TaskDef } from "../core"; import { TaskCompilerImpl, type TaskBundle } from "../core";
export class ProtoTaskCompiler extends TaskCompilerImpl { export class ProtoTaskCompiler extends TaskCompilerImpl {
*compile(): Iterable<TaskDef> { compile(): TaskBundle {
const protohxFile = path.join(".", "protohx.json"); return {
if (fs.existsSync(protohxFile)) { "protohx:generate": async () => {
yield [
"protohx:generate",
async () => {
const haxe = new Haxe(this.config.haxe); const haxe = new Haxe(this.config.haxe);
const result = await haxe.haxelib(["run", "protohx", "generate", "protohx.json"]); const result = await haxe.haxelib(["run", "protohx", "generate", "protohx.json"]);
if (result.stdout.indexOf("FAIL") > -1) { if (result.stdout.indexOf("FAIL") > -1) {
throw result.stdout; throw result.stdout;
} }
}, },
true, };
];
}
} }
} }
+9 -10
View File
@@ -1,15 +1,14 @@
import { Haxe } from "../../impl/haxe"; import { Builder } from "../../project";
import { TaskCompilerImpl, type TaskDef } from "../core"; import { TaskCompilerImpl, type TaskBundle } from "../core";
export class SetupTaskCompiler extends TaskCompilerImpl { export class SetupTaskCompiler extends TaskCompilerImpl {
*compile(): Iterable<TaskDef> { compile(): TaskBundle {
yield [ return {
"setup", clean: () => {
async () => { return Promise.all(
const haxe = new Haxe(this.config.haxe); this.config.platforms.map((platform) => Builder.new(this.config, platform, this.config.buildSystem).setup()),
await haxe.prepare(); );
await haxe.install(this.config.libs);
}, },
]; };
} }
} }
+4 -11
View File
@@ -1,15 +1,8 @@
import gulp from "gulp"; import gulp from "gulp";
import type { TaskDef } from "./core"; import type { TaskBundle } from "./core";
export default (tasks: Iterable<TaskDef>) => { export default (tasks: TaskBundle) => {
const defaultTasks = []; for (const [name, task] of Object.entries(tasks)) {
for (const item of tasks) { gulp.task(name, task);
gulp.task(item[0], item[1]);
if (item[2]) {
defaultTasks.push(item[0]);
}
}
if (defaultTasks.length > 0) {
gulp.task("default", gulp.series(defaultTasks));
} }
}; };