Compare commits

...
24 Commits
Author SHA1 Message Date
shmyga 7615dbfc48 ci(version): 2.0.4
release / release (push) Failing after 5m38s
test / test (push) Failing after 5m44s
2026-11-01 21:22:45 +03:00
shmyga d079cbaac5 fix(haxe): replace old broken haxelib when haxe preparing
test / test (push) Failing after 5m43s
2026-11-01 18:28:46 +03:00
shmyga b3d1aee9ed fix: replace unzip-stream with unzipper
test / test (push) Failing after 5m35s
2026-11-01 17:26:56 +03:00
shmyga 769127d6f0 fix(template): fix project.hxml template
test / test (push) Failing after 5m38s
2026-11-01 16:19:02 +03:00
shmyga 57f7e88fab ci(version): 2.0.3
release / release (push) Failing after 5m30s
test / test (push) Failing after 5m39s
2026-11-01 14:17:06 +03:00
shmyga 7f62df2364 fix: fix template dir 2026-11-01 14:16:58 +03:00
shmyga 6622d53167 ci(version): 2.0.2
release / release (push) Failing after 5m40s
test / test (push) Failing after 5m39s
2026-11-01 13:59:34 +03:00
shmyga 561dd99cba fix: fix template basepath 2026-11-01 13:59:24 +03:00
shmyga bc77380aba ci(version): 2.0.1
release / release (push) Failing after 5m29s
test / test (push) Failing after 5m51s
2026-10-31 22:31:25 +03:00
shmyga a20e98d730 fix(asset): fix asset basepath 2026-10-31 22:31:13 +03:00
shmyga 87fe852f99 ci(version): 2.0.0
release / release (push) Successful in 36s
test / test (push) Successful in 35s
2026-10-31 15:54:13 +03:00
shmyga dfad6d3aba docs: update README
test / test (push) Successful in 35s
2026-10-31 15:50:42 +03:00
shmyga bff3cc06ef refactor(preset): rework preset exports
test / test (push) Successful in 1m11s
2026-10-31 15:18:39 +03:00
shmyga 6ff587cb65 fix: up android-ndk version
test / test (push) Successful in 1m4s
2026-10-30 14:52:48 +03:00
shmyga bf6ff0deb9 fix: fix default icon
test / test (push) Successful in 6m6s
2026-10-30 00:03:46 +03:00
shmyga 2605c1bbc8 refactor(preset): rework preset
test / test (push) Failing after 5m32s
2026-10-29 20:35:53 +03:00
shmyga d9e8976e85 docs(readme): update README
test / test (push) Failing after 5m56s
2026-10-29 01:17:27 +03:00
shmyga f417fcac73 refactor: replace Object.assign with spread syntax 2026-10-29 01:17:10 +03:00
shmyga 05be4ab622 feat: add "hxt" cli command
test / test (push) Failing after 5m52s
2026-10-28 20:46:12 +03:00
shmyga ce51ab817c fix(npm): downgrade gulp-debian dependecy
test / test (push) Failing after 5m36s
2026-10-28 00:53:52 +03:00
shmyga 0672f2a1e0 refactor: rework BuildSystem and Platorm with enum
test / test (push) Failing after 5m53s
2026-10-28 00:41:52 +03:00
shmyga 428f9d100e refactor(types): improve vinyl types
test / test (push) Failing after 6m5s
2026-10-27 19:24:54 +03:00
shmyga fc7f97b520 refactor(env): refactor env module
test / test (push) Failing after 31m39s
2026-10-27 01:18:23 +03:00
shmyga cf3a707a47 refactor(download): refactor download module
test / test (push) Failing after 5m35s
2026-10-27 01:04:16 +03:00
56 changed files with 3437 additions and 3973 deletions
Executable → Regular
+78 -167
View File
@@ -1,199 +1,110 @@
# Gulp HaXe Tool # HaXeTool
[![test](https://git.shmyga.ru/InfernalGames/gulp-haxetool/actions/workflows/test.yaml/badge.svg?branch=master)](https://git.shmyga.ru/InfernalGames/gulp-haxetool/actions?workflow=test.yaml) [![test](https://git.shmyga.ru/InfernalGames/gulp-haxetool/actions/workflows/test.yaml/badge.svg?branch=master)](https://git.shmyga.ru/InfernalGames/gulp-haxetool/actions?workflow=test.yaml)
## Introducing ## Introducing
### Dignity Tool for simple building and pack HaXe and OpenFl project
* Automatically download HaXe SDK, Neko, FlashPlayer, Android SDK, +(Adobe AIR SDK). ## OpenFL Example
* Universal project config for simple HaXe build and OpenFL build.
* Branch project config for many build presets (many OpenFL apps in one project).
* Packaging linux output in DEB.
* Packaging windows output in exe install with InnoSetup.
* Create html wrapper for flash output.
### Flaws [Example project](./example)
* Hardcode build output in {projectDir}/target (need param in Project.Config). [`package.json`](./example/package.json)
* HTML5 run output not caught.
* Adobe AIR Build System in progress.
* Windows target depends Visual Studio 2017 build tools
## API
### Project.Config
#### constructor
* **meta**: meta information
* **title**: application title
* **filename**: application filename
* **icon**: path to icon file
* **pack**: package name for OpenFL
* **author**: author name for DEB packaging
* **company**: company name for OpenFL
* **version**: application version
* **name**: name for output directory
* **libs**: list of haxe dependencies
* **sources**: list of HaXe sources
* **assets**: list of resources
* **main**: main class name
* **macros**: list of macros
### Project
#### constructor
* **buildSystem**: Project.BuildSystem
* **platforms**: Project.Platform (list supported)
* **config**: Project.Config
#### bind
* **module**
create gulp tasks in module:
```
<config.name>:<platform>:build
<config.name>:<platform>:run
<config.name>:<platform>:test
<config.name>:flash:html
<config.name>:linux:archive
<config.name>:linux:deb
<config.name>:windows:archive
<config.name>:windows:installer
```
eg: ```gulp app:flash:test```
## Example
[package.json](example/package.json)
```json ```json
{ {
"name": "app", "name": "example",
"type": "module",
"version": "0.0.1", "version": "0.0.1",
"scripts": {
"tasks": "hxt",
"build": "hxt default",
"dev": "hxt app:flash:test"
},
"devDependencies": { "devDependencies": {
"gulp": "^4.0.0", "gulp-haxetool": "^2.0.0"
"gulp-clean": "^0.4.0",
"gulp-haxetool": "^0.1.0"
},
"haxeDependencies": {
"lime": "7.6.0",
"openfl": "8.9.2",
"hxcpp": "4.0.19"
} }
} }
``` ```
[src/Main.hx](example/src/Main.hx) [`haxetool.json`](./example/haxetool.json)
```haxe
import flash.display.Shape;
import flash.Lib;
class Main { JSON schema: https://shmyga.ru/public/haxetool.schema.json
public static function main() { ```json
trace("Hello world!"); {
var shape = new Shape(); "app": {
shape.graphics.beginFill(0x00ff00); "buildSystem": "openfl",
shape.graphics.drawCircle(50, 50, 20); "platforms": ["flash", "html5", "linux", "windows", "android"],
shape.graphics.endFill(); "libs": {
Lib.current.addChild(shape); "lime": "8.3.2",
"openfl": "9.5.2",
"hxcpp": "4.2.1"
},
"sources": ["src"],
"main": "Main"
} }
} }
``` ```
[gulpfile.js](example/gulpfile.js) ## Commands
```javascript
const gulp = require('gulp');
const gulpClean = require('gulp-clean');
const packageInfo = require('./package.json');
const {System, Sdk, Haxe, Project} = require('gulp-haxetool');
//Sdk.dir = '/opt/sdk'; ### Display tasks list
exports.clean = function clean() { ```bash
return gulp.src('target/*', {read: false}).pipe(gulpClean()); npx hxt
}; ```
exports.install = function install() { ### Build and pack all platform variants
const haxe = new Haxe();
return haxe.prepare().then(() => haxe.install(packageInfo.haxeDependencies));
};
const config = new Project.Config({ Results places in `target` directory
meta: {
title: 'Application',
filename: 'app',
icon: './resources/icon.jpg',
pack: 'com.example',
author: 'Anonim <anonim@anonim.com>',
company: 'Any company',
version: packageInfo.version,
},
name: 'app',
libs: packageInfo.haxeDependencies,
sources: ['src'],
assets: ['resources'],
main: 'Main',
});
const project = new Project( ```bash
Project.BuildSystem.OPENFL, npx hxt default
[ ```
Project.Platform.FLASH,
Project.Platform.HTML5, ### Build and run platform target
Project.Platform.LINUX,
Project.Platform.WINDOWS, ```bash
npx hxt <preset>:<platform>:test
```
```bash
npx hxt app:flash:test
npx hxt app:html5:test
npx hxt app:linux:test
npx hxt app:android:test
npx hxt app:windows:test
```
## Dependencies requiring manual installation
### Windows
* Visual Studio 2017 build tools
### Android
* Java JDK 17
## VS Code settings
### JSON schema for `haxetool.json`
```json
{
...
"json.schemas": [
{
"fileMatch": [
"/haxetool.json"
], ],
config "url": "https://shmyga.ru/public/haxetool.schema.json"
).bind(module);
const defaultSeries = [
exports.clean,
module.exports['app:flash:build'],
module.exports['app:flash:html'],
module.exports['app:html5:build'],
];
if (System.isLinux) {
defaultSeries.push(
module.exports['app:linux:build'],
module.exports['app:linux:archive'],
module.exports['app:linux:deb'],
module.exports['app:android:build'],
);
} }
],
if (System.isWindows) { "json.schemaDownload.trustedDomains": {
defaultSeries.push( "https://shmyga.ru/": true
module.exports['app:windows:build'], },
module.exports['app:windows:archive'], ...
module.exports['app:windows:installer'],
);
} }
module.exports.default = gulp.series(defaultSeries);
``` ```
Build for all platforms: `gulp default`
Build app for specific platform: `gulp app:flash:build`
Build and run flash app in flashplayer: `gulp app:flash:test`
Build and run html5 app in browser: `gulp app:html5:test`
Build and run linux app native: `gulp app:linux:test`
Build and run windows app native: `gulp app:windows:test`
Build and run android app: `gulp app:android:test`
+64
View File
@@ -0,0 +1,64 @@
{
"$id": "https://shmyga.ru/public/haxetool.schema.json",
"title": "Haxe tool",
"description": "Haxe tool presets",
"type": "object",
"patternProperties": {
".*": {
"type": "object",
"properties": {
"buildSystem": { "enum": ["haxe", "openfl"] },
"platforms": {
"type": "array",
"items": { "enum": ["flash", "html5", "linux", "windows", "android", "neko", "cpp"] }
},
"name": { "type": "string" },
"main": { "type": "string" },
"preloader": { "type": "string" },
"sources": { "type": "array", "items": { "type": "string" } },
"assets": { "type": "array", "items": { "type": "string" } },
"libs": { "type": "object", "patternProperties": { ".*": { "type": "string" } } },
"macros": { "type": "array", "items": { "type": "string" } },
"flags": { "type": "array", "items": { "type": "string" } },
"meta": {
"type": "object",
"properties": {
"title": { "type": "string" },
"filename": { "type": "string" },
"icon": { "type": "string" },
"version": { "type": "string" },
"pack": { "type": "string" },
"author": { "type": "string" },
"company": { "type": "string" },
"width": { "type": "number" },
"height": { "type": "number" },
"mobileWidth": { "type": "number" },
"mobileHeight": { "type": "number" },
"fps": { "type": "number" }
},
"additionalProperties": false
},
"key": {
"type": "object",
"properties": {
"store": { "type": "string" },
"pass": { "type": "string" }
},
"required": ["store", "pass"]
},
"android": {
"type": "array",
"items": {
"type": "object",
"properties": {
"path": { "type": "string" },
"extensions": { "type": "array", "items": { "type": "string" } }
}
}
},
"haxe": { "type": "string" }
},
"additionalProperties": false
}
}
}
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

