Compare commits

..
2 Commits
Author SHA1 Message Date
shmyga b0022a9a29 ci(version): 1.2.0
test / test (push) Successful in 40s
2026-10-25 12:56:19 +03:00
shmyga c63417cefa ci(gitea): add gitea workflows
test / test (push) Successful in 47s
2026-10-24 18:56:28 +03:00
73 changed files with 3277 additions and 9938 deletions
+1 -1
View File
@@ -14,5 +14,5 @@ jobs:
with: with:
setup-nodejs: true setup-nodejs: true
- run: pm build -vv - run: pm build -vv
- run: npm config set //registry.npmjs.org/:_authToken "${{ secrets.NPM_TOKEN }}" - run: npm config set //registry.npmjs.org/:_authToken "$NPM_TOKEN"
- run: npm publish - run: npm publish
-1
View File
@@ -1,4 +1,3 @@
node_modules/ node_modules/
target/ target/
dist/ dist/
build/
+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)
Regular → Executable
+180 -91
View File
@@ -1,110 +1,199 @@
# HaXeTool # Gulp HaXe Tool
[![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
Tool for simple building and pack HaXe and OpenFl project ### Dignity
## OpenFL Example * Automatically download HaXe SDK, Neko, FlashPlayer, Android SDK, +(Adobe AIR SDK).
* 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.
[Example project](./example) ### Flaws
[`package.json`](./example/package.json) * Hardcode build output in {projectDir}/target (need param in Project.Config).
* HTML5 run output not caught.
* Adobe AIR Build System in progress.
* Windows target depends Visual Studio 2017 build tools
```json ## API
{
"name": "example", ### Project.Config
"type": "module",
"version": "0.0.1", #### constructor
"scripts": {
"tasks": "hxt", * **meta**: meta information
"build": "hxt default", * **title**: application title
"dev": "hxt app:flash:test" * **filename**: application filename
}, * **icon**: path to icon file
"devDependencies": { * **pack**: package name for OpenFL
"gulp-haxetool": "^2.0.0" * **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
``` ```
[`haxetool.json`](./example/haxetool.json) eg: ```gulp app:flash:test```
JSON schema: https://shmyga.ru/public/haxetool.schema.json ## Example
[package.json](example/package.json)
```json ```json
{ {
"app": { "name": "app",
"buildSystem": "openfl", "version": "0.0.1",
"platforms": ["flash", "html5", "linux", "windows", "android"], "devDependencies": {
"libs": { "gulp": "^4.0.0",
"lime": "8.3.2", "gulp-clean": "^0.4.0",
"openfl": "9.5.2", "gulp-haxetool": "^0.1.0"
"hxcpp": "4.2.1"
}, },
"sources": ["src"], "haxeDependencies": {
"main": "Main" "lime": "7.6.0",
} "openfl": "8.9.2",
} "hxcpp": "4.0.19"
```
## Commands
### Display tasks list
```bash
npx hxt
```
### Build and pack all platform variants
Results places in `target` directory
```bash
npx hxt default
```
### Build and run platform target
```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"
],
"url": "https://shmyga.ru/public/haxetool.schema.json"
} }
],
"json.schemaDownload.trustedDomains": {
"https://shmyga.ru/": true
},
...
} }
``` ```
[src/Main.hx](example/src/Main.hx)
```haxe
import flash.display.Shape;
import flash.Lib;
class Main {
public static function main() {
trace("Hello world!");
var shape = new Shape();
shape.graphics.beginFill(0x00ff00);
shape.graphics.drawCircle(50, 50, 20);
shape.graphics.endFill();
Lib.current.addChild(shape);
}
}
```
[gulpfile.js](example/gulpfile.js)
```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';
exports.clean = function clean() {
return gulp.src('target/*', {read: false}).pipe(gulpClean());
};
exports.install = function install() {
const haxe = new Haxe();
return haxe.prepare().then(() => haxe.install(packageInfo.haxeDependencies));
};
const config = new Project.Config({
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(
Project.BuildSystem.OPENFL,
[
Project.Platform.FLASH,
Project.Platform.HTML5,
Project.Platform.LINUX,
Project.Platform.WINDOWS,
],
config
).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) {
defaultSeries.push(
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
@@ -1,64 +0,0 @@
{
"$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.

Before

Width:  |  Height:  |  Size: 16 KiB

+71
View File
@@ -0,0 +1,71 @@
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';
exports.clean = function clean() {
return gulp.src('target/*', {read: false}).pipe(gulpClean());
};
exports.install = function install() {
const haxe = new Haxe();
return haxe.prepare().then(() => haxe.install(packageInfo.haxeDependencies));
};
const config = new Project.Config({
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(
Project.BuildSystem.OPENFL,
[
Project.Platform.FLASH,
Project.Platform.HTML5,
Project.Platform.LINUX,
Project.Platform.WINDOWS,
],
config
).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) {
defaultSeries.push(
module.exports['app:windows:build'],
module.exports['app:windows:archive'],
module.exports['app:windows:installer'],
);
}
module.exports.default = gulp.series(defaultSeries);
-13
View File
@@ -1,13 +0,0 @@
{
"app": {
"buildSystem": "openfl",
"platforms": ["flash", "html5", "linux", "windows", "android"],
"libs": {
"lime": "8.3.2",
"openfl": "9.5.2",
"hxcpp": "4.2.1"
},
"sources": ["src"],
"main": "Main"
}
}
-8
View File
@@ -1,8 +0,0 @@
{
"indentation": {
"character": " "
},
"wrapping": {
"maxLineLength": 120
}
}
-7601
View File
File diff suppressed because it is too large Load Diff
+12 -11
View File
@@ -1,13 +1,14 @@
{ {
"name": "example", "name": "app",
"type": "module", "version": "0.0.1",
"version": "0.0.1", "devDependencies": {
"scripts": { "gulp": "^4.0.0",
"tasks": "hxt", "gulp-clean": "^0.4.0",
"build": "hxt default", "gulp-haxetool": "^0.1.0"
"dev": "hxt app:flash:test" },
}, "haxeDependencies": {
"devDependencies": { "lime": "7.6.0",
"gulp-haxetool": "file:.." "openfl": "8.9.2",
} "hxcpp": "4.0.19"
}
} }
+9 -8
View File
@@ -2,12 +2,13 @@ import flash.display.Shape;
import flash.Lib; import flash.Lib;
class Main { class Main {
public static function main() {
trace("Hello world!"); public static function main() {
var shape = new Shape(); trace("Hello world!");
shape.graphics.beginFill(0x00ff00); var shape = new Shape();
shape.graphics.drawCircle(50, 50, 20); shape.graphics.beginFill(0x00ff00);
shape.graphics.endFill(); shape.graphics.drawCircle(50, 50, 20);
Lib.current.addChild(shape); shape.graphics.endFill();
} Lib.current.addChild(shape);
}
} }
+2102 -946
View File
File diff suppressed because it is too large Load Diff
+18 -16
View File
@@ -1,18 +1,14 @@
{ {
"name": "gulp-haxetool", "name": "gulp-haxetool",
"type": "module", "type": "module",
"version": "2.1.0", "version": "1.2.0",
"description": "HaXe Tool with Gulp", "description": "HaXe Tool for Gulp",
"exports": { "exports": {
"./bin/cli": "./dist/bin/cli.mjs", ".": "./dist/index.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": {
@@ -33,13 +29,12 @@
"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": "^1.1.0",
"ansi-colors": "^4.1.3", "async": "^2.6.0",
"async": "^3.2.6",
"cli-progress": "^3.12.0", "cli-progress": "^3.12.0",
"dateformat": "^5.0.5", "dateformat": "^5.0.4",
"eta": "^4.6.0", "fancy-log": "^1.3.2",
"fs-extra": "^11.4.1", "fs-extra": "^5.0.0",
"got": "^16.1.0", "got": "^16.1.0",
"gulp": "^5.0.1", "gulp": "^5.0.1",
"gulp-clean": "^0.4.0", "gulp-clean": "^0.4.0",
@@ -49,12 +44,15 @@
"gulp-rename": "^2.1.0", "gulp-rename": "^2.1.0",
"gulp-tar": "^5.0.0", "gulp-tar": "^5.0.0",
"gulp-zip": "^6.1.0", "gulp-zip": "^6.1.0",
"lodash.defaults": "^4.2.0",
"lodash.template": "^4.4.0",
"plugin-error": "^1.0.1",
"promise-streams": "^2.1.1", "promise-streams": "^2.1.1",
"tail": "^2.2.6", "tail": "^2.2.6",
"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",
"unzipper": "^0.12.5", "unzip-stream": "^0.3.4",
"vinyl": "^3.0.1", "vinyl": "^3.0.1",
"vinyl-fs": "^4.0.2" "vinyl-fs": "^4.0.2"
}, },
@@ -69,14 +67,18 @@
"@types/gulp-rename": "^2.0.7", "@types/gulp-rename": "^2.0.7",
"@types/gulp-tar": "^4.0.1", "@types/gulp-tar": "^4.0.1",
"@types/gulp-zip": "^4.0.4", "@types/gulp-zip": "^4.0.4",
"@types/lodash.template": "^4.5.3",
"@types/node": "^26.6.5", "@types/node": "^26.6.5",
"@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/unzipper": "^0.10.11", "@types/unzip-stream": "^0.3.4",
"eslint": "^10.13.0", "eslint": "^10.13.0",
"prettier": "^3.9.10", "prettier": "^3.9.10",
"tsdown": "0.22.14", "tsdown": "0.22.14",
"typescript": "^7.0.2" "typescript": "^7.0.2"
},
"inlinedDependencies": {
"lodash": "4.18.1"
} }
} }
+7 -39
View File
@@ -1,46 +1,14 @@
declare module "vinyl" { declare module "vinyl" {
import { type Stats } from "fs"; export class File {
import type Stream from "stream"; path: string;
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;
relative: string; contents: any;
dirname: string; stat: any;
basename: string; history: any[];
stem: string; constructor(params: any);
extname: string; clone(options?: any);
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
@@ -1,41 +0,0 @@
#!/usr/bin/env node
import gulp from "gulp";
import { Preset, Task } 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);
Task.register(Task.compiler(projects));
if (process.argv.length > 2) {
await runTask(process.argv[2]);
} else {
showTasks();
}
};
export default main;
await main();
-9
View File
@@ -1,9 +0,0 @@
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);
};
+42
View File
@@ -0,0 +1,42 @@
import colors from "ansi-colors";
const _colors = {
"[DEBUG]": colors.white,
"[INFO]": colors.cyan,
"[ERROR]": colors.red,
"Called from ": colors.red,
"[WARNING]": colors.yellow,
};
export type Color = (v: string) => string;
export const getColor = (line: string): Color | null => {
for (const [tag, color] of Object.entries(_colors)) {
if (line.indexOf(tag) > -1) {
return color;
}
}
return null; // colors.reset;
};
export class Debug {
public color: Color;
constructor() {
this.color = colors.white;
this.log = this.log.bind(this);
}
log(line: string) {
const newColor = getColor(line);
if (newColor) this.color = newColor;
if (line[0] === "\t" || line.startsWith("Called from ")) {
console.log(this.color(line));
} else {
const result = line.split(" ");
console.log(colors.gray(result.slice(0, 4).join(" ")) + " " + this.color(result.slice(4).join(" ")));
}
}
}
export const DEBUG = new Debug();
+69 -91
View File
@@ -1,106 +1,84 @@
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, { type Progress, type Request } from "got"; import got from "got";
import path from "path"; import path from "path";
import ps from "promise-streams"; import ps from "promise-streams";
import { type Stream, type Writable } from "stream"; import type { Stream, Writable } from "stream";
import { x as tarX } from "tar"; import * as tar from "tar";
import unzipper from "unzipper"; import unzip from "unzip-stream";
export interface DownloadOptions { export class Downloader {
progress?: boolean; static bar: progress.MultiBar | null;
strip?: number;
executable?: boolean;
}
const DEFAULT_OPTIONS: DownloadOptions = { progress: true, strip: 1, executable: false }; static createProgressBar() {
if (Downloader.bar == null) {
type Extractor = (stream: Request, dest: string, options: DownloadOptions) => Stream; Downloader.bar = new progress.MultiBar(
{
const ZIP_EXTRACTOR: Extractor = (stream: Request, dest: string, options: DownloadOptions): Stream => { clearOnComplete: true,
return stream.pipe(unzipper.Parse()).on("entry", (entry: unzipper.Entry) => { },
const filePath = entry.path.split("/").slice(options.strip).join(path.sep); progress.Presets.shades_grey,
if (filePath.length > 0) { );
if (entry.type === "Directory") {
fse.ensureDirSync(path.join(dest, path.normalize(filePath)));
} else if (entry.type === "File") {
const fullFilePath = path.join(dest, path.normalize(filePath));
const dirPath = path.dirname(fullFilePath);
if (!fs.existsSync(dirPath)) {
fse.ensureDirSync(dirPath);
}
entry.pipe(
fs.createWriteStream(path.join(dest, path.normalize(filePath)), {
// TODO: zip entry file mode?
mode: options.executable ? 0o755 : undefined,
}),
);
}
} else {
entry.autodrain();
} }
}); return Downloader.bar.create(0, 0);
}; }
const QZ_EXTRACTOR: Extractor = (stream: Request, dest: string, options: DownloadOptions): Stream => { static releaseProgressBar(bar: progress.SingleBar) {
// TODO: cast tar.Unpack to Writable bar.stop();
return stream.pipe(tarX({ C: dest, strip: options.strip }) as unknown as Writable); if (Downloader.bar != null) {
}; Downloader.bar.remove(bar);
if (!Downloader.bar.isActive) {
Downloader.bar.stop();
Downloader.bar = null;
}
}
}
const DEFAULT_EXTRACTOR: Extractor = (stream: Request, dest: string, options: DownloadOptions): Stream => { static download(url: string, dest: string, strip = 1, executable = false) {
const filename = String(stream.requestUrl as URL) fse.ensureDirSync(dest);
.split("/") const bar = Downloader.createProgressBar();
.pop()!; let stream: Stream = got.stream(url);
return stream.pipe(fs.createWriteStream(path.join(dest, filename))); stream = stream
}; .on("request", (r: any) => {
if (bar) bar.start(1, 0);
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) => { .on("downloadProgress", (p: any) => {
if (progress.total) { if (bar) {
bar.setTotal(progress.total); bar.setTotal(p.total);
} bar.update(p.transferred);
bar.update(progress.transferred); if (p.total === p.transferred) {
if (progress.total === progress.transferred) { Downloader.releaseProgressBar(bar);
bar.render(); }
bar.stop();
this.multiBar.remove(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 (entry.type === "Directory") {
fse.ensureDirSync(path.join(dest, path.normalize(filePath)));
} else if (entry.type === "File") {
const fullFilePath = path.join(dest, path.normalize(filePath));
const dirPath = path.dirname(fullFilePath);
if (!fs.existsSync(dirPath)) {
fse.ensureDirSync(dirPath);
}
entry.pipe(
fs.createWriteStream(path.join(dest, path.normalize(filePath)), {
// ToDo: zip entry file mode?
mode: executable ? 0o755 : undefined,
}),
);
}
} else {
entry.autodrain();
}
});
} else if (url.endsWith("tar.gz")) {
stream = stream.pipe(tar.x({ C: dest, strip }) as unknown as Writable);
} else {
stream = stream.pipe(fs.createWriteStream(path.join(dest, url.split("/").pop()!)));
}
return ps.wait(stream);
} }
} }
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;
+9 -15
View File
@@ -1,25 +1,19 @@
import path from "path"; import path from "path";
export class Env { export class Env {
constructor(private target: Record<string, string | undefined>) {} static set(key: string, value: string) {
process.env[key] = value;
set(key: string, value: string) {
this.target[key] = value;
} }
get(key: string) { static get(key: string) {
return this.target[key]; return process.env[key];
} }
addPath(value: string, key: string = "PATH") { static addPath(value: string, key = "PATH") {
if (!this.target[key]) { if (!process.env[key]) {
this.target[key] = value; process.env[key] = value;
} else if (this.target[key].split(path.delimiter).indexOf(value) === -1) { } else if (process.env[key].split(path.delimiter).indexOf(value) === -1) {
this.target[key] = [this.target[key], value].join(path.delimiter); process.env[key] = [process.env[key], value].join(path.delimiter);
} }
} }
} }
export const env = new Env(process.env);
export default env;
+5 -17
View File
@@ -1,22 +1,10 @@
import async, { type ErrorCallback } from "async"; import async from "async";
import child_process from "child_process"; import child_process from "child_process";
import { Logger } from "./log"; import { Log } from "./log";
const log = new Logger("exec"); const log = new Log("exec");
export interface Result { const queue = async.queue((task: any, done: any) => {
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) => {
@@ -31,7 +19,7 @@ const queue = async.queue((task: Task, done: ErrorCallback) => {
}); });
}); });
export default (dir: string, command: string): Promise<Result> => { export default (dir: string, command: string) => {
return new Promise((success, failure) => { return new Promise((success, failure) => {
queue.push({ queue.push({
dir: dir, dir: dir,
+34 -57
View File
@@ -1,86 +1,63 @@
import colors from "ansi-colors"; import colors from "ansi-colors";
export enum Level { const Level = {
VERBOSE = -1, VERBOSE: -1,
DEBUG = 0, DEBUG: 0,
INFO = 1, INFO: 1,
WARNING = 2, WARN: 2,
ERROR = 3, ERROR: 3,
} };
export const DEFAULT_LEVEL: Level = process.argv.indexOf("--verbose") > -1 ? Level.VERBOSE : Level.INFO; const level = process.argv.indexOf("--verbose") > -1 ? Level.VERBOSE : Level.INFO;
export type FormatPattern = [string, colors.StyleFunction]; const formatTime = (date: Date): string => date.toTimeString().split(" ")[0];
export const DEFAULT_PATTERNS: FormatPattern[] = [ export class Log {
["_", colors.cyan], static level = level;
["\\*", colors.magenta], static colorPatterns: [string, (m: string) => string][] = [
["!", colors.red], ["_", colors.cyan],
]; ["\\*", colors.magenta],
["!", colors.red],
];
export class Formatter { static colorize(pattern: string) {
constructor( for (const item of this.colorPatterns) {
private patterns: FormatPattern[] = DEFAULT_PATTERNS,
private time: boolean = true,
) {}
colorize(text: string): string {
for (const item of this.patterns) {
const r = new RegExp(item[0] + "(.*?)" + item[0], "g"); const r = new RegExp(item[0] + "(.*?)" + item[0], "g");
text = text.replace(r, item[1]("$1")); pattern = pattern.replace(r, item[1]("$1"));
} }
return text; return pattern;
} }
buildTime(): string { static write(level: number, tag: string, pattern: string, args: any[]) {
return new Date().toTimeString().split(" ")[0];
}
format(message: string, tag: string, level: Level): string {
const values = [];
if (this.time) {
values.push(`[${colors.gray(this.buildTime())}]`);
}
if (tag) {
values.push(colors.green(tag));
}
values.push(this.colorize(message));
return values.join(" ");
}
}
export const DEFAULT_FORMATTER = new Formatter();
export class Logger {
constructor(
private tag: string,
private level: Level = DEFAULT_LEVEL,
private formatter: Formatter = DEFAULT_FORMATTER,
) {}
write(level: Level, message: string, args: any[]) {
if (level >= this.level) { if (level >= this.level) {
console.log(this.formatter.format(message, this.tag, level), ...args); const message = `[${colors.gray(formatTime(new Date()))}] ${colors.green(tag)} ${this.colorize(pattern)}`;
console.log(message, ...args);
} }
} }
public tag: string;
constructor(tag: string) {
this.tag = tag;
}
v(message: string, ...args: any) { v(message: string, ...args: any) {
this.write(Level.VERBOSE, message, args); Log.write(-1, this.tag, message, args);
} }
d(message: string, ...args: any) { d(message: string, ...args: any) {
this.write(Level.DEBUG, message, args); Log.write(0, this.tag, message, args);
} }
i(message: string, ...args: any) { i(message: string, ...args: any) {
this.write(Level.INFO, message, args); Log.write(1, this.tag, message, args);
} }
w(message: string, ...args: any) { w(message: string, ...args: any) {
this.write(Level.WARNING, message, args); Log.write(2, this.tag, message, args);
} }
e(message: string, ...args: any) { e(message: string, ...args: any) {
this.write(Level.ERROR, message, args); Log.write(3, this.tag, message, args);
} }
} }
-57
View File
@@ -1,57 +0,0 @@
import colors from "ansi-colors";
import { Formatter, Level, Logger } from "./log";
export class OutputFormatter extends Formatter {
private colorMap: Record<Level, colors.StyleFunction> = {
[Level.VERBOSE]: colors.white,
[Level.DEBUG]: colors.white,
[Level.INFO]: colors.cyan,
[Level.ERROR]: colors.red,
[Level.WARNING]: colors.yellow,
};
format(message: string, tag: string, level: Level): string {
const color = this.colorMap[level];
if (message[0] === "\t" || message.startsWith("Called from ")) {
return color(message);
} else {
const result = message.split(" ");
return colors.gray(result.slice(0, 4).join(" ")) + " " + color(result.slice(4).join(" "));
}
}
}
export const DEFAULT_OUTPUT_FORMATTER = new OutputFormatter();
export class OutputLogger extends Logger {
private levelMap: Record<string, Level> = {
"[DEBUG]": Level.DEBUG,
"[INFO]": Level.INFO,
"[ERROR]": Level.ERROR,
"Called from ": Level.ERROR,
"[WARNING]": Level.WARNING,
};
constructor() {
super("", Level.VERBOSE, DEFAULT_OUTPUT_FORMATTER);
}
detectLevel(line: string): number {
for (const [tag, color] of Object.entries(this.levelMap)) {
if (line.indexOf(tag) > -1) {
return color;
}
}
return Level.DEBUG;
}
log(line: string) {
this.write(this.detectLevel(line), line, []);
}
}
export const OUTPUT_LOGGER = new OutputLogger();
export const output = (line: string) => OUTPUT_LOGGER.log(line);
export default output;
-16
View File
@@ -1,16 +0,0 @@
import { Eta } from "eta";
import path from "path";
import { fileURLToPath } from "url";
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
export const template = new Eta({
autoFilter: true,
escapeFunction: (val: unknown): string => String(val),
filterFunction: (val: unknown): string => (val === null || val === undefined ? "" : String(val)),
useWith: true,
views: path.join(__dirname, "template"),
});
export default template;
+1 -2
View File
@@ -15,8 +15,7 @@ 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) {
+122 -95
View File
@@ -1,107 +1,134 @@
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 const DEFAULT_ICON = asset("icon.jpg"); export interface ConfigParams {
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 const DEFAULT_CONFIG: Config = { export interface ConfigMeta {
buildSystem: BuildSystem.HAXE, title?: string;
platforms: [], filename?: string;
name: "", icon?: string;
main: "", version?: string;
preloader: null, pack?: string;
sources: [], author?: string;
assets: [], company?: string;
libs: [], width?: number;
macros: [], height?: number;
flags: [], mobileWidth?: number;
icon: DEFAULT_ICON, mobileHeight?: number;
meta: { fps?: number;
width: 800, }
height: 600,
fps: 60,
},
key: null,
android: [],
};
export const absolutePath = (file: string): string => { export interface LibDef {
const result = path.resolve(process.cwd(), path.normalize(file)); name: string;
return os.type() === "Windows_NT" ? result.split("\\").join("/") : result; version: string;
}; git?: string;
branch?: string;
}
export const compile = (source: ConfigSource): Config => { export interface AndroidPreset {
return branch(DEFAULT_CONFIG, source); path: string;
}; extensions: string[];
}
export const branch = (config: Config, source: ConfigSource | Config): Config => { export interface SignKey {
const result = structuredClone(config); store: string;
pass: string;
}
if (source.buildSystem !== undefined) { export class Config {
result.buildSystem = source.buildSystem; public name: string;
} public main: string;
if (source.platforms !== undefined) { public preloader: string | null;
result.platforms = result.platforms.concat(source.platforms); public sources: string[];
} public assets: string[];
if (source.name !== undefined) { public libs: LibDef[];
result.name = source.name; public macros: string[];
} public flags: string[];
if (source.main !== undefined) { public icon: string | null;
result.main = source.main; public meta: ConfigMeta;
} public key: SignKey | null;
if (source.preloader !== undefined) { public android: AndroidPreset[];
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 (source.macros !== undefined) {
result.macros = result.macros.concat(source.macros);
}
if (source.flags !== undefined) {
result.flags = result.flags.concat(source.flags);
}
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 (source.haxe !== undefined) {
result.haxe = source.haxe;
}
if (result.icon) {
result.icon = absolutePath(result.icon);
}
if (!result.meta.mobileWidth) { private _params: ConfigParams[];
result.meta.mobileWidth = result.meta.width;
}
if (!result.meta.mobileHeight && result.meta.mobileWidth) {
result.meta.mobileHeight = Math.round(result.meta.mobileWidth / 2.222222222);
}
return result;
};
export const hasLib = (config: Config, name: string): boolean => { constructor(params?: ConfigParams) {
for (const lib of config.libs) { this._params = [];
if (lib.name === name) { this.name = "";
return true; this.main = "";
this.preloader = null;
this.sources = [];
this.assets = [];
this.libs = [];
this.macros = [];
this.flags = [];
this.icon = null;
this.meta = {
width: 800,
height: 600,
fps: 60,
};
this.key = null;
this.android = [];
if (params) {
this.update(params);
this.afterUpdate();
} }
} }
return false;
}; static absolutePath(file: string): string {
const result = path.resolve(process.cwd(), path.normalize(file));
return os.type() === "Windows_NT" ? result.split("\\").join("/") : result;
}
update(params: ConfigParams) {
this._params.push(params);
if (params.name !== undefined) this.name = params.name;
if (params.main !== undefined) this.main = params.main;
if (params.preloader !== undefined) this.preloader = params.preloader;
if (params.sources !== undefined) this.sources = this.sources.concat(params.sources.map(Config.absolutePath));
if (params.assets !== undefined) this.assets = this.assets.concat(params.assets.map(Config.absolutePath));
if (params.libs !== undefined)
this.libs = this.libs.concat(
Array.isArray(params.libs)
? params.libs
: Object.entries(params.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 (params.meta !== undefined) this.meta = { ...this.meta, ...params.meta };
if (params.key !== undefined) this.key = params.key;
if (params.android !== undefined)
this.android = this.android.concat(
params.android.map((item) => ({ path: Config.absolutePath(item.path), extensions: item.extensions })),
);
if (this.meta.icon) this.icon = Config.absolutePath(this.meta.icon);
}
afterUpdate() {
if (this.meta.mobileWidth === null) this.meta.mobileWidth = this.meta.width;
if (this.meta.mobileHeight === null && this.meta.mobileWidth)
this.meta.mobileHeight = Math.round(this.meta.mobileWidth / 2.222222222);
}
branch(params: ConfigParams) {
const result = new Config();
for (const params of this._params) {
result.update(params);
}
result.update(params);
result.afterUpdate();
return result;
}
}
-40
View File
@@ -1,40 +0,0 @@
import os from "os";
import template from "../common/template";
export type Params = Record<string, any>;
export interface Link {
version?: string;
url: string;
}
export const DefaultParams: string[][] = [
["debug", "<%= false %>"],
["os_name", "<%= {Linux:'linux',Windows_NT:'win'}[os.type()] %>"],
["os_name_long", "<%= {linux:'linux',win:'windows'}[os_name] %>"],
["os_arch", "<%= {x64:'64',ia32:''}[os.arch()] %>"],
["os_archive_ext", "<%= {linux:'tar.gz',win:'zip'}[os_name] %>"],
];
export const resolveParams = (source: Params, custom?: Params): Params => {
const params: Params = { ...source, os, debug: false };
if (custom) {
for (const [k, v] of Object.entries(custom)) {
params[k] = template.renderString(v, params);
}
}
for (const [k, v] of DefaultParams) {
if (!Object.hasOwn(params, k)) {
params[k] = template.renderString(v, params);
}
}
return params;
};
export const resolveLink = (link: Link | string, params?: Params): string => {
if (typeof link === "string") {
return template.renderString(link, resolveParams({}, params));
} else {
return template.renderString(link.url, resolveParams(link, params));
}
};
+8 -15
View File
@@ -1,14 +1,11 @@
import os from "os"; import os from "os";
import path from "path"; import path from "path";
import download from "../common/download"; import { Downloader } from "../common/download";
import { Logger } from "../common/log"; import { Log } from "../common/log";
import { resolveLink, type Link } from "./link";
export class Sdk { export class Sdk {
static _dir: string; static _dir: string;
url!: string;
static set dir(value) { static set dir(value) {
Sdk._dir = value; Sdk._dir = value;
} }
@@ -23,12 +20,12 @@ export class Sdk {
public name: string; public name: string;
public version: string; public version: string;
public log: Logger; public log: Log;
public path: string; public path: string;
constructor(name: string, version: string) { constructor(name: string, version: string) {
this.name = name; this.name = name;
this.log = new Logger(name); this.log = new Log(name);
this.version = version; this.version = version;
this.path = Sdk.path(name, version); this.path = Sdk.path(name, version);
} }
@@ -48,11 +45,8 @@ export class Sdk {
throw "Not implemented"; throw "Not implemented";
} }
get link(): string | Link { get link(): string {
return { throw "Not implemented";
version: this.version,
url: this.url,
};
} }
prepare(strip = 1): Promise<any> { prepare(strip = 1): Promise<any> {
@@ -60,9 +54,8 @@ export class Sdk {
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 }); this.log.i("download: *%s*", this.link);
this.log.i("download: *%s*", url); return Downloader.download(this.link, this.path, strip);
return download(url, this.path, { strip });
} }
} }
} }
+14 -92
View File
@@ -1,93 +1,15 @@
export enum BuildSystem { export const BuildSystem = {
HAXE = "haxe", HAXE: "haxe",
OPENFL = "openfl", OPENFL: "openfl",
ADOBE_AIR = "adobe_air", ADOBE_AIR: "adobe_air",
} };
export enum Platform { export const 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;
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;
meta: ConfigMeta;
key: SignKey | null;
android: AndroidPreset[];
haxe?: string;
}
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>;
+27 -31
View File
@@ -2,47 +2,30 @@ 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 env from "../common/env"; import { Downloader } from "../common/download";
import { Env } from "../common/env";
import exec from "../common/exec"; import exec from "../common/exec";
import { System } from "../common/system";
import { HandlerWriter } from "../common/tail"; import { HandlerWriter } from "../common/tail";
import { Sdk } from "../core/sdk"; import { Sdk } from "../core/sdk";
import { Command } from "../run/command"; import { Command } from "../run/command";
export class AndroidNdk extends Sdk {
static ID = "android-ndk";
static VERSION_R15C = "r15c";
static VERSION_R21E = "r21e";
static VERSION = AndroidNdk.VERSION_R21E;
url = "https://dl.google.com/android/repository/android-ndk-<%= version %>-<%= os_name_long %>-x86_64.zip";
constructor(version?: string) {
super(AndroidNdk.ID, version || AndroidNdk.VERSION);
}
get prepared(): boolean {
try {
return fs.existsSync(`${this.path}/build/ndk-build`);
} catch (e) {
return false;
}
}
}
export class Android extends Sdk { export class Android extends Sdk {
static ID = "android"; static ID = "android";
static VERSION_7302050 = "7302050"; static VERSION_7302050 = "7302050";
static VERSION = Android.VERSION_7302050; static VERSION = Android.VERSION_7302050;
private ndk: AndroidNdk; static NDK_VERSION_R15C = "r15c";
static NDK_VERSION = Android.NDK_VERSION_R15C;
url = "https://dl.google.com/android/repository/commandlinetools-<%= os_name %>-<%= version %>_latest.zip"; private ndk_version: string;
private repository: string;
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_version = ndkVersion || Android.NDK_VERSION;
this.repository = "https://dl.google.com/android/repository";
} }
get prepared(): boolean { get prepared(): boolean {
@@ -53,12 +36,16 @@ export class Android extends Sdk {
} }
} }
get link(): string {
return `${this.repository}/commandlinetools-${System.os}-${this.version}_latest.zip`;
}
get android_home(): string { get android_home(): string {
return this.path; return this.path;
} }
get ndk_home(): string { get ndk_home(): string {
return this.ndk.path; return path.join(this.path, "ndk-bundle");
} }
get sdkmanager_bin(): string { get sdkmanager_bin(): string {
@@ -68,10 +55,19 @@ export class Android extends Sdk {
prepare(): Promise<any> { prepare(): Promise<any> {
const result = []; const result = [];
result.push(super.prepare(0)); result.push(super.prepare(0));
result.push(this.ndk.prepare()); if (!fs.existsSync(path.join(this.ndk_home))) {
result.push(this.prepare_ndk());
}
return Promise.all(result); return Promise.all(result);
} }
prepare_ndk(): Promise<any> {
// ToDo: support windows
const url = `${this.repository}/android-ndk-${this.ndk_version}-${System.os}-x86_64.zip`;
this.log.d("download: *%s*", url);
return Downloader.download(url, this.ndk_home, 1, true);
}
sdkmanager(packages: string[]) { sdkmanager(packages: string[]) {
this.log.i("sdkmanager: *%s*", packages.join(", ")); this.log.i("sdkmanager: *%s*", packages.join(", "));
const installedFile = path.join(this.path, ".installed"); const installedFile = path.join(this.path, ".installed");
@@ -105,9 +101,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 {
+14 -5
View File
@@ -2,6 +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 { 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";
@@ -25,15 +26,12 @@ export class FlashPlayer extends Sdk {
BASE_URL = "https://fpdownload.macromedia.com/pub/flashplayer/updaters"; BASE_URL = "https://fpdownload.macromedia.com/pub/flashplayer/updaters";
private debug: boolean; private debug: boolean;
protected baseUrl: string;
url =
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/" +
"<%= version %>/" +
"<%= {linux:'flash_player_sa_linux' + (debug ? '_debug' : '') +'.x86_64.tar.gz','win':'flashplayer_'+version+'_sa'+(debug ? '_debug' : '')+'.exe'}[os_name] %>";
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;
} }
prepare() { prepare() {
@@ -48,6 +46,17 @@ export class FlashPlayer extends Sdk {
} }
} }
get link(): string {
const baseUrl = `${this.baseUrl}/${this.version}`;
if (System.isWindows) {
return baseUrl + `/flashplayer_${this.version}_sa${this.debug ? "_debug" : ""}.exe`;
} else if (System.isLinux) {
return baseUrl + `/flash_player_sa_linux${this.debug ? "_debug" : ""}.x86_64.tar.gz`;
} else {
throw `Unsupported os '${os.type()}'`;
}
}
get flashPlayerBin(): string { get flashPlayerBin(): string {
if (System.isWindows) { if (System.isWindows) {
const playerName = `flashplayer_${this.version}_sa${this.debug ? "_debug" : ""}.exe`; const playerName = `flashplayer_${this.version}_sa${this.debug ? "_debug" : ""}.exe`;
+57 -69
View File
@@ -1,16 +1,15 @@
import fs from "fs"; import fs from "fs";
import fse from "fs-extra"; import fse from "fs-extra";
import rename from "gulp-rename"; import rename from "gulp-rename";
import template from "lodash.template";
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 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 {
@@ -26,18 +25,11 @@ 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_2_5 = "4.2.5"; static VERSION_4 = Haxe.VERSION_4_0_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");
url =
"https://github.com/HaxeFoundation/haxe/releases/download/" +
"<%= version %>/" +
"haxe-<%= version %>-<%= os_name %><%= os_arch %>.<%= os_archive_ext %>";
getBin(name: string) { getBin(name: string) {
if (System.isWindows) { if (System.isWindows) {
return path.join(this.path, name + ".exe"); return path.join(this.path, name + ".exe");
@@ -76,37 +68,40 @@ 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");
} }
async replaceHaxelib(version: string): Promise<any> { prepare() {
const haxe = new Haxe(version); return Promise.all([this.neko.prepare(), super.prepare()]).then(() => {
await haxe.prepare(); fs.copyFileSync(
fs.copyFileSync(haxe.haxelibBin, this.haxelibBin); path.resolve(import.meta.dirname, "..", "template/haxe/activate"),
path.resolve(this.path, "activate"),
);
});
} }
async prepare(): Promise<any> { get link(): string {
await Promise.all([this.neko.prepare(), super.prepare()]); if (System.isWindows) {
fs.copyFileSync(path.resolve(import.meta.dirname, "template/haxe/activate"), path.resolve(this.path, "activate")); return `https://github.com/HaxeFoundation/haxe/releases/download/${this.version}/haxe-${this.version}-win.zip`;
// TODO: old haxelib fail with EOF } else if (System.isLinux) {
if (this.intVersion < 430) { let arch = System.archInt;
await this.replaceHaxelib(Haxe.VERSION_4_3_7); return `https://github.com/HaxeFoundation/haxe/releases/download/${this.version}/haxe-${this.version}-linux${arch}.tar.gz`;
} else {
throw `Unsupported os: ${System.os}`;
} }
} }
haxe(args: any) { haxe(args: any) {
this.activate(); this.activate();
this.log.d("_haxe_ *%s*", args.join(" "));
return exec(".", [this.haxeBin].concat(args).join(" ")); return exec(".", [this.haxeBin].concat(args).join(" "));
} }
haxelib(args: any) { haxelib(args: any) {
this.activate(); this.activate();
this.log.d("_haxelib_ *%s*", args.join(" "));
return exec(".", [this.haxelibBin].concat(args).join(" ")); return exec(".", [this.haxelibBin].concat(args).join(" "));
} }
@@ -114,13 +109,16 @@ export class Haxe extends Sdk {
return path.join(Haxe.buildDir, config.name); return path.join(Haxe.buildDir, config.name);
} }
openfl(command: string, platform: Platform, config: Config, debug = false) { openfl(command: string, platform: string, 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);
fse.ensureDirSync(buildDir); fse.ensureDirSync(buildDir);
const project = template.render("project.xml", { ...config, buildDir: buildDir }); const projectTemplate = template(
fs.readFileSync(path.resolve(import.meta.dirname, "..", "template/project.xml"), "utf8"),
);
const project = projectTemplate({ ...config, buildDir: buildDir });
fs.writeFileSync(path.resolve(buildDir, "project.xml"), project); fs.writeFileSync(path.resolve(buildDir, "project.xml"), project);
const args = ["-cwd", buildDir, "run", "openfl", command, platform]; const args = ["-cwd", buildDir, "run", "openfl", command, platform];
@@ -130,49 +128,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 === Platform.ANDROID) { if (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: Platform, config: Config, debug = false) { build(platform: string, 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 projectTemplate = template(
fs.readFileSync(path.resolve(import.meta.dirname, "..", "template/project.hxml"), "utf8"),
);
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 = projectTemplate({ ...config, buildDir: buildDir, platform: platform, ext: ext, out: out });
...config,
buildDir: buildDir,
platform: platform,
ext: ext,
out: out,
});
const projectHXML = path.resolve(buildDir, "project.hxml"); const projectHXML = path.resolve(buildDir, "project.hxml");
fs.writeFileSync(projectHXML, project); fs.writeFileSync(projectHXML, project);
@@ -181,21 +171,19 @@ 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 !== Platform.CPP) { if (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 === Platform.CPP) { if (platform === "cpp") {
r = r.pipe(rename(config.meta.filename!)); r = r.pipe(rename(config.meta.filename!));
} }
return r; return r;
@@ -203,17 +191,17 @@ export class Haxe extends Sdk {
} }
install(packages: Record<string, string> | LibDef[]) { install(packages: Record<string, string> | LibDef[]) {
if (!Array.isArray(packages)) {
packages = Object.entries(packages).map(([k, v]) => ({ name: k, version: v }));
}
this.log.i("_install_ *%s*", packages.map((item) => `${item.name}:${item.version}`).join(" "));
this.activate(); this.activate();
let promise = this.haxelib(["setup", path.join(this.path, "lib")]); let promise = this.haxelib(["setup", path.join(this.path, "lib")]);
const next = (args: any) => () => { const next = (args: any) => () => {
this.log.i("_haxelib_ _install_ *%s:%s*", args[1], args[2]);
return this.haxelib(args); return this.haxelib(args);
}; };
if (!Array.isArray(packages)) {
packages = Object.entries(packages).map(([k, v]) => ({ name: k, version: v }));
}
for (let pack of packages) { for (let pack of packages) {
const args = []; const args = [];
let version = null; let version = null;
+6 -3
View File
@@ -1,11 +1,11 @@
import fs from "fs"; import fs from "fs";
import fse from "fs-extra"; import fse from "fs-extra";
import template from "lodash.template";
import os from "os"; 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 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";
@@ -43,7 +43,10 @@ export class InnoSetup extends Sdk {
pack(config: Config, source: string, output: string) { pack(config: Config, source: string, output: string) {
const buildDir = path.join(os.tmpdir(), "build", config.name, "innosetup"); const buildDir = path.join(os.tmpdir(), "build", config.name, "innosetup");
const app = template.render("windows/app.iss", { ...config, buildDir: buildDir, output: output }); const appTemplate = template(
fs.readFileSync(path.resolve(import.meta.dirname, "..", "template/windows/app.iss"), "utf8"),
);
const app = appTemplate({ ...config, buildDir: buildDir, output: output });
fse.ensureDirSync(buildDir); fse.ensureDirSync(buildDir);
fse.copySync(`${source}`, `${buildDir}`); fse.copySync(`${source}`, `${buildDir}`);
+48 -13
View File
@@ -1,27 +1,59 @@
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";
export class NekoLink {
static get type() {
switch (os.type()) {
case "Linux":
return "linux";
case "Windows_NT":
return "win";
}
}
static get arch() {
switch (os.arch()) {
case "ia32":
return "";
case "x64":
return "64";
}
}
static get ext() {
switch (os.type()) {
case "Linux":
return "tar.gz";
case "Windows_NT":
return "zip";
}
}
static get(version: string) {
const vv = version.split("\.").join("-");
const filename = `neko-${version}-${NekoLink.type}${NekoLink.arch}.${NekoLink.ext}`;
return `https://github.com/HaxeFoundation/neko/releases/download/v${vv}/${filename}`;
}
}
export class Neko extends Sdk { 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_2_4_0 = "2.4.0"; static VERSION = Neko.VERSION_2_2_0;
static VERSION_2_4_1 = "2.4.1";
static VERSION = Neko.VERSION_2_4_1;
url =
"https://github.com/HaxeFoundation/neko/releases/download/" +
"v<%= version.split('.').join('-') %>/" +
"neko-<%= version %>-<%= os_name %><%= os_arch %>.<%= os_archive_ext %>";
constructor(version?: string) { constructor(version?: string) {
super(Neko.ID, version || Neko.VERSION); super(Neko.ID, version || Neko.VERSION);
} }
get link() {
return NekoLink.get(this.version);
}
get prepared() { get prepared() {
try { try {
return fs.existsSync(this.nekoBin); return fs.existsSync(this.nekoBin);
@@ -31,14 +63,17 @@ 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(path.resolve(import.meta.dirname, "template/neko/activate"), path.resolve(this.path, "activate")); fs.copyFileSync(
path.resolve(import.meta.dirname, "..", "template/neko/activate"),
path.resolve(this.path, "activate"),
);
}); });
} }
+18 -5
View File
@@ -1,5 +1,6 @@
import os from "os"; import os from "os";
import path from "path"; import path from "path";
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";
@@ -8,18 +9,30 @@ import { FlashPlayer } from "./flashplayer";
export class RufflePlayer extends FlashPlayer { export class RufflePlayer extends FlashPlayer {
static ID = "ruffle"; static ID = "ruffle";
static VERSION_2026_05_15 = "nightly-2026_05_15";
static VERSION_2026_10_13 = "nightly-2026_10_13";
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_0_7_1; static VERSION = RufflePlayer.VERSION_2026_10_13;
url = BASE_URL = "https://github.com/ruffle-rs/ruffle/releases/download";
"https://github.com/ruffle-rs/ruffle/releases/download/" +
"v<%= version %>/" +
"ruffle-<%= version %>-<%= os_name_long %>-x86_64.<%= os_archive_ext %>";
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;
}
get link(): string {
const nightly = this.version.includes("nightly");
const baseUrl = `${this.baseUrl}/${nightly ? "" : "v"}${this.version.replaceAll("_", "-")}`;
if (System.isWindows) {
return baseUrl + `/ruffle-${this.version}-windows-x86_64.zip`;
} else if (System.isLinux) {
return baseUrl + `/ruffle-${this.version}-linux-x86_64.tar.gz`;
} else {
throw `Unsupported os '${os.type()}'`;
}
} }
get flashPlayerBin(): string { get flashPlayerBin(): string {
+2 -7
View File
@@ -1,10 +1,6 @@
export * from "./common/download";
export * from "./common/log";
export * from "./common/output";
export * from "./common/system"; export * from "./common/system";
export * from "./common/template";
export * from "./core/config"; export * from "./core/config";
export * from "./core/link"; 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";
@@ -13,7 +9,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 "./task"; export * from "./project/preset";
-14
View File
@@ -1,14 +0,0 @@
import { branch, compile } from "../core/config";
import type { Config, PresetJson } from "../core/type";
export default (preset: PresetJson): Config[] => {
const config: Config = compile(preset["default"] || {});
const result: Config[] = [];
for (const [k, v] of Object.entries(preset)) {
if (k == "default") {
continue;
}
result.push(branch(config, { ...v, name: k }));
}
return result;
};
-11
View File
@@ -1,11 +0,0 @@
import compiler from "./compiler";
import loader from "./loader";
import validator from "./validator";
export const Preset = {
compiler,
loader,
validator,
};
export default Preset;
-64
View File
@@ -1,64 +0,0 @@
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 { Platform, type ConfigJson, type ConfigSource, type PackageJson, type PresetJson } from "../core/type";
import { Haxe } from "../impl/haxe";
import { RuffleRunner, Runner } 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) => {
// TODO: ruffle kludge
if (config.UseRuffle) {
Runner.register(Platform.FLASH, RuffleRunner);
}
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;
};
-13
View File
@@ -1,13 +0,0 @@
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 { BuildSystem, type Config, Platform } from "../../core/type"; import type { Config } from "../../core/config";
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: Platform, buildSystem: BuildSystem, debug: boolean = false) { constructor(config: Config, platform: string, buildSystem: string, 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: Platform, buildSystem: BuildSystem, debug: boolean = false): Builder { static new(config: Config, platform: string, buildSystem: string, 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, Platform } from "../../core/type"; import type { Config } from "../../core/config";
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: Partial<Record<Platform, Record<string, PackerFactory>>> = {}; static factory: Record<string, Record<string, PackerFactory>> = {};
call() { call() {
throw "Not Implemented"; throw "Not Implemented";
} }
static register(platform: Platform, name: string, packer: PackerFactory) { static register(platform: string, 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: Platform, name: string): Packer { static new(config: Config, platform: string, name: string): Packer {
return new Packer.factory[platform]![name](config); return new Packer.factory[platform][name](config);
} }
} }
+7 -7
View File
@@ -1,31 +1,31 @@
import gulp from "gulp"; import gulp from "gulp";
import rename from "gulp-rename"; import rename from "gulp-rename";
import output from "../../common/output"; import { DEBUG } from "../../common/debug";
import { tail } from "../../common/tail"; import { tail } from "../../common/tail";
import { type Config, Platform } from "../../core/type"; import { Config } from "../../core/config";
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;
export class Runner extends Target { export class Runner extends Target {
static factory: Record<string, RunnerFactory> = {}; static factory: Record<string, RunnerFactory> = {};
public debug: boolean; public debug: boolean;
constructor(config: Config, platform: Platform, debug?: boolean) { constructor(config: Config, platform: string, debug: boolean) {
super(config, platform); super(config, platform);
this.debug = debug || false; this.debug = debug;
} }
log(stream: any) { log(stream: any) {
return stream.pipe(tail(output)).pipe(rename("out.log")).pipe(gulp.dest(this.targetPath)); return stream.pipe(tail(DEBUG.log)).pipe(rename("out.log")).pipe(gulp.dest(this.targetPath));
} }
static register(platform: string, runner: RunnerFactory) { static register(platform: string, runner: RunnerFactory) {
Runner.factory[platform] = runner; Runner.factory[platform] = runner;
} }
static new(config: Config, platform: string, debug?: boolean): Runner { static new(config: Config, platform: string, debug: boolean): Runner {
return new Runner.factory[platform](config, debug); return new Runner.factory[platform](config, debug);
} }
} }
+5 -5
View File
@@ -1,18 +1,18 @@
import path from "path"; import path from "path";
import { type Config, Platform } from "../../core/type"; import type { Config } from "../../core/config";
export class Target { export class Target {
public config: Config; public config: Config;
public platform: Platform; public platform: string;
public target: string; public target: string;
constructor(config: Config, platform: Platform) { constructor(config: Config, platform: string) {
this.config = config; this.config = config;
this.platform = platform; this.platform = platform;
this.target = "target"; this.target = "target";
} }
setup(): Promise<any> { prepare(): Promise<any> {
return Promise.resolve(); return Promise.resolve();
} }
@@ -20,7 +20,7 @@ export class Target {
throw "Not Implemented"; throw "Not Implemented";
} }
resolveTargetPath(platform: Platform | string = this.platform): string { resolveTargetPath(platform = this.platform): string {
return path.resolve(this.target, this.config.name, platform); return path.resolve(this.target, this.config.name, platform);
} }
+11 -7
View File
@@ -1,7 +1,8 @@
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 { BuildSystem, type Config, Platform } from "../../../core/type"; import { Config } from "../../../core/config";
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";
@@ -10,14 +11,14 @@ export class HaxeBuilder extends Builder {
public haxe: Haxe; public haxe: Haxe;
public android: Android; public android: Android;
constructor(config: Config, platform: Platform, buildSystem: BuildSystem, debug: boolean = false) { constructor(config: Config, platform: string, buildSystem: string, debug: boolean = false) {
super(config, platform, buildSystem, debug); super(config, platform, buildSystem, debug);
this.haxe = new Haxe(config.haxe ? config.haxe : undefined); this.haxe = new Haxe();
this.android = new Android(); this.android = new Android();
} }
setup() { prepare() {
let result: Promise<any> = this.haxe.prepare().then(() => this.haxe.install(this.config.libs)); let result = 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
@@ -25,10 +26,13 @@ export class HaxeBuilder extends Builder {
.then(() => this.android.activate()) .then(() => this.android.activate())
.then(() => .then(() =>
this.android.sdkmanager([ this.android.sdkmanager([
// TODO: android sdk dependencies config? // 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",
]), ]),
); );
+8 -4
View File
@@ -1,7 +1,8 @@
import fs from "fs"; import fs from "fs";
import template from "lodash.template";
import path from "path"; import path from "path";
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 {
@@ -13,9 +14,12 @@ export class FlashHTMLPacker extends Packer {
call() { call() {
const target = this.targetPath; const target = this.targetPath;
const index = template.render("flash/index.html", this.config); const indexTemplate = template(
fs.readFileSync(path.resolve(import.meta.dirname, "..", "template/flash/index.html"), "utf8"),
);
const index = indexTemplate(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();
} }
} }
+2 -1
View File
@@ -1,7 +1,8 @@
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, Platform } from "../../../../core/type"; import type { Config } from "../../../../core/config";
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 {
+14 -13
View File
@@ -2,18 +2,13 @@ import fs from "fs";
import fse from "fs-extra"; import fse from "fs-extra";
import gulp from "gulp"; import gulp from "gulp";
import deb from "gulp-debian"; import deb from "gulp-debian";
import { template } from "lodash";
import os from "os"; import os from "os";
import path from "path"; import path from "path";
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";
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,13 +19,15 @@ 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 iconfile = `${this.config.meta.filename}${path.extname(this.config.meta.icon!)}`;
const iconfile = `${this.config.meta.filename}${path.extname(icon)}`; const desktopTemplate = template(
const desktop = template.render("linux/app.desktop", { iconfile: iconfile, ...this.config }); fs.readFileSync(path.resolve(import.meta.dirname, "..", "template/linux/app.desktop"), "utf8"),
);
const desktop = desktopTemplate(Object.assign({ 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(icon, `${buildDir}/usr/share/${this.config.meta.filename}/${iconfile}`); fse.copySync(this.config.meta.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!,
@@ -41,7 +38,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,
+2 -1
View File
@@ -1,6 +1,7 @@
import gulp from "gulp"; import gulp from "gulp";
import zip from "gulp-zip"; import zip from "gulp-zip";
import { type Config, Platform } from "../../../../core/type"; import { Config } from "../../../../core/config";
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 {
+3 -2
View File
@@ -1,4 +1,5 @@
import { type Config, Platform } from "../../../../core/type"; import { Config } from "../../../../core/config";
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";
@@ -12,7 +13,7 @@ export class WindowsInstallerPacker extends Packer {
this.innosetup = new InnoSetup(); this.innosetup = new InnoSetup();
} }
setup() { prepare() {
return this.innosetup.prepare(); return this.innosetup.prepare();
} }
+4 -3
View File
@@ -1,17 +1,18 @@
import gulp from "gulp"; import gulp from "gulp";
import { type Config, Platform } from "../../../core/type"; import type { Config } from "../../../core/config";
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";
export class AndroidRunner extends Runner { export class AndroidRunner extends Runner {
protected android: Android; protected android: Android;
constructor(config: Config, debug?: boolean) { constructor(config: Config, debug: boolean) {
super(config, Platform.ANDROID, debug); super(config, Platform.ANDROID, debug);
this.android = new Android(); this.android = new Android();
} }
setup() { prepare() {
return this.android.prepare(); return this.android.prepare();
} }
+4 -3
View File
@@ -1,17 +1,18 @@
import path from "path"; import path from "path";
import { type Config, Platform } from "../../../core/type"; import { Config } from "../../../core/config";
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";
export class FlashRunner extends Runner { export class FlashRunner extends Runner {
public player: FlashPlayer; public player: FlashPlayer;
constructor(config: Config, debug?: boolean, player: typeof FlashPlayer = FlashPlayer) { constructor(config: Config, debug: boolean, player: typeof FlashPlayer = FlashPlayer) {
super(config, Platform.FLASH, debug); super(config, Platform.FLASH, debug);
this.player = new player(debug); this.player = new player(debug);
} }
setup() { prepare() {
return this.player.prepare(); return this.player.prepare();
} }
+3 -2
View File
@@ -1,9 +1,10 @@
import connect from "gulp-connect"; import connect from "gulp-connect";
import { type Config, Platform } from "../../../core/type"; import { Config } from "../../../core/config";
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 {
constructor(config: Config, debug?: boolean) { constructor(config: Config, debug: boolean) {
super(config, Platform.HTML5, debug); super(config, Platform.HTML5, debug);
} }
+4 -3
View File
@@ -1,11 +1,12 @@
import gulp from "gulp"; import gulp from "gulp";
import path from "path"; import path from "path";
import { type Config, Platform } from "../../../core/type"; import { Config } from "../../../core/config";
import { Platform } from "../../../core/type";
import run from "../../../run"; import run from "../../../run";
import { Runner } from "../../core/runner"; import { Runner } from "../../core/runner";
export class LinuxRunner extends Runner { export class LinuxRunner extends Runner {
constructor(config: Config, debug?: boolean) { constructor(config: Config, debug: boolean) {
super(config, Platform.LINUX, debug); super(config, Platform.LINUX, debug);
} }
@@ -20,7 +21,7 @@ export class LinuxRunner extends Runner {
Runner.register(Platform.LINUX, LinuxRunner); Runner.register(Platform.LINUX, LinuxRunner);
export class CPPRunner extends LinuxRunner { export class CPPRunner extends LinuxRunner {
constructor(config: Config, debug?: boolean) { constructor(config: Config, debug: boolean) {
super(config, debug); super(config, debug);
this.platform = Platform.CPP; this.platform = Platform.CPP;
} }
+4 -3
View File
@@ -1,17 +1,18 @@
import path from "path"; import path from "path";
import { type Config, Platform } from "../../../core/type"; import { Config } from "../../../core/config";
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";
export class NekoRunner extends Runner { export class NekoRunner extends Runner {
public neko: Neko; public neko: Neko;
constructor(config: Config, debug?: boolean) { constructor(config: Config, debug: boolean) {
super(config, Platform.NEKO, debug); super(config, Platform.NEKO, debug);
this.neko = new Neko(); this.neko = new Neko();
} }
setup() { prepare() {
return this.neko.prepare(); return this.neko.prepare();
} }
+2 -2
View File
@@ -1,9 +1,9 @@
import type { Config } from "../../../core/type"; import type { Config } from "../../../core/config";
import { RufflePlayer } from "../../../impl/ruffle"; import { RufflePlayer } from "../../../impl/ruffle";
import { FlashRunner } from "./flash"; import { FlashRunner } from "./flash";
export class RuffleRunner extends FlashRunner { export class RuffleRunner extends FlashRunner {
constructor(config: Config, debug?: boolean) { constructor(config: Config, debug: boolean) {
super(config, debug, RufflePlayer); super(config, debug, RufflePlayer);
} }
} }
+3 -2
View File
@@ -1,11 +1,12 @@
import gulp from "gulp"; import gulp from "gulp";
import path from "path"; import path from "path";
import { type Config, Platform } from "../../../core/type"; import { Config } from "../../../core/config";
import { Platform } from "../../../core/type";
import run from "../../../run"; import run from "../../../run";
import { Runner } from "../../core/runner"; import { Runner } from "../../core/runner";
export class WindowsRunner extends Runner { export class WindowsRunner extends Runner {
constructor(config: Config, debug?: boolean) { constructor(config: Config, debug: boolean) {
super(config, Platform.WINDOWS, debug); super(config, Platform.WINDOWS, debug);
} }
+86 -1
View File
@@ -1,2 +1,87 @@
import gulp from "gulp";
import type { Task, TaskFunction } from "undertaker";
import { Config } from "../core/config";
import { BuildSystem, Platform } from "../core/type";
import { Builder } from "./core/builder";
import { Packer } from "./core/packer";
import { Runner } from "./core/runner";
import { RuffleRunner } from "./impl/runner/ruffle";
export * from "./core"; export * from "./core";
export * from "./impl";
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;
constructor(buildSystem: string, platforms: string[] | string, config: Config) {
this.buildSystem = buildSystem;
this.platforms = Array.isArray(platforms) ? platforms : [platforms];
this.config = config;
}
hasLib(name: string): boolean {
for (const lib of this.config.libs) {
if (lib.name === name) {
return true;
}
}
return false;
}
build(platform: string, debug: boolean = false): Task[] {
const builder = Builder.new(this.config, platform, this.buildSystem, debug);
const tasks: Task[] = [builder.prepare.bind(builder)];
tasks.push(builder.call.bind(builder));
return tasks;
}
run(platform: string, debug: boolean = false): Task[] {
const runner = Runner.new(this.config, platform, debug);
return [runner.prepare.bind(runner), runner.call.bind(runner)];
}
test(platform: string, debug: boolean = true): Task[] {
return this.build(platform, debug).concat(this.run(platform, debug));
}
pack(platform: string, name: string) {
const packer = Packer.new(this.config, platform, name);
return [packer.prepare.bind(packer), packer.call.bind(packer)];
}
compile(external_gulp?: gulp.Gulp): Record<string, TaskFunction> {
const result: Record<string, TaskFunction> = {};
const _gulp = external_gulp || gulp;
for (const platform of this.platforms) {
result[`${this.config.name}:${platform}:build`] = _gulp.series(this.build(platform));
if (Runner.factory[platform]) {
result[`${this.config.name}:${platform}:run`] = _gulp.series(this.run(platform));
result[`${this.config.name}:${platform}:test`] = _gulp.series(this.test(platform));
}
if (Packer.factory[platform]) {
for (const name of Object.keys(Packer.factory[platform])) {
result[`${this.config.name}:${platform}:${name}`] = _gulp.series(this.pack(platform, name));
}
}
}
return result;
}
register(external_gulp?: gulp.Gulp) {
const _gulp = external_gulp || gulp;
for (const [k, v] of Object.entries(this.compile(_gulp))) {
_gulp.task(k, v);
}
}
// TODO:
static useRuffle() {
Runner.register(Platform.FLASH, RuffleRunner);
}
}
+175
View File
@@ -0,0 +1,175 @@
import dateformat from "dateformat";
import gulp from "gulp";
import gulpClean from "gulp-clean";
import template from "lodash.template";
import os from "os";
import type { Task } from "undertaker";
import { Builder, Project } from ".";
import { System } from "../common/system";
import { Config, type ConfigParams } 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?: any;
}
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 {
const configTemplate = template(JSON.stringify(preset));
return JSON.parse(
configTemplate({ 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);
}
}
+6 -7
View File
@@ -1,10 +1,10 @@
import colors from "ansi-colors"; import colors from "ansi-colors";
import cp from "child_process"; import cp from "child_process";
import { defaults, template } from "lodash";
import path from "path"; import path from "path";
import stream from "stream"; import stream from "stream";
import util from "util"; import util from "util";
import Vinyl from "vinyl"; import Vinyl from "vinyl";
import template from "../common/template";
export class Command { export class Command {
private command: string; private command: string;
@@ -14,13 +14,12 @@ 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 = { this.options = defaults(options || {}, {
cwd: process.cwd(), cwd: process.cwd(),
env: process.env, env: process.env,
verbosity: options?.silent ? 1 : 2, verbosity: options && options.silent ? 1 : 2,
usePowerShell: false, usePowerShell: false,
...(options || {}), });
};
let previousPath; let previousPath;
previousPath = this.options.env.PATH; previousPath = this.options.env.PATH;
@@ -29,7 +28,7 @@ export class Command {
this.options.env.PATH += previousPath; this.options.env.PATH += previousPath;
} }
exec(stdin?: any, callback?: any): Vinyl<stream.Stream> { exec(stdin?: any, callback?: any) {
let fileName; let fileName;
let directory; let directory;
let subShell; let subShell;
@@ -70,7 +69,7 @@ export class Command {
// execute the command. // execute the command.
// we spawn the command in a subshell, so things like i/o redirection // we spawn the command in a subshell, so things like i/o redirection
// just work. e.g. `echo hello world >> ./hello.txt` works as expected. // just work. e.g. `echo hello world >> ./hello.txt` works as expected.
const command = template.renderString(this.command, { const command = template(this.command)({
file: stdin, file: stdin,
}); });
-23
View File
@@ -1,23 +0,0 @@
import { branch, compile } from "../core/config";
import type { Config } from "../core/type";
import type { TaskCompilerType, TaskDef } from "./core";
import { CleanTaskCompiler } from "./impl/clean";
import { FormatTaskCompiler } from "./impl/format";
import { ProjectTaskCompiler } from "./impl/project";
import { ProtoTaskCompiler } from "./impl/proto";
import { SetupTaskCompiler } from "./impl/setup";
const COMPILERS: TaskCompilerType[] = [FormatTaskCompiler, CleanTaskCompiler, SetupTaskCompiler, ProtoTaskCompiler];
const PROJECT_COMPILERS: TaskCompilerType[] = [ProjectTaskCompiler];
export default function* (projects: Config[]): Iterable<TaskDef> {
const config = projects.reduce((config, project) => branch(config, project), compile({}));
for (const compiler of COMPILERS) {
yield* new compiler(config).compile();
}
for (const compiler of PROJECT_COMPILERS) {
for (const project of projects) {
yield* new compiler(project).compile();
}
}
}
-22
View File
@@ -1,22 +0,0 @@
import type { TaskFunction } from "gulp";
import type { Config } from "../core/type";
export interface TaskCompiler {
config: Config;
debug?: boolean;
compile(): Iterable<TaskDef>;
}
export type TaskDef = readonly [string, TaskFunction] | readonly [string, TaskFunction, boolean];
export abstract class TaskCompilerImpl implements TaskCompiler {
constructor(
public config: Config,
public debug?: boolean,
) {}
abstract compile(): Iterable<TaskDef>;
}
export type TaskCompilerType = new (config: Config, debug?: boolean) => TaskCompiler;
-9
View File
@@ -1,9 +0,0 @@
import gulp from "gulp";
import gulpClean from "gulp-clean";
import { TaskCompilerImpl, type TaskDef } from "../core";
export class CleanTaskCompiler extends TaskCompilerImpl {
*compile(): Iterable<TaskDef> {
yield ["clean", () => gulp.src("target/*", { read: false }).pipe(gulpClean()), true];
}
}
-36
View File
@@ -1,36 +0,0 @@
import fs from "fs";
import path from "path";
import { Haxe } from "../../impl/haxe";
import { TaskCompilerImpl, type TaskDef } from "../core";
export class FormatTaskCompiler extends TaskCompilerImpl {
*compile(): Iterable<TaskDef> {
const hxformatFile = path.join(".", "hxformat.json");
if (fs.existsSync(hxformatFile)) {
yield [
"check",
async () => {
const haxe = new Haxe(this.config.haxe);
await haxe.install({ formatter: "" });
await haxe.haxelib(
["run", "formatter", "--check"].concat(
this.config.sources.reduce<string[]>((sources, source) => sources.concat(["-s", source]), []),
),
);
},
];
yield [
"format",
async () => {
const haxe = new Haxe(this.config.haxe);
await haxe.install({ formatter: "" });
await haxe.haxelib(
["run", "formatter"].concat(
this.config.sources.reduce<string[]>((sources, source) => sources.concat(["-s", source]), []),
),
);
},
];
}
}
}
-42
View File
@@ -1,42 +0,0 @@
import gulp from "gulp";
import os from "os";
import { Platform } from "../../core/type";
import { Builder, Packer, Runner } from "../../project";
import { TaskCompilerImpl, type TaskDef } 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 {
*compile(): Iterable<TaskDef> {
for (const platform of this.config.platforms.filter(isPlatformSupported)) {
const builder = Builder.new(this.config, platform, this.config.buildSystem, this.debug);
const setupKey = `${this.config.name}:${platform}:setup`;
const buildKey = `${this.config.name}:${platform}:build`;
yield [setupKey, builder.setup.bind(builder)];
yield [buildKey, gulp.series(builder.setup.bind(builder), builder.call.bind(builder)), true];
if (Runner.factory[platform]) {
const testKey = `${this.config.name}:${platform}:test`;
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))];
}
if (Packer.factory[platform]) {
for (const name of Object.keys(Packer.factory[platform])) {
const packKey = `${this.config.name}:${platform}:${name}`;
const packer = Packer.new(this.config, platform, name);
yield [packKey, gulp.series(packer.setup.bind(packer), packer.call.bind(packer)), true];
}
}
}
}
}
-23
View File
@@ -1,23 +0,0 @@
import fs from "fs";
import path from "path";
import { Haxe } from "../../impl/haxe";
import { TaskCompilerImpl, type TaskDef } from "../core";
export class ProtoTaskCompiler extends TaskCompilerImpl {
*compile(): Iterable<TaskDef> {
const protohxFile = path.join(".", "protohx.json");
if (fs.existsSync(protohxFile)) {
yield [
"protohx:generate",
async () => {
const haxe = new Haxe(this.config.haxe);
const result = await haxe.haxelib(["run", "protohx", "generate", "protohx.json"]);
if (result.stdout.indexOf("FAIL") > -1) {
throw result.stdout;
}
},
true,
];
}
}
}
-14
View File
@@ -1,14 +0,0 @@
import { Builder } from "../../project";
import { TaskCompilerImpl, type TaskDef } from "../core";
export class SetupTaskCompiler extends TaskCompilerImpl {
*compile(): Iterable<TaskDef> {
yield [
"setup",
() =>
Promise.all(
this.config.platforms.map((platform) => Builder.new(this.config, platform, this.config.buildSystem).setup()),
),
];
}
}
-12
View File
@@ -1,12 +0,0 @@
import compiler from "./compiler";
import register from "./register";
export * from "./core";
export * from "./impl/format";
export * from "./impl/project";
export const Task = {
compiler,
register,
};
export default Task;
-15
View File
@@ -1,15 +0,0 @@
import gulp from "gulp";
import type { TaskDef } from "./core";
export default (tasks: Iterable<TaskDef>) => {
const defaultTasks = [];
for (const item of tasks) {
gulp.task(item[0], item[1]);
if (item[2]) {
defaultTasks.push(item[0]);
}
}
if (defaultTasks.length > 0) {
gulp.task("default", gulp.series(defaultTasks));
}
};
+4 -10
View File
@@ -1,17 +1,11 @@
<% 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%>"
+14 -10
View File
@@ -3,16 +3,20 @@ 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 { download } from "../dist/lib/index.mjs"; import { Downloader } from "../dist/index.mjs";
const testUrl = async (url, file) => { const resolveTargetDir = () => mkdtempSync(join(tmpdir(), "test-"));
const target = mkdtempSync(join(tmpdir(), "test-"));
await download(url, target); const TEST_DATA = {
assert(existsSync(join(target, file))); "https://home.shmyga.ru/public/sdk/haxe/haxe-4.2.5-win.zip": "haxe.exe",
"https://home.shmyga.ru/public/sdk/haxe/haxe-4.2.5-linux64.tar.gz": "haxe",
"https://home.shmyga.ru/public/test.txt": "test.txt",
}; };
test("zip", async () => await testUrl("https://home.shmyga.ru/public/sdk/haxe/haxe-4.2.5-win.zip", "haxe.exe")); for (const [url, file] of Object.entries(TEST_DATA)) {
test(`Test download: ${url}`, async () => {
test("tar.gz", async () => await testUrl("https://home.shmyga.ru/public/sdk/haxe/haxe-4.2.5-linux64.tar.gz", "haxe")); const target = resolveTargetDir();
await Downloader.download(url, target);
test("plain", async () => await testUrl("https://home.shmyga.ru/public/test.txt", "test.txt")); assert(existsSync(join(target, file)));
});
}
-55
View File
@@ -1,55 +0,0 @@
import assert from "node:assert/strict";
import test from "node:test";
import { Android, AndroidNdk, FlashPlayer, Haxe, Neko, resolveLink, RufflePlayer } from "../dist/lib/index.mjs";
const testLink = (link, args) => {
for (const [params, targetUrl] of args) {
const url = resolveLink(link, params);
assert.equal(url, targetUrl);
}
};
test("neko", () =>
testLink(new Neko().link, [
[{ os_name: "linux" }, "https://github.com/HaxeFoundation/neko/releases/download/v2-4-1/neko-2.4.1-linux64.tar.gz"],
[{ os_name: "win" }, "https://github.com/HaxeFoundation/neko/releases/download/v2-4-1/neko-2.4.1-win64.zip"],
]));
test("haxe", () =>
testLink(new Haxe().link, [
[{ os_name: "linux" }, "https://github.com/HaxeFoundation/haxe/releases/download/4.2.5/haxe-4.2.5-linux64.tar.gz"],
[{ os_name: "win" }, "https://github.com/HaxeFoundation/haxe/releases/download/4.2.5/haxe-4.2.5-win64.zip"],
]));
test("flashplayer", () =>
testLink(new FlashPlayer().link, [
[
{ os_name: "linux" },
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz",
],
[{ os_name: "win" }, "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flashplayer_32_sa.exe"],
]));
test("ruffle", () =>
testLink(new RufflePlayer().link, [
[
{ os_name: "linux" },
"https://github.com/ruffle-rs/ruffle/releases/download/v0.7.1/ruffle-0.7.1-linux-x86_64.tar.gz",
],
[
{ os_name: "win" },
"https://github.com/ruffle-rs/ruffle/releases/download/v0.7.1/ruffle-0.7.1-windows-x86_64.zip",
],
]));
test("android", () =>
testLink(new Android().link, [
[{ os_name: "linux" }, "https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip"],
[{ os_name: "win" }, "https://dl.google.com/android/repository/commandlinetools-win-7302050_latest.zip"],
]));
test("android-ndk", () =>
testLink(new AndroidNdk().link, [
[{ os_name: "linux" }, "https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip"],
[{ os_name: "win" }, "https://dl.google.com/android/repository/android-ndk-r21e-windows-x86_64.zip"],
]));
+1 -10
View File
@@ -1,18 +1,9 @@
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: { exports: true,
bin: {
hxt: "src/cli.ts",
},
},
sourcemap: true, sourcemap: true,
}); });