-7
View File
@@ -1,7 +0,0 @@
import gulp from "gulp";
import { Preset } from "gulp-haxetool";
import presetData from "./haxetool.json" with { type: "json" };
import packageInfo from "./package.json" with { type: "json" };
const preset = new Preset(presetData, null, packageInfo);
export default preset.register(gulp);
+4 -10
View File
@@ -2,18 +2,12 @@
"app": { "app": {
"buildSystem": "openfl", "buildSystem": "openfl",
"platforms": ["flash", "html5", "linux", "windows", "android"], "platforms": ["flash", "html5", "linux", "windows", "android"],
"config": { "libs": {
"meta": { "lime": "8.3.2",
"title": "Example", "openfl": "9.5.2",
"filename": "example", "hxcpp": "4.2.1"
"icon": "./resources/icon.jpg",
"pack": "com.example",
"author": "Anonim <anonim@anonim.com>",
"company": "Any company",
"version": "<%=package.version%>"
}, },
"sources": ["src"], "sources": ["src"],
"main": "Main" "main": "Main"
} }
} }
}
+2341 -1838
View File
File diff suppressed because it is too large Load Diff
+5 -11
View File
@@ -3,17 +3,11 @@
"type": "module", "type": "module",
"version": "0.0.1", "version": "0.0.1",
"scripts": { "scripts": {
"build": "gulp", "tasks": "hxt",
"dev": "gulp app:flash:test" "build": "hxt default",
"dev": "hxt app:flash:test"
}, },
"devDependencies": { "devDependencies": {
"gulp-cli": "^3.1.0", "gulp-haxetool": "file:.."
"gulp-haxetool": "^1.2.0" }
},
"haxeDependencies": {
"lime": "8.0.0",
"openfl": "9.2.0",
"hxcpp": "4.2.1"
},
"haxe": "4.2.5"
} }
+155 -1360
View File
File diff suppressed because it is too large Load Diff
+12 -7
View File
@@ -1,14 +1,18 @@
{ {
"name": "gulp-haxetool", "name": "gulp-haxetool",
"type": "module", "type": "module",
"version": "1.2.0", "version": "2.0.4",
"description": "HaXe Tool for Gulp", "description": "HaXe Tool with Gulp",
"exports": { "exports": {
".": "./dist/index.mjs", "./bin/cli": "./dist/bin/cli.mjs",
"./lib": "./dist/lib/index.mjs",
"./package.json": "./package.json" "./package.json": "./package.json"
}, },
"bin": {
"hxt": "./dist/bin/cli.mjs"
},
"types": "./dist/lib/index.d.mts",
"files": [ "files": [
"template",
"dist" "dist"
], ],
"scripts": { "scripts": {
@@ -29,6 +33,7 @@
"license": "MIT", "license": "MIT",
"homepage": "https://git.shmyga.ru/InfernalGames/gulp-haxetool#readme", "homepage": "https://git.shmyga.ru/InfernalGames/gulp-haxetool#readme",
"dependencies": { "dependencies": {
"ajv": "^8.20.0",
"ansi-colors": "^4.1.3", "ansi-colors": "^4.1.3",
"async": "^3.2.6", "async": "^3.2.6",
"cli-progress": "^3.12.0", "cli-progress": "^3.12.0",
@@ -39,7 +44,7 @@
"gulp": "^5.0.1", "gulp": "^5.0.1",
"gulp-clean": "^0.4.0", "gulp-clean": "^0.4.0",
"gulp-connect": "^5.7.0", "gulp-connect": "^5.7.0",
"gulp-debian": "^0.3.2", "gulp-debian": "^0.1.9",
"gulp-gzip": "^1.4.2", "gulp-gzip": "^1.4.2",
"gulp-rename": "^2.1.0", "gulp-rename": "^2.1.0",
"gulp-tar": "^5.0.0", "gulp-tar": "^5.0.0",
@@ -49,7 +54,7 @@
"tar": "^7.5.22", "tar": "^7.5.22",
"through2": "^5.0.12", "through2": "^5.0.12",
"tmp-file": "^2.0.1", "tmp-file": "^2.0.1",
"unzip-stream": "^0.3.4", "unzipper": "^0.12.5",
"vinyl": "^3.0.1", "vinyl": "^3.0.1",
"vinyl-fs": "^4.0.2" "vinyl-fs": "^4.0.2"
}, },
@@ -68,7 +73,7 @@
"@types/tail": "^2.2.3", "@types/tail": "^2.2.3",
"@types/tar": "^7.0.87", "@types/tar": "^7.0.87",
"@types/through2": "^5.0.0", "@types/through2": "^5.0.0",
"@types/unzip-stream": "^0.3.4", "@types/unzipper": "^0.10.11",
"eslint": "^10.13.0", "eslint": "^10.13.0",
"prettier": "^3.9.10", "prettier": "^3.9.10",
"tsdown": "0.22.14", "tsdown": "0.22.14",
+39 -7
View File
@@ -1,14 +1,46 @@
declare module "vinyl" { declare module "vinyl" {
export class File { import { type Stats } from "fs";
path: string; import type Stream from "stream";
export type Contents = Stream | Buffer | null;
export interface Options<C extends Contents = Contents> {
contents?: C;
cwd?: string;
base?: string;
path?: string;
stat?: Stats;
history?: string[];
}
export class File<C extends Contents = Contents> {
contents: C;
cwd: string; cwd: string;
base: string; base: string;
contents: any; relative: string;
stat: any; dirname: string;
history: any[]; basename: string;
constructor(params: any); stem: string;
clone(options?: any); extname: string;
path: string;
symlink: string;
stat: Stats;
history: string[];
constructor(options?: Options<C>);
isBuffer(): boolean;
isStream(): boolean;
isNull(): boolean;
isDirectory(): boolean;
isSymbolic(): boolean;
clone(options?: Options<C>);
static isCustomProp(key: string): boolean;
static isVinyl(file: File | any): boolean;
} }
export type StreamFile = File<Stream>;
export type BufferFile = File<Buffer>;
export default File; export default File;
} }
+41
View File
@@ -0,0 +1,41 @@
#!/usr/bin/env node
import gulp from "gulp";
import { Preset } from ".";
import { name, version } from "../package.json" with { type: "json" };
console.log(`[${name} ${version}]`);
const showTasks = () => {
const tree = gulp.tree({ deep: true });
console.log(tree.nodes.map((node) => node.label).join("\n"));
};
const runTask = async (name: string) => {
const task = gulp.task(name);
if (!task) {
throw `task '${name}' not found`;
}
return await task((error) => {
if (error) {
console.error(error);
}
});
};
export const main = async () => {
const preset = Preset.loader();
Preset.validator(preset);
const projects = Preset.compiler(preset);
Preset.register(projects);
if (process.argv.length > 2) {
await runTask(process.argv[2]);
} else {
showTasks();
}
};
export default main;
await main();
+9
View File
@@ -0,0 +1,9 @@
import path from "path";
import { fileURLToPath } from "url";
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
export default (name: string): string => {
return path.join(__dirname, "assets", name);
};
+76 -54
View File
@@ -1,59 +1,26 @@
import progress from "cli-progress"; import progress from "cli-progress";
import fs from "fs"; import fs from "fs";
import fse from "fs-extra"; import fse from "fs-extra";
import got from "got"; import got, { type Progress, type Request } from "got";
import path from "path"; import path from "path";
import ps from "promise-streams"; import ps from "promise-streams";
import type { Stream, Writable } from "stream"; import { type Stream, type Writable } from "stream";
import * as tar from "tar"; import { x as tarX } from "tar";
import unzip from "unzip-stream"; import unzipper from "unzipper";
export class Downloader { export interface DownloadOptions {
static bar: progress.MultiBar | null; progress?: boolean;
strip?: number;
static createProgressBar() { executable?: boolean;
if (Downloader.bar == null) {
Downloader.bar = new progress.MultiBar(
{
clearOnComplete: true,
},
progress.Presets.shades_grey,
);
}
return Downloader.bar.create(0, 0);
} }
static releaseProgressBar(bar: progress.SingleBar) { const DEFAULT_OPTIONS: DownloadOptions = { progress: true, strip: 1, executable: false };
bar.stop();
if (Downloader.bar != null) {
Downloader.bar.remove(bar);
if (!Downloader.bar.isActive) {
Downloader.bar.stop();
Downloader.bar = null;
}
}
}
static download(url: string, dest: string, strip = 1, executable = false) { type Extractor = (stream: Request, dest: string, options: DownloadOptions) => Stream;
fse.ensureDirSync(dest);
const bar = Downloader.createProgressBar(); const ZIP_EXTRACTOR: Extractor = (stream: Request, dest: string, options: DownloadOptions): Stream => {
let stream: Stream = got.stream(url); return stream.pipe(unzipper.Parse()).on("entry", (entry: unzipper.Entry) => {
stream = stream const filePath = entry.path.split("/").slice(options.strip).join(path.sep);
.on("request", (r: any) => {
if (bar) bar.start(1, 0);
})
.on("downloadProgress", (p: any) => {
if (bar) {
bar.setTotal(p.total);
bar.update(p.transferred);
if (p.total === p.transferred) {
Downloader.releaseProgressBar(bar);
}
}
});
if (url.endsWith(".zip")) {
stream = stream.pipe(unzip.Parse()).on("entry", (entry: any) => {
const filePath = entry.path.split("/").slice(strip).join(path.sep);
if (filePath.length > 0) { if (filePath.length > 0) {
if (entry.type === "Directory") { if (entry.type === "Directory") {
fse.ensureDirSync(path.join(dest, path.normalize(filePath))); fse.ensureDirSync(path.join(dest, path.normalize(filePath)));
@@ -65,8 +32,8 @@ export class Downloader {
} }
entry.pipe( entry.pipe(
fs.createWriteStream(path.join(dest, path.normalize(filePath)), { fs.createWriteStream(path.join(dest, path.normalize(filePath)), {
// ToDo: zip entry file mode? // TODO: zip entry file mode?
mode: executable ? 0o755 : undefined, mode: options.executable ? 0o755 : undefined,
}), }),
); );
} }
@@ -74,11 +41,66 @@ export class Downloader {
entry.autodrain(); entry.autodrain();
} }
}); });
} else if (url.endsWith("tar.gz")) { };
stream = stream.pipe(tar.x({ C: dest, strip }) as unknown as Writable);
} else { const QZ_EXTRACTOR: Extractor = (stream: Request, dest: string, options: DownloadOptions): Stream => {
stream = stream.pipe(fs.createWriteStream(path.join(dest, url.split("/").pop()!))); // TODO: cast tar.Unpack to Writable
return stream.pipe(tarX({ C: dest, strip: options.strip }) as unknown as Writable);
};
const DEFAULT_EXTRACTOR: Extractor = (stream: Request, dest: string, options: DownloadOptions): Stream => {
const filename = String(stream.requestUrl as URL)
.split("/")
.pop()!;
return stream.pipe(fs.createWriteStream(path.join(dest, filename)));
};
const EXTRACTOR_MAP: Record<string, Extractor> = {
".zip": ZIP_EXTRACTOR,
".gz": QZ_EXTRACTOR,
"": DEFAULT_EXTRACTOR,
};
class ProgressBar {
private multiBar: progress.MultiBar = new progress.MultiBar(
{
stopOnComplete: true,
},
progress.Presets.shades_classic,
);
handle(request: Request): Request {
const bar = this.multiBar.create(0, 0);
return request
.on("request", (request: Request) => {
bar.start(1, 0);
})
.on("downloadProgress", (progress: Progress) => {
if (progress.total) {
bar.setTotal(progress.total);
} }
return ps.wait(stream); bar.update(progress.transferred);
if (progress.total === progress.transferred) {
bar.render();
bar.stop();
this.multiBar.remove(bar);
}
});
} }
} }
const progressBar = new ProgressBar();
export const download = async (url: string, dest: string, options?: DownloadOptions): Promise<void> => {
options = { ...DEFAULT_OPTIONS, ...options };
fse.ensureDirSync(dest);
let stream: Request = got.stream(url, { decompress: false });
if (options.progress) {
stream = progressBar.handle(stream);
}
const ext = path.extname(url);
const extractor = EXTRACTOR_MAP[ext] || EXTRACTOR_MAP[""];
return ps.wait(extractor(stream, dest, options));
};
export default download;
+15 -9
View File
@@ -1,19 +1,25 @@
import path from "path"; import path from "path";
export class Env { export class Env {
static set(key: string, value: string) { constructor(private target: Record<string, string | undefined>) {}
process.env[key] = value;
set(key: string, value: string) {
this.target[key] = value;
} }
static get(key: string) { get(key: string) {
return process.env[key]; return this.target[key];
} }
static addPath(value: string, key = "PATH") { addPath(value: string, key: string = "PATH") {
if (!process.env[key]) { if (!this.target[key]) {
process.env[key] = value; this.target[key] = value;
} else if (process.env[key].split(path.delimiter).indexOf(value) === -1) { } else if (this.target[key].split(path.delimiter).indexOf(value) === -1) {
process.env[key] = [process.env[key], value].join(path.delimiter); this.target[key] = [this.target[key], value].join(path.delimiter);
} }
} }
} }
export const env = new Env(process.env);
export default env;
+15 -3
View File
@@ -1,10 +1,22 @@
import async from "async"; import async, { type ErrorCallback } from "async";
import child_process from "child_process"; import child_process from "child_process";
import { Logger } from "./log"; import { Logger } from "./log";
const log = new Logger("exec"); const log = new Logger("exec");
const queue = async.queue((task: any, done: any) => { export interface Result {
stdout: string;
stderr: string;
}
interface Task {
dir: string;
command: string;
success: (result: Result) => void;
failure: (error: string) => void;
}
const queue = async.queue((task: Task, done: ErrorCallback) => {
log.d("*%s*", task.command); log.d("*%s*", task.command);
//process.chdir(task.dir); //process.chdir(task.dir);
child_process.exec(task.command, { cwd: task.dir, maxBuffer: 1024 * 10000 }, (err, stdout, stderr) => { child_process.exec(task.command, { cwd: task.dir, maxBuffer: 1024 * 10000 }, (err, stdout, stderr) => {
@@ -19,7 +31,7 @@ const queue = async.queue((task: any, done: any) => {
}); });
}); });
export default (dir: string, command: string) => { export default (dir: string, command: string): Promise<Result> => {
return new Promise((success, failure) => { return new Promise((success, failure) => {
queue.push({ queue.push({
dir: dir, dir: dir,
+3 -1
View File
@@ -52,4 +52,6 @@ export class OutputLogger extends Logger {
export const OUTPUT_LOGGER = new OutputLogger(); export const OUTPUT_LOGGER = new OutputLogger();
export default (line: string) => OUTPUT_LOGGER.log(line); export const output = (line: string) => OUTPUT_LOGGER.log(line);
export default output;
+3 -2
View File
@@ -7,7 +7,8 @@ const __dirname = path.dirname(__filename);
export default new Eta({ export default new Eta({
autoFilter: true, autoFilter: true,
filterFunction: (val: unknown): string => (val === null ? "" : String(val)), escapeFunction: (val: unknown): string => String(val),
filterFunction: (val: unknown): string => (val === null || val === undefined ? "" : String(val)),
useWith: true, useWith: true,
views: path.join(__dirname, "..", "template"), views: path.join(__dirname, "template"),
}); });
+2 -1
View File
@@ -15,7 +15,8 @@ class BufferingTransform extends Transform {
callback(); callback();
} }
} }
export class TailVinyl extends Vinyl {
export class TailVinyl extends Vinyl<BufferingTransform> {
private tail?: Tail; private tail?: Tail;
constructor(params: WatchParams) { constructor(params: WatchParams) {
+80 -115
View File
@@ -1,134 +1,99 @@
import os from "os"; import os from "os";
import path from "path"; import path from "path";
import asset from "../common/asset";
import { BuildSystem, type Config, type ConfigSource } from "./type";
export interface ConfigParams { export const DEFAULT_ICON = asset("icon.jpg");
name?: string;
main?: string;
preloader?: string;
sources?: string[];
assets?: string[];
libs?: LibDef[] | Record<string, string>;
macros?: string[];
flags?: string[];
meta?: ConfigMeta;
key?: SignKey;
android?: AndroidPreset[];
}
export interface ConfigMeta { export const DEFAULT_CONFIG: Config = {
title?: string; buildSystem: BuildSystem.HAXE,
filename?: string; platforms: [],
icon?: string; name: "",
version?: string; main: "",
pack?: string; preloader: null,
author?: string; sources: [],
company?: string; assets: [],
width?: number; libs: [],
height?: number; macros: [],
mobileWidth?: number; flags: [],
mobileHeight?: number; icon: DEFAULT_ICON,
fps?: number; meta: {
}
export interface LibDef {
name: string;
version: string;
git?: string;
branch?: string;
}
export interface AndroidPreset {
path: string;
extensions: string[];
}
export interface SignKey {
store: string;
pass: string;
}
export class Config {
public name: string;
public main: string;
public preloader: string | null;
public sources: string[];
public assets: string[];
public libs: LibDef[];
public macros: string[];
public flags: string[];
public icon: string | null;
public meta: ConfigMeta;
public key: SignKey | null;
public android: AndroidPreset[];
private _params: ConfigParams[];
constructor(params?: ConfigParams) {
this._params = [];
this.name = "";
this.main = "";
this.preloader = null;
this.sources = [];
this.assets = [];
this.libs = [];
this.macros = [];
this.flags = [];
this.icon = null;
this.meta = {
width: 800, width: 800,
height: 600, height: 600,
fps: 60, fps: 60,
},
key: null,
android: [],
haxe: null,
}; };
this.key = null;
this.android = [];
if (params) {
this.update(params);
this.afterUpdate();
}
}
static absolutePath(file: string): string { export const absolutePath = (file: string): string => {
const result = path.resolve(process.cwd(), path.normalize(file)); const result = path.resolve(process.cwd(), path.normalize(file));
return os.type() === "Windows_NT" ? result.split("\\").join("/") : result; return os.type() === "Windows_NT" ? result.split("\\").join("/") : result;
} };
update(params: ConfigParams) { export const compile = (source: ConfigSource): Config => {
this._params.push(params); return branch(DEFAULT_CONFIG, source);
if (params.name !== undefined) this.name = params.name; };
if (params.main !== undefined) this.main = params.main;
if (params.preloader !== undefined) this.preloader = params.preloader; export const branch = (config: Config, source: ConfigSource): Config => {
if (params.sources !== undefined) this.sources = this.sources.concat(params.sources.map(Config.absolutePath)); const result = structuredClone(config);
if (params.assets !== undefined) this.assets = this.assets.concat(params.assets.map(Config.absolutePath));
if (params.libs !== undefined) if (source.buildSystem !== undefined) {
this.libs = this.libs.concat( result.buildSystem = source.buildSystem;
Array.isArray(params.libs) }
? params.libs if (source.platforms !== undefined) {
: Object.entries(params.libs).map(([k, v]) => ({ name: k, version: v })), result.platforms = result.platforms.concat(source.platforms);
}
if (source.name !== undefined) {
result.name = source.name;
}
if (source.main !== undefined) {
result.main = source.main;
}
if (source.preloader !== undefined) {
result.preloader = source.preloader;
}
if (source.sources !== undefined) {
result.sources = result.sources.concat(source.sources.map(absolutePath));
}
if (source.assets !== undefined) {
result.assets = result.assets.concat(source.assets.map(absolutePath));
}
if (source.libs !== undefined) {
result.libs = result.libs.concat(
Array.isArray(source.libs) ? source.libs : Object.entries(source.libs).map(([k, v]) => ({ name: k, version: v })),
); );
if (params.macros !== undefined) this.macros = this.macros.concat(params.macros); }
if (params.flags !== undefined) this.flags = this.flags.concat(params.flags); if (source.macros !== undefined) {
if (params.meta !== undefined) this.meta = { ...this.meta, ...params.meta }; result.macros = result.macros.concat(source.macros);
if (params.key !== undefined) this.key = params.key; }
if (params.android !== undefined) if (source.flags !== undefined) {
this.android = this.android.concat( result.flags = result.flags.concat(source.flags);
params.android.map((item) => ({ path: Config.absolutePath(item.path), extensions: item.extensions })), }
if (source.meta !== undefined) {
result.meta = { ...result.meta, ...source.meta };
}
if (source.key !== undefined) {
result.key = source.key;
}
if (source.android !== undefined) {
result.android = result.android.concat(
source.android.map((item) => ({ path: absolutePath(item.path), extensions: item.extensions })),
); );
if (this.meta.icon) this.icon = Config.absolutePath(this.meta.icon); }
if (source.haxe !== undefined) {
result.haxe = source.haxe;
}
if (result.meta.icon) {
result.icon = absolutePath(result.meta.icon);
} }
afterUpdate() { if (!result.meta.mobileWidth) {
if (this.meta.mobileWidth === null) this.meta.mobileWidth = this.meta.width; result.meta.mobileWidth = result.meta.width;
if (this.meta.mobileHeight === null && this.meta.mobileWidth)
this.meta.mobileHeight = Math.round(this.meta.mobileWidth / 2.222222222);
} }
if (!result.meta.mobileHeight && result.meta.mobileWidth) {
branch(params: ConfigParams) { result.meta.mobileHeight = Math.round(result.meta.mobileWidth / 2.222222222);
const result = new Config();
for (const params of this._params) {
result.update(params);
} }
result.update(params);
result.afterUpdate();
return result; return result;
} };
}
+2 -2
View File
@@ -1,6 +1,6 @@
import os from "os"; import os from "os";
import path from "path"; import path from "path";
import { Downloader } from "../common/download"; import download from "../common/download";
import { Logger } from "../common/log"; import { Logger } from "../common/log";
export class Sdk { export class Sdk {
@@ -55,7 +55,7 @@ export class Sdk {
return Promise.resolve(); return Promise.resolve();
} else { } else {
this.log.i("download: *%s*", this.link); this.log.i("download: *%s*", this.link);
return Downloader.download(this.link, this.path, strip); return download(this.link, this.path, { strip });
} }
} }
} }
+93 -14
View File
@@ -1,15 +1,94 @@
export const BuildSystem = { export enum BuildSystem {
HAXE: "haxe", HAXE = "haxe",
OPENFL: "openfl", OPENFL = "openfl",
ADOBE_AIR: "adobe_air", ADOBE_AIR = "adobe_air",
}; }
export const Platform = { export enum Platform {
FLASH: "flash", FLASH = "flash",
HTML5: "html5", HTML5 = "html5",
LINUX: "linux", LINUX = "linux",
WINDOWS: "windows", WINDOWS = "windows",
ANDROID: "android", ANDROID = "android",
NEKO: "neko", NEKO = "neko",
CPP: "cpp", CPP = "cpp",
}; }
export interface LibDef {
name: string;
version: string;
git?: string;
branch?: string;
}
export interface ConfigMeta {
title?: string;
filename?: string;
icon?: string;
version?: string;
pack?: string;
author?: string;
company?: string;
width?: number;
height?: number;
mobileWidth?: number;
mobileHeight?: number;
fps?: number;
}
export interface AndroidPreset {
path: string;
extensions: string[];
}
export interface SignKey {
store: string;
pass: string;
}
export interface ConfigSource {
buildSystem?: BuildSystem;
platforms?: Platform[];
name?: string;
main?: string;
preloader?: string;
sources?: string[];
assets?: string[];
libs?: LibDef[] | Record<string, string>;
macros?: string[];
flags?: string[];
meta?: ConfigMeta;
key?: SignKey;
android?: AndroidPreset[];
haxe?: string;
}
export interface Config {
buildSystem: BuildSystem;
platforms: Platform[];
name: string;
main: string;
preloader: string | null;
sources: string[];
assets: string[];
libs: LibDef[];
macros: string[];
flags: string[];
icon: string | null;
meta: ConfigMeta;
key: SignKey | null;
android: AndroidPreset[];
haxe: string | null;
}
export type PackageJson = Record<string, any>;
export interface ConfigJson {
SdkDir?: string;
BuildDir?: string;
Develop?: boolean;
UseRuffle?: boolean;
Key?: SignKey;
}
export type PresetJson = Record<string, ConfigSource>;
+10 -9
View File
@@ -2,8 +2,8 @@ import fs from "fs";
import os from "os"; import os from "os";
import path from "path"; import path from "path";
import through from "through2"; import through from "through2";
import { Downloader } from "../common/download"; import download from "../common/download";
import { Env } from "../common/env"; import env from "../common/env";
import exec from "../common/exec"; import exec from "../common/exec";
import { System } from "../common/system"; import { System } from "../common/system";
import { HandlerWriter } from "../common/tail"; import { HandlerWriter } from "../common/tail";
@@ -17,7 +17,8 @@ export class Android extends Sdk {
static VERSION = Android.VERSION_7302050; static VERSION = Android.VERSION_7302050;
static NDK_VERSION_R15C = "r15c"; static NDK_VERSION_R15C = "r15c";
static NDK_VERSION = Android.NDK_VERSION_R15C; static NDK_VERSION_R21E = "r21e";
static NDK_VERSION = Android.NDK_VERSION_R21E;
private ndk_version: string; private ndk_version: string;
private repository: string; private repository: string;
@@ -45,7 +46,7 @@ export class Android extends Sdk {
} }
get ndk_home(): string { get ndk_home(): string {
return path.join(this.path, "ndk-bundle"); return Sdk.path('android-ndk', this.ndk_version);
} }
get sdkmanager_bin(): string { get sdkmanager_bin(): string {
@@ -62,10 +63,10 @@ export class Android extends Sdk {
} }
prepare_ndk(): Promise<any> { prepare_ndk(): Promise<any> {
// ToDo: support windows // TODO: support windows
const url = `${this.repository}/android-ndk-${this.ndk_version}-${System.os}-x86_64.zip`; const url = `${this.repository}/android-ndk-${this.ndk_version}-${System.os}-x86_64.zip`;
this.log.d("download: *%s*", url); this.log.d("download: *%s*", url);
return Downloader.download(url, this.ndk_home, 1, true); return download(url, this.ndk_home, { executable: true });
} }
sdkmanager(packages: string[]) { sdkmanager(packages: string[]) {
@@ -101,9 +102,9 @@ export class Android extends Sdk {
} }
activate() { activate() {
Env.set("ANDROID_HOME", this.android_home); env.set("ANDROID_HOME", this.android_home);
Env.set("ANDROID_NDK_HOME", this.ndk_home); env.set("ANDROID_NDK_HOME", this.ndk_home);
Env.set("NDK_HOME", this.ndk_home); env.set("NDK_HOME", this.ndk_home);
} }
get adbBin(): string { get adbBin(): string {
+2 -2
View File
@@ -2,7 +2,7 @@ import fs from "fs";
import fse from "fs-extra"; import fse from "fs-extra";
import os from "os"; import os from "os";
import path from "path"; import path from "path";
import { Env } from "../common/env"; import env from "../common/env";
import { System } from "../common/system"; import { System } from "../common/system";
import { watch } from "../common/watch"; import { watch } from "../common/watch";
import { Sdk } from "../core/sdk"; import { Sdk } from "../core/sdk";
@@ -31,7 +31,7 @@ export class FlashPlayer extends Sdk {
constructor(debug: boolean = false, version?: string, playerId = FlashPlayer.ID) { constructor(debug: boolean = false, version?: string, playerId = FlashPlayer.ID) {
super(playerId, version || FlashPlayer.VERSION); super(playerId, version || FlashPlayer.VERSION);
this.debug = debug; this.debug = debug;
this.baseUrl = Env.get("FLASHPLAYER_URL") || this.BASE_URL; this.baseUrl = env.get("FLASHPLAYER_URL") || this.BASE_URL;
} }
prepare() { prepare() {
+54 -33
View File
@@ -4,12 +4,13 @@ import rename from "gulp-rename";
import os from "os"; import os from "os";
import path from "path"; import path from "path";
import vfs from "vinyl-fs"; import vfs from "vinyl-fs";
import { Env } from "../common/env"; import env from "../common/env";
import exec from "../common/exec"; import exec from "../common/exec";
import { System } from "../common/system"; import { System } from "../common/system";
import template from "../common/template"; import template from "../common/template";
import type { Config, LibDef } from "../core/config";
import { Sdk } from "../core/sdk"; import { Sdk } from "../core/sdk";
import type { Config, LibDef } from "../core/type";
import { Platform } from "../core/type";
import { Neko } from "./neko"; import { Neko } from "./neko";
export class Haxe extends Sdk { export class Haxe extends Sdk {
@@ -25,7 +26,9 @@ export class Haxe extends Sdk {
static VERSION_4_0_2 = "4.0.2"; static VERSION_4_0_2 = "4.0.2";
static VERSION_4_0_3 = "4.0.3"; static VERSION_4_0_3 = "4.0.3";
static VERSION_4_0_5 = "4.0.5"; static VERSION_4_0_5 = "4.0.5";
static VERSION_4 = Haxe.VERSION_4_0_5; static VERSION_4_2_5 = "4.2.5";
static VERSION_4_3_7 = "4.3.7";
static VERSION_4 = Haxe.VERSION_4_2_5;
static VERSION = Haxe.VERSION_4; static VERSION = Haxe.VERSION_4;
static buildDir = path.join(process.cwd(), "build"); static buildDir = path.join(process.cwd(), "build");
@@ -68,33 +71,43 @@ export class Haxe extends Sdk {
activate() { activate() {
this.neko.activate(); this.neko.activate();
Env.set("HAXE_VERSION", this.version); env.set("HAXE_VERSION", this.version);
Env.set("HAXE_STD_PATH", path.join(this.path, "std")); env.set("HAXE_STD_PATH", path.join(this.path, "std"));
Env.set("HAXE_HOME", this.path); env.set("HAXE_HOME", this.path);
Env.addPath(this.path); env.addPath(this.path);
Env.addPath(this.path, "LD_LIBRARY_PATH"); env.addPath(this.path, "LD_LIBRARY_PATH");
} }
prepare() { async replaceHaxelib(version: string): Promise<any> {
return Promise.all([this.neko.prepare(), super.prepare()]).then(() => { const haxe = new Haxe(version);
fs.copyFileSync( await haxe.prepare();
path.resolve(import.meta.dirname, "..", "template/haxe/activate"), fs.copyFileSync(haxe.haxelibBin, this.haxelibBin);
path.resolve(this.path, "activate"),
);
});
} }
get link(): string { async prepare(): Promise<any> {
await Promise.all([this.neko.prepare(), super.prepare()]);
fs.copyFileSync(path.resolve(import.meta.dirname, "template/haxe/activate"), path.resolve(this.path, "activate"));
// TODO: old haxelib fail with EOF
if (this.intVersion < 430) {
await this.replaceHaxelib(Haxe.VERSION_4_3_7);
}
}
static buildLink(version: string): string {
if (System.isWindows) { if (System.isWindows) {
return `https://github.com/HaxeFoundation/haxe/releases/download/${this.version}/haxe-${this.version}-win.zip`; return `https://github.com/HaxeFoundation/haxe/releases/download/${version}/haxe-${version}-win.zip`;
} else if (System.isLinux) { } else if (System.isLinux) {
let arch = System.archInt; let arch = System.archInt;
return `https://github.com/HaxeFoundation/haxe/releases/download/${this.version}/haxe-${this.version}-linux${arch}.tar.gz`; return `https://github.com/HaxeFoundation/haxe/releases/download/${version}/haxe-${version}-linux${arch}.tar.gz`;
} else { } else {
throw `Unsupported os: ${System.os}`; throw `Unsupported os: ${System.os}`;
} }
} }
get link(): string {
return Haxe.buildLink(this.version);
}
haxe(args: any) { haxe(args: any) {
this.activate(); this.activate();
return exec(".", [this.haxeBin].concat(args).join(" ")); return exec(".", [this.haxeBin].concat(args).join(" "));
@@ -109,7 +122,7 @@ export class Haxe extends Sdk {
return path.join(Haxe.buildDir, config.name); return path.join(Haxe.buildDir, config.name);
} }
openfl(command: string, platform: string, config: Config, debug = false) { openfl(command: string, platform: Platform, config: Config, debug = false) {
this.log.i("_openfl_ _build_ *%s*", platform); this.log.i("_openfl_ _build_ *%s*", platform);
this.activate(); this.activate();
const buildDir = this.resolveBuildDir(config); const buildDir = this.resolveBuildDir(config);
@@ -125,35 +138,41 @@ export class Haxe extends Sdk {
const target = path.resolve(buildDir, platform, "bin"); const target = path.resolve(buildDir, platform, "bin");
fse.emptyDirSync(target); fse.emptyDirSync(target);
const result = const result =
(
{ {
android: `app/build/outputs/**/${config.meta.filename}-debug.apk`, [Platform.ANDROID]: `app/build/outputs/**/${config.meta.filename}-debug.apk`,
flash: "*.swf", [Platform.FLASH]: "*.swf",
}[platform] || "**/*"; } as Record<Platform, string>
)[platform] || "**/*";
return this.haxelib(args).then(() => { return this.haxelib(args).then(() => {
let r = vfs.src(`${target}/${result}`, { encoding: false }); let r = vfs.src(`${target}/${result}`, { encoding: false });
if (platform === "android") { if (platform === Platform.ANDROID) {
r = r.pipe(rename(`${config.meta.filename}_${config.meta.version}.apk`)); r = r.pipe(rename(`${config.meta.filename}_${config.meta.version}.apk`));
} }
return r; return r;
}); });
} }
build(platform: string, config: Config, debug = false) { build(platform: Platform, config: Config, debug = false) {
this.log.i("_build_ *%s*", platform); this.log.i("_build_ *%s*", platform);
this.activate(); this.activate();
const buildDir = this.resolveBuildDir(config); const buildDir = this.resolveBuildDir(config);
fse.ensureDirSync(buildDir); fse.ensureDirSync(buildDir);
const ext = const ext =
(
{ {
flash: ".swf", [Platform.FLASH]: ".swf",
neko: ".n", [Platform.NEKO]: ".n",
}[platform] || ""; } as Record<Platform, string>
)[platform] || "";
const out = const out =
(
{ {
flash: "swf", [Platform.FLASH]: "swf",
}[platform] || platform; } as Record<Platform, string>
)[platform] || platform;
const project = template.render("project.hxml", { const project = template.render("project.hxml", {
...config, ...config,
@@ -170,19 +189,21 @@ export class Haxe extends Sdk {
args.push("-debug"); args.push("-debug");
} }
const target = path.resolve(buildDir, platform, "bin"); const target = path.resolve(buildDir, platform, "bin");
if (platform !== "cpp") { if (platform !== Platform.CPP) {
fse.emptyDirSync(target); fse.emptyDirSync(target);
} }
for (const asset of config.assets) { for (const asset of config.assets) {
fse.copySync(asset, path.join(target, asset.split("/").pop()!)); fse.copySync(asset, path.join(target, asset.split("/").pop()!));
} }
const result = const result =
(
{ {
cpp: `${config.meta.filename}/${config.main.split(".").pop()}${debug ? "-debug" : ""}`, [Platform.CPP]: `${config.meta.filename}/${config.main.split(".").pop()}${debug ? "-debug" : ""}`,
}[platform] || "**/*"; } as Record<Platform, string>
)[platform] || "**/*";
return this.haxe(args).then(() => { return this.haxe(args).then(() => {
let r = vfs.src(`${target}/${result}`, { encoding: false }); let r = vfs.src(`${target}/${result}`, { encoding: false });
if (platform === "cpp") { if (platform === Platform.CPP) {
r = r.pipe(rename(config.meta.filename!)); r = r.pipe(rename(config.meta.filename!));
} }
return r; return r;
+1 -1
View File
@@ -4,8 +4,8 @@ import os from "os";
import path from "path"; import path from "path";
import exec from "../common/exec"; import exec from "../common/exec";
import template from "../common/template"; import template from "../common/template";
import type { Config } from "../core/config";
import { Sdk } from "../core/sdk"; import { Sdk } from "../core/sdk";
import type { Config } from "../core/type";
export class InnoSetup extends Sdk { export class InnoSetup extends Sdk {
static ID = "innosetup"; static ID = "innosetup";
+8 -6
View File
@@ -1,7 +1,7 @@
import fs from "fs"; import fs from "fs";
import os from "os"; import os from "os";
import path from "path"; import path from "path";
import { Env } from "../common/env"; import env from "../common/env";
import { Sdk } from "../core/sdk"; import { Sdk } from "../core/sdk";
import run from "../run/index"; import run from "../run/index";
@@ -44,7 +44,9 @@ export class Neko extends Sdk {
static ID = "neko"; static ID = "neko";
static VERSION_2_2_0 = "2.2.0"; static VERSION_2_2_0 = "2.2.0";
static VERSION = Neko.VERSION_2_2_0; static VERSION_2_4_0 = "2.4.0";
static VERSION_2_4_1 = "2.4.1";
static VERSION = Neko.VERSION_2_4_1;
constructor(version?: string) { constructor(version?: string) {
super(Neko.ID, version || Neko.VERSION); super(Neko.ID, version || Neko.VERSION);
@@ -63,15 +65,15 @@ export class Neko extends Sdk {
} }
activate() { activate() {
Env.set("NEKO_INSTPATH", this.path); env.set("NEKO_INSTPATH", this.path);
Env.addPath(this.path); env.addPath(this.path);
Env.addPath(this.path, "LD_LIBRARY_PATH"); env.addPath(this.path, "LD_LIBRARY_PATH");
} }
prepare() { prepare() {
return Promise.all([super.prepare()]).then(() => { return Promise.all([super.prepare()]).then(() => {
fs.copyFileSync( fs.copyFileSync(
path.resolve(import.meta.dirname, "..", "template/neko/activate"), path.resolve(import.meta.dirname, "template/neko/activate"),
path.resolve(this.path, "activate"), path.resolve(this.path, "activate"),
); );
}); });
+3 -3
View File
@@ -1,6 +1,6 @@
import os from "os"; import os from "os";
import path from "path"; import path from "path";
import { Env } from "../common/env"; import env from "../common/env";
import { System } from "../common/system"; import { System } from "../common/system";
import { watch } from "../common/watch"; import { watch } from "../common/watch";
import run from "../run"; import run from "../run";
@@ -14,13 +14,13 @@ export class RufflePlayer extends FlashPlayer {
static VERSION_0_5_0 = "0.5.0"; static VERSION_0_5_0 = "0.5.0";
static VERSION_0_6_0 = "0.6.0"; static VERSION_0_6_0 = "0.6.0";
static VERSION_0_7_1 = "0.7.1"; static VERSION_0_7_1 = "0.7.1";
static VERSION = RufflePlayer.VERSION_2026_10_13; static VERSION = RufflePlayer.VERSION_0_7_1;
BASE_URL = "https://github.com/ruffle-rs/ruffle/releases/download"; BASE_URL = "https://github.com/ruffle-rs/ruffle/releases/download";
constructor(debug: boolean, version: string) { constructor(debug: boolean, version: string) {
super(debug, version || RufflePlayer.VERSION, RufflePlayer.ID); super(debug, version || RufflePlayer.VERSION, RufflePlayer.ID);
this.baseUrl = Env.get("RUFFLE_URL") || this.BASE_URL; this.baseUrl = env.get("RUFFLE_URL") || this.BASE_URL;
} }
get link(): string { get link(): string {
+4 -2
View File
@@ -1,6 +1,8 @@
export * from "./common/download";
export * from "./common/log";
export * from "./common/output";
export * from "./common/system"; export * from "./common/system";
export * from "./core/config"; export * from "./core/config";
export * from "./common/download";
export * from "./core/sdk"; export * from "./core/sdk";
export * from "./core/type"; export * from "./core/type";
export * from "./impl/android"; export * from "./impl/android";
@@ -9,6 +11,6 @@ export * from "./impl/haxe";
export * from "./impl/innosetup"; export * from "./impl/innosetup";
export * from "./impl/neko"; export * from "./impl/neko";
export * from "./impl/ruffle"; export * from "./impl/ruffle";
export * from "./preset";
export * from "./project"; export * from "./project";
export * from "./project/impl"; export * from "./project/impl";
export * from "./project/preset";
+16
View File
@@ -0,0 +1,16 @@
import { branch, compile } from "../core/config";
import type { Config, PresetJson } from "../core/type";
import { Project } from "../project";
export default (preset: PresetJson): Project[] => {
const config: Config = compile(preset["default"] || {});
const projects: Project[] = [];
for (const [k, v] of Object.entries(preset)) {
if (k == "default") {
continue;
}
const projectConfig = branch(config, { ...v, name: k });
projects.push(new Project(projectConfig));
}
return projects;
};
+13
View File
@@ -0,0 +1,13 @@
import compiler from "./compiler";
import loader from "./loader";
import register from "./register";
import validator from "./validator";
export const Preset = {
compiler,
loader,
register,
validator,
};
export default Preset;
+63
View File
@@ -0,0 +1,63 @@
import dateformat from "dateformat";
import fs from "fs";
import os from "os";
import path from "path";
import template from "../common/template";
import { Sdk } from "../core/sdk";
import type { ConfigJson, ConfigSource, PackageJson, PresetJson } from "../core/type";
import { Haxe } from "../impl/haxe";
import { Project } from "../project";
export const DEFAULT_CONFIG_JSON: ConfigJson = {
SdkDir: "$HOME/sdk",
};
export const resolvePath = (path: string) => path.replace("$HOME", os.homedir());
export const applyConfig = (config: ConfigJson) => {
if (config.UseRuffle) {
Project.useRuffle();
}
if (config.SdkDir) {
Sdk.dir = resolvePath(config.SdkDir);
}
if (config.BuildDir) {
Haxe.buildDir = resolvePath(config.BuildDir);
}
};
export default (basedir: string = "."): PresetJson => {
const presetFile = path.join(basedir, "haxetool.json");
const configFile = path.join(basedir, "config.json");
const packageFile = path.join(basedir, "package.json");
const presetJson: PresetJson = JSON.parse(fs.readFileSync(presetFile, "utf8"));
const configJson: ConfigJson = {
...DEFAULT_CONFIG_JSON,
...(fs.existsSync(configFile) ? JSON.parse(fs.readFileSync(configFile, "utf8")) : {}),
};
applyConfig(configJson);
const packageJson: PackageJson = fs.existsSync(packageFile) ? JSON.parse(fs.readFileSync(packageFile, "utf8")) : {};
for (const [k, v] of Object.entries(presetJson)) {
presetJson[k] = JSON.parse(
template.renderString(JSON.stringify(v), {
config: configJson,
package: packageJson,
env: process.env,
dateformat: dateformat,
}),
);
}
const defaultConfig: ConfigSource = presetJson["default"] || {};
defaultConfig.meta = {
...{
title: packageJson.name,
filename: packageJson.name,
version: packageJson.version,
pack: `com.${packageJson.name}`,
author: packageJson.author as string,
},
...(defaultConfig.meta || {}),
};
presetJson["default"] = defaultConfig;
return presetJson;
};
+91
View File
@@ -0,0 +1,91 @@
import gulp from "gulp";
import gulpClean from "gulp-clean";
import type { Task } from "undertaker";
import { System } from "../common/system";
import { Platform } from "../core/type";
import { Haxe } from "../impl/haxe";
import { Builder, type Project } from "../project";
export default (projects: Project[]): Task => {
gulp.task("clean", () => {
return gulp.src("target/*", { read: false }).pipe(gulpClean());
});
const project = projects[0];
gulp.task("setup", () => {
return Promise.all(
project.config.platforms.map((platform) =>
Builder.new(project.config, platform, project.config.buildSystem).prepare(),
),
);
});
const protohx = project.hasLib("protohx");
if (protohx) {
gulp.task("protohx:generate", () =>
new Haxe().haxelib(["run", "protohx", "generate", "protohx.json"]).then((result: any) => {
if (result.stdout.indexOf("FAIL") > -1) {
throw result.stdout;
}
}),
);
}
for (const project of projects) {
project.register(gulp);
}
const defaultSeries: Task[] = [gulp.task("clean")!, gulp.task("setup")!];
if (protohx) {
defaultSeries.push(gulp.task("protohx:generate")!);
}
for (const project of projects) {
for (const platform of project.config.platforms) {
switch (platform) {
case Platform.FLASH:
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:html`)!);
break;
case Platform.HTML5:
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
break;
case Platform.LINUX:
if (System.isLinux) {
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:archive`)!);
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:deb`)!);
}
break;
case Platform.CPP:
if (System.isLinux) {
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
}
break;
case Platform.NEKO:
if (System.isLinux) {
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
}
break;
case Platform.ANDROID:
if (System.isLinux) {
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
}
break;
case Platform.WINDOWS:
if (System.isWindows) {
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:archive`)!);
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:installer`)!);
}
break;
}
}
}
const defaultTask = gulp.series(defaultSeries);
gulp.task("default", defaultTask);
return defaultTask;
};
+13
View File
@@ -0,0 +1,13 @@
import Ajv from "ajv";
import fs from "fs";
import asset from "../common/asset";
import type { PresetJson } from "../core/type";
export default (preset: PresetJson) => {
const ajv = new Ajv();
const presetSchema = ajv.compile(JSON.parse(fs.readFileSync(asset("haxetool.schema.json"), "utf-8")));
const valid = presetSchema(preset);
if (!valid) {
throw presetSchema.errors;
}
};
+3 -3
View File
@@ -1,4 +1,4 @@
import type { Config } from "../../core/config"; import { BuildSystem, type Config, Platform } from "../../core/type";
import { Target } from "./target"; import { Target } from "./target";
export class Builder extends Target { export class Builder extends Target {
@@ -7,7 +7,7 @@ export class Builder extends Target {
public buildSystem: string; public buildSystem: string;
public debug: boolean; public debug: boolean;
constructor(config: Config, platform: string, buildSystem: string, debug: boolean = false) { constructor(config: Config, platform: Platform, buildSystem: BuildSystem, debug: boolean = false) {
super(config, platform); super(config, platform);
this.buildSystem = buildSystem; this.buildSystem = buildSystem;
this.debug = debug; this.debug = debug;
@@ -17,7 +17,7 @@ export class Builder extends Target {
Builder.factory[buildSystem] = builder; Builder.factory[buildSystem] = builder;
} }
static new(config: Config, platform: string, buildSystem: string, debug: boolean = false): Builder { static new(config: Config, platform: Platform, buildSystem: BuildSystem, debug: boolean = false): Builder {
return new Builder.factory[buildSystem](config, platform, buildSystem, debug); return new Builder.factory[buildSystem](config, platform, buildSystem, debug);
} }
} }
+5 -5
View File
@@ -1,21 +1,21 @@
import type { Config } from "../../core/config"; import { type Config, Platform } from "../../core/type";
import { Target } from "./target"; import { Target } from "./target";
export type PackerFactory = new (config: Config) => Packer; export type PackerFactory = new (config: Config) => Packer;
export class Packer extends Target { export class Packer extends Target {
static factory: Record<string, Record<string, PackerFactory>> = {}; static factory: Partial<Record<Platform, Record<string, PackerFactory>>> = {};
call() { call() {
throw "Not Implemented"; throw "Not Implemented";
} }
static register(platform: string, name: string, packer: PackerFactory) { static register(platform: Platform, name: string, packer: PackerFactory) {
if (!Packer.factory[platform]) Packer.factory[platform] = {}; if (!Packer.factory[platform]) Packer.factory[platform] = {};
Packer.factory[platform][name] = packer; Packer.factory[platform][name] = packer;
} }
static new(config: Config, platform: string, name: string): Packer { static new(config: Config, platform: Platform, name: string): Packer {
return new Packer.factory[platform][name](config); return new Packer.factory[platform]![name](config);
} }
} }
+2 -2
View File
@@ -2,7 +2,7 @@ import gulp from "gulp";
import rename from "gulp-rename"; import rename from "gulp-rename";
import output from "../../common/output"; import output from "../../common/output";
import { tail } from "../../common/tail"; import { tail } from "../../common/tail";
import { Config } from "../../core/config"; import { type Config, Platform } from "../../core/type";
import { Target } from "./target"; import { Target } from "./target";
export type RunnerFactory = new (config: Config, debug: boolean) => Runner; export type RunnerFactory = new (config: Config, debug: boolean) => Runner;
@@ -12,7 +12,7 @@ export class Runner extends Target {
public debug: boolean; public debug: boolean;
constructor(config: Config, platform: string, debug: boolean) { constructor(config: Config, platform: Platform, debug: boolean) {
super(config, platform); super(config, platform);
this.debug = debug; this.debug = debug;
} }
+4 -4
View File
@@ -1,12 +1,12 @@
import path from "path"; import path from "path";
import type { Config } from "../../core/config"; import { type Config, Platform } from "../../core/type";
export class Target { export class Target {
public config: Config; public config: Config;
public platform: string; public platform: Platform;
public target: string; public target: string;
constructor(config: Config, platform: string) { constructor(config: Config, platform: Platform) {
this.config = config; this.config = config;
this.platform = platform; this.platform = platform;
this.target = "target"; this.target = "target";
@@ -20,7 +20,7 @@ export class Target {
throw "Not Implemented"; throw "Not Implemented";
} }
resolveTargetPath(platform = this.platform): string { resolveTargetPath(platform: Platform | string = this.platform): string {
return path.resolve(this.target, this.config.name, platform); return path.resolve(this.target, this.config.name, platform);
} }
+4 -5
View File
@@ -1,8 +1,7 @@
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";
import { Config } from "../../../core/config"; import { BuildSystem, type Config, Platform } from "../../../core/type";
import { BuildSystem, Platform } from "../../../core/type";
import { Android } from "../../../impl/android"; import { Android } from "../../../impl/android";
import { Haxe } from "../../../impl/haxe"; import { Haxe } from "../../../impl/haxe";
import { Builder } from "../../core/builder"; import { Builder } from "../../core/builder";
@@ -11,14 +10,14 @@ export class HaxeBuilder extends Builder {
public haxe: Haxe; public haxe: Haxe;
public android: Android; public android: Android;
constructor(config: Config, platform: string, buildSystem: string, debug: boolean = false) { constructor(config: Config, platform: Platform, buildSystem: BuildSystem, debug: boolean = false) {
super(config, platform, buildSystem, debug); super(config, platform, buildSystem, debug);
this.haxe = new Haxe(); this.haxe = new Haxe(config.haxe ? config.haxe : undefined);
this.android = new Android(); this.android = new Android();
} }
prepare() { prepare() {
let result = this.haxe.prepare().then(() => this.haxe.install(this.config.libs)); let result: Promise<any> = this.haxe.prepare().then(() => 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) {
result = result result = result
+2 -3
View File
@@ -1,8 +1,7 @@
import fs from "fs"; import fs from "fs";
import path from "path"; import path from "path";
import template from "../../../common/template"; import template from "../../../common/template";
import type { Config } from "../../../core/config"; import { type Config, Platform } from "../../../core/type";
import { Platform } from "../../../core/type";
import { Packer } from "../../core/packer"; import { Packer } from "../../core/packer";
export class FlashHTMLPacker extends Packer { export class FlashHTMLPacker extends Packer {
@@ -16,7 +15,7 @@ export class FlashHTMLPacker extends Packer {
const target = this.targetPath; const target = this.targetPath;
const index = template.render("flash/index.html", this.config); const index = template.render("flash/index.html", this.config);
fs.writeFileSync(path.resolve(target, "index.html"), index); fs.writeFileSync(path.resolve(target, "index.html"), index);
fs.copyFileSync(path.resolve(import.meta.dirname, "..", "template/flash/swf.js"), path.resolve(target, "swf.js")); fs.copyFileSync(path.resolve(import.meta.dirname, "template/flash/swf.js"), path.resolve(target, "swf.js"));
return Promise.resolve(); return Promise.resolve();
} }
} }
+1 -2
View File
@@ -1,8 +1,7 @@
import gulp from "gulp"; import gulp from "gulp";
import gzip from "gulp-gzip"; import gzip from "gulp-gzip";
import tar from "gulp-tar"; import tar from "gulp-tar";
import type { Config } from "../../../../core/config"; import { type Config, Platform } from "../../../../core/type";
import { Platform } from "../../../../core/type";
import { Packer } from "../../../core/packer"; import { Packer } from "../../../core/packer";
export class LinuxArchivePacker extends Packer { export class LinuxArchivePacker extends Packer {
+5 -5
View File
@@ -5,8 +5,7 @@ import deb from "gulp-debian";
import os from "os"; import os from "os";
import path from "path"; import path from "path";
import template from "../../../../common/template"; import template from "../../../../common/template";
import { Config } from "../../../../core/config"; import { type Config, Platform } from "../../../../core/type";
import { Platform } from "../../../../core/type";
import { Packer } from "../../../core/packer"; import { Packer } from "../../../core/packer";
export class LinuxDEBPacker extends Packer { export class LinuxDEBPacker extends Packer {
@@ -19,12 +18,13 @@ 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 iconfile = `${this.config.meta.filename}${path.extname(this.config.meta.icon!)}`; const icon = this.config.meta.icon!;
const desktop = template.render("linux/app.desktop", Object.assign({ iconfile: iconfile }, this.config)); const iconfile = `${this.config.meta.filename}${path.extname(icon)}`;
const desktop = template.render("linux/app.desktop", { iconfile: iconfile, ...this.config });
fse.ensureDirSync(`${buildDir}/usr/share/applications`); fse.ensureDirSync(`${buildDir}/usr/share/applications`);
fs.writeFileSync(`${buildDir}/usr/share/applications/${this.config.meta.filename}.desktop`, desktop); fs.writeFileSync(`${buildDir}/usr/share/applications/${this.config.meta.filename}.desktop`, desktop);
fse.copySync(`${target}`, `${buildDir}/usr/share/${this.config.meta.filename}/`); fse.copySync(`${target}`, `${buildDir}/usr/share/${this.config.meta.filename}/`);
fse.copySync(this.config.meta.icon!, `${buildDir}/usr/share/${this.config.meta.filename}/${iconfile}`); fse.copySync(icon, `${buildDir}/usr/share/${this.config.meta.filename}/${iconfile}`);
return gulp.src(`${buildDir}/*`).pipe( return gulp.src(`${buildDir}/*`).pipe(
deb({ deb({
package: this.config.meta.filename!, package: this.config.meta.filename!,
+1 -2
View File
@@ -1,7 +1,6 @@
import gulp from "gulp"; import gulp from "gulp";
import zip from "gulp-zip"; import zip from "gulp-zip";
import { Config } from "../../../../core/config"; import { type Config, Platform } from "../../../../core/type";
import { Platform } from "../../../../core/type";
import { Packer } from "../../../core/packer"; import { Packer } from "../../../core/packer";
export class WindowsArchivePacker extends Packer { export class WindowsArchivePacker extends Packer {
+1 -2
View File
@@ -1,5 +1,4 @@
import { Config } from "../../../../core/config"; import { type Config, Platform } from "../../../../core/type";
import { Platform } from "../../../../core/type";
import { InnoSetup } from "../../../../impl/innosetup"; import { InnoSetup } from "../../../../impl/innosetup";
import { Packer } from "../../../core/packer"; import { Packer } from "../../../core/packer";
+1 -2
View File
@@ -1,6 +1,5 @@
import gulp from "gulp"; import gulp from "gulp";
import type { Config } from "../../../core/config"; import { type Config, Platform } from "../../../core/type";
import { Platform } from "../../../core/type";
import { Android } from "../../../impl/android"; import { Android } from "../../../impl/android";
import { Runner } from "../../core/runner"; import { Runner } from "../../core/runner";
+1 -2
View File
@@ -1,6 +1,5 @@
import path from "path"; import path from "path";
import { Config } from "../../../core/config"; import { type Config, Platform } from "../../../core/type";
import { Platform } from "../../../core/type";
import { FlashPlayer } from "../../../impl/flashplayer"; import { FlashPlayer } from "../../../impl/flashplayer";
import { Runner } from "../../core/runner"; import { Runner } from "../../core/runner";
+1 -2
View File
@@ -1,6 +1,5 @@
import connect from "gulp-connect"; import connect from "gulp-connect";
import { Config } from "../../../core/config"; import { type Config, Platform } from "../../../core/type";
import { Platform } from "../../../core/type";
import { Runner } from "../../core/runner"; import { Runner } from "../../core/runner";
export class Html5Runner extends Runner { export class Html5Runner extends Runner {
+1 -2
View File
@@ -1,7 +1,6 @@
import gulp from "gulp"; import gulp from "gulp";
import path from "path"; import path from "path";
import { Config } from "../../../core/config"; import { type Config, Platform } from "../../../core/type";
import { Platform } from "../../../core/type";
import run from "../../../run"; import run from "../../../run";
import { Runner } from "../../core/runner"; import { Runner } from "../../core/runner";
+1 -2
View File
@@ -1,6 +1,5 @@
import path from "path"; import path from "path";
import { Config } from "../../../core/config"; import { type Config, Platform } from "../../../core/type";
import { Platform } from "../../../core/type";
import { Neko } from "../../../impl/neko"; import { Neko } from "../../../impl/neko";
import { Runner } from "../../core/runner"; import { Runner } from "../../core/runner";
+1 -1
View File
@@ -1,4 +1,4 @@
import type { Config } from "../../../core/config"; import type { Config } from "../../../core/type";
import { RufflePlayer } from "../../../impl/ruffle"; import { RufflePlayer } from "../../../impl/ruffle";
import { FlashRunner } from "./flash"; import { FlashRunner } from "./flash";
+1 -2
View File
@@ -1,7 +1,6 @@
import gulp from "gulp"; import gulp from "gulp";
import path from "path"; import path from "path";
import { Config } from "../../../core/config"; import { type Config, Platform } from "../../../core/type";
import { Platform } from "../../../core/type";
import run from "../../../run"; import run from "../../../run";
import { Runner } from "../../core/runner"; import { Runner } from "../../core/runner";
+9 -19
View File
@@ -1,27 +1,17 @@
import gulp from "gulp"; import gulp from "gulp";
import type { Task, TaskFunction } from "undertaker"; import type { Task, TaskFunction } from "undertaker";
import { Config } from "../core/config"; import { Platform, type Config } from "../core/type";
import { BuildSystem, Platform } from "../core/type";
import { Builder } from "./core/builder"; import { Builder } from "./core/builder";
import { Packer } from "./core/packer"; import { Packer } from "./core/packer";
import { Runner } from "./core/runner"; import { Runner } from "./core/runner";
import { RuffleRunner } from "./impl/runner/ruffle"; import { RuffleRunner } from "./impl/runner/ruffle";
export * from "./core"; export * from "./core";
export * from "./impl";
export class Project { export class Project {
// TODO: compatibility
static Config = Config;
static BuildSystem = BuildSystem;
static Platform = Platform;
static Builder = Builder;
public buildSystem: string;
public platforms: string[];
public config: Config; public config: Config;
constructor(buildSystem: string, platforms: string[] | string, config: Config) { constructor(config: Config) {
this.buildSystem = buildSystem;
this.platforms = Array.isArray(platforms) ? platforms : [platforms];
this.config = config; this.config = config;
} }
@@ -34,23 +24,23 @@ export class Project {
return false; return false;
} }
build(platform: string, debug: boolean = false): Task[] { build(platform: Platform, debug: boolean = false): Task[] {
const builder = Builder.new(this.config, platform, this.buildSystem, debug); const builder = Builder.new(this.config, platform, this.config.buildSystem, debug);
const tasks: Task[] = [builder.prepare.bind(builder)]; const tasks: Task[] = [builder.prepare.bind(builder)];
tasks.push(builder.call.bind(builder)); tasks.push(builder.call.bind(builder));
return tasks; return tasks;
} }
run(platform: string, debug: boolean = false): Task[] { run(platform: Platform, debug: boolean = false): Task[] {
const runner = Runner.new(this.config, platform, debug); const runner = Runner.new(this.config, platform, debug);
return [runner.prepare.bind(runner), runner.call.bind(runner)]; return [runner.prepare.bind(runner), runner.call.bind(runner)];
} }
test(platform: string, debug: boolean = true): Task[] { test(platform: Platform, debug: boolean = true): Task[] {
return this.build(platform, debug).concat(this.run(platform, debug)); return this.build(platform, debug).concat(this.run(platform, debug));
} }
pack(platform: string, name: string) { pack(platform: Platform, name: string) {
const packer = Packer.new(this.config, platform, name); const packer = Packer.new(this.config, platform, name);
return [packer.prepare.bind(packer), packer.call.bind(packer)]; return [packer.prepare.bind(packer), packer.call.bind(packer)];
} }
@@ -58,7 +48,7 @@ export class Project {
compile(external_gulp?: gulp.Gulp): Record<string, TaskFunction> { compile(external_gulp?: gulp.Gulp): Record<string, TaskFunction> {
const result: Record<string, TaskFunction> = {}; const result: Record<string, TaskFunction> = {};
const _gulp = external_gulp || gulp; const _gulp = external_gulp || gulp;
for (const platform of this.platforms) { for (const platform of this.config.platforms) {
result[`${this.config.name}:${platform}:build`] = _gulp.series(this.build(platform)); result[`${this.config.name}:${platform}:build`] = _gulp.series(this.build(platform));
if (Runner.factory[platform]) { if (Runner.factory[platform]) {
result[`${this.config.name}:${platform}:run`] = _gulp.series(this.run(platform)); result[`${this.config.name}:${platform}:run`] = _gulp.series(this.run(platform));
-179
View File
@@ -1,179 +0,0 @@
import dateformat from "dateformat";
import gulp from "gulp";
import gulpClean from "gulp-clean";
import os from "os";
import type { Task } from "undertaker";
import { Builder, Project } from ".";
import { System } from "../common/system";
import template from "../common/template";
import { Config, type ConfigParams, type SignKey } from "../core/config";
import { Sdk } from "../core/sdk";
import { Platform } from "../core/type";
import { Haxe } from "../impl/haxe";
export interface PresetConfig {
SdkDir?: string;
BuildDir?: string;
Develop?: boolean;
UseRuffle?: boolean;
Key?: SignKey;
}
export const DEFAULT_CONFIG: PresetConfig = {
SdkDir: "$HOME/sdk",
};
export interface ProjectPreset {
buildSystem?: string;
platforms?: string[];
config: ConfigParams;
}
export class Preset {
public options: Record<string, ProjectPreset>;
public config: PresetConfig;
public packageInfo: Record<string, any>;
constructor(options: Record<string, ProjectPreset>, config?: PresetConfig, packageInfo?: Record<string, any>) {
this.config = Object.assign(DEFAULT_CONFIG, config || {});
this.packageInfo = packageInfo || {};
for (const [k, v] of Object.entries(options)) {
options[k] = this.fillPreset(v);
}
this.options = options;
}
private fillPreset(preset: ProjectPreset): ProjectPreset {
return JSON.parse(
template.renderString(JSON.stringify(preset), {
config: this.config,
package: this.packageInfo,
env: process.env,
dateformat: dateformat,
}),
);
}
compile(): Project[] {
const config = new Config(this.options["default"]?.config);
if (this.packageInfo.haxeDependencies) {
config.update({ libs: this.packageInfo.haxeDependencies });
}
const projects: Project[] = [];
for (const [k, v] of Object.entries(this.options)) {
if (k == "default") {
continue;
}
const projectConfig = config.branch(Object.assign(v.config, { name: k }));
projects.push(new Project(v.buildSystem!, v.platforms!, projectConfig));
}
return projects;
}
register(external_gulp?: gulp.Gulp, additional_tasks?: string[]) {
const _gulp = external_gulp || gulp;
const resolvePath = (path: string) => path.replace("$HOME", os.homedir());
if (this.config.UseRuffle) {
Project.useRuffle();
}
if (this.packageInfo.haxe) {
Haxe.VERSION = this.packageInfo.haxe;
}
if (this.config.SdkDir) {
Sdk.dir = resolvePath(this.config.SdkDir);
}
if (this.config.BuildDir) {
Haxe.buildDir = resolvePath(this.config.BuildDir);
}
_gulp.task("clean", () => {
return _gulp.src("target/*", { read: false }).pipe(gulpClean());
});
const projects = this.compile();
const project = projects[0];
_gulp.task("setup", () => {
return Promise.all(
project.platforms.map((platform) => Builder.new(project.config, platform, project.buildSystem).prepare()),
);
});
const protohx = project.hasLib("protohx");
if (protohx) {
_gulp.task("protohx:generate", () =>
new Haxe().haxelib(["run", "protohx", "generate", "protohx.json"]).then((result: any) => {
if (result.stdout.indexOf("FAIL") > -1) {
throw result.stdout;
}
}),
);
}
for (const project of projects) {
project.register(_gulp);
}
const defaultSeries: Task[] = [_gulp.task("clean")!, _gulp.task("setup")!];
if (protohx) {
defaultSeries.push(_gulp.task("protohx:generate")!);
}
if (additional_tasks) {
for (const task of additional_tasks) {
defaultSeries.push(_gulp.task(task)!);
}
}
for (const project of projects) {
for (const platform of project.platforms) {
switch (platform) {
case Platform.FLASH:
defaultSeries.push(_gulp.task(`${project.config.name}:${platform}:build`)!);
defaultSeries.push(_gulp.task(`${project.config.name}:${platform}:html`)!);
break;
case Platform.HTML5:
defaultSeries.push(_gulp.task(`${project.config.name}:${platform}:build`)!);
break;
case Platform.LINUX:
if (System.isLinux) {
defaultSeries.push(_gulp.task(`${project.config.name}:${platform}:build`)!);
defaultSeries.push(_gulp.task(`${project.config.name}:${platform}:archive`)!);
defaultSeries.push(_gulp.task(`${project.config.name}:${platform}:deb`)!);
}
break;
case Platform.CPP:
if (System.isLinux) {
defaultSeries.push(_gulp.task(`${project.config.name}:${platform}:build`)!);
}
break;
case Platform.NEKO:
if (System.isLinux) {
defaultSeries.push(_gulp.task(`${project.config.name}:${platform}:build`)!);
}
break;
case Platform.ANDROID:
if (System.isLinux) {
defaultSeries.push(_gulp.task(`${project.config.name}:${platform}:build`)!);
}
break;
case Platform.WINDOWS:
if (System.isWindows) {
defaultSeries.push(_gulp.task(`${project.config.name}:${platform}:build`)!);
defaultSeries.push(_gulp.task(`${project.config.name}:${platform}:archive`)!);
defaultSeries.push(_gulp.task(`${project.config.name}:${platform}:installer`)!);
}
break;
}
}
}
return _gulp.series(defaultSeries);
}
}
+5 -7
View File
@@ -14,15 +14,13 @@ export class Command {
constructor(command: string, options?: any) { constructor(command: string, options?: any) {
this.command = command; this.command = command;
this.isWindows = process.platform.lastIndexOf("win") === 0; this.isWindows = process.platform.lastIndexOf("win") === 0;
this.options = Object.assign( this.options = {
{
cwd: process.cwd(), cwd: process.cwd(),
env: process.env, env: process.env,
verbosity: options && options.silent ? 1 : 2, verbosity: options?.silent ? 1 : 2,
usePowerShell: false, usePowerShell: false,
}, ...(options || {}),
options || {}, };
);
let previousPath; let previousPath;
previousPath = this.options.env.PATH; previousPath = this.options.env.PATH;
@@ -31,7 +29,7 @@ export class Command {
this.options.env.PATH += previousPath; this.options.env.PATH += previousPath;
} }
exec(stdin?: any, callback?: any) { exec(stdin?: any, callback?: any): Vinyl<stream.Stream> {
let fileName; let fileName;
let directory; let directory;
let subShell; let subShell;
+10 -4
View File
@@ -1,11 +1,17 @@
<% sources.forEach(function(item) { %> <% sources.forEach(function(item) { %>
-cp "<%=item%>"<% }); %> -cp "<%=item%>"
<% }); %>
<% libs.forEach(function(item) { %> <% libs.forEach(function(item) { %>
-lib <%=item.name%>:<%=item.version.split('@').shift()%><% }); %> -lib <%=item.name%>:<%=item.version.split('@').shift()%>
<% }); %>
<% macros.forEach(function(item) { %> <% macros.forEach(function(item) { %>
--macro "<%=item%>"<% }); %> --macro "<%=item%>"
<% }); %>
<% flags.forEach(function(item) { %> <% flags.forEach(function(item) { %>
-D <%=item%><% }); %> -D <%=item%>
<% }); %>
-main <%=main%> -main <%=main%>
-<%=out%> "<%=buildDir%>/<%=platform%>/bin/<%=meta.filename%><%=ext%>" -<%=out%> "<%=buildDir%>/<%=platform%>/bin/<%=meta.filename%><%=ext%>"
+2 -2
View File
@@ -3,7 +3,7 @@ import { existsSync, mkdtempSync } from "node:fs";
import { tmpdir } from "node:os"; import { tmpdir } from "node:os";
import { join } from "node:path"; import { join } from "node:path";
import test from "node:test"; import test from "node:test";
import { Downloader } from "../dist/index.mjs"; import { download } from "../dist/lib/index.mjs";
const resolveTargetDir = () => mkdtempSync(join(tmpdir(), "test-")); const resolveTargetDir = () => mkdtempSync(join(tmpdir(), "test-"));
@@ -16,7 +16,7 @@ const TEST_DATA = {
for (const [url, file] of Object.entries(TEST_DATA)) { for (const [url, file] of Object.entries(TEST_DATA)) {
test(`Test download: ${url}`, async () => { test(`Test download: ${url}`, async () => {
const target = resolveTargetDir(); const target = resolveTargetDir();
await Downloader.download(url, target); await download(url, target);
assert(existsSync(join(target, file))); assert(existsSync(join(target, file)));
}); });
} }
+10 -1
View File
@@ -1,9 +1,18 @@
import { defineConfig } from "tsdown"; import { defineConfig } from "tsdown";
export default defineConfig({ export default defineConfig({
entry: {
"bin/cli": "src/cli.ts",
"lib/index": "src/index.ts",
},
copy: ["assets", "template"],
dts: { dts: {
tsgo: true, tsgo: true,
}, },
exports: true, exports: {
bin: {
hxt: "src/cli.ts",
},
},
sourcemap: true, sourcemap: true,
}); });