Compare commits
16
Commits
dfad6d3aba
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f59ef2893e | ||
|
|
6a887d10ff | ||
|
|
6940c65b88 | ||
|
|
0a355ee680 | ||
|
|
bb6d82d538 | ||
|
|
7615dbfc48 | ||
|
|
d079cbaac5 | ||
|
|
b3d1aee9ed | ||
|
|
769127d6f0 | ||
|
|
57f7e88fab | ||
|
|
7f62df2364 | ||
|
|
6622d53167 | ||
|
|
561dd99cba | ||
|
|
bc77380aba | ||
|
|
a20e98d730 | ||
|
|
87fe852f99 |
@@ -1,29 +0,0 @@
|
||||
## 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)
|
||||
@@ -23,7 +23,7 @@ Tool for simple building and pack HaXe and OpenFl project
|
||||
"dev": "hxt app:flash:test"
|
||||
},
|
||||
"devDependencies": {
|
||||
"gulp-haxetool": "^1.2.0"
|
||||
"gulp-haxetool": "^2.0.0"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"indentation": {
|
||||
"character": " "
|
||||
},
|
||||
"wrapping": {
|
||||
"maxLineLength": 120
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,6 @@ import flash.display.Shape;
|
||||
import flash.Lib;
|
||||
|
||||
class Main {
|
||||
|
||||
public static function main() {
|
||||
trace("Hello world!");
|
||||
var shape = new Shape();
|
||||
|
||||
Generated
+88
-1327
File diff suppressed because it is too large
Load Diff
+3
-3
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "gulp-haxetool",
|
||||
"type": "module",
|
||||
"version": "1.2.0",
|
||||
"version": "2.1.0",
|
||||
"description": "HaXe Tool with Gulp",
|
||||
"exports": {
|
||||
"./bin/cli": "./dist/bin/cli.mjs",
|
||||
@@ -54,7 +54,7 @@
|
||||
"tar": "^7.5.22",
|
||||
"through2": "^5.0.12",
|
||||
"tmp-file": "^2.0.1",
|
||||
"unzip-stream": "^0.3.4",
|
||||
"unzipper": "^0.12.5",
|
||||
"vinyl": "^3.0.1",
|
||||
"vinyl-fs": "^4.0.2"
|
||||
},
|
||||
@@ -73,7 +73,7 @@
|
||||
"@types/tail": "^2.2.3",
|
||||
"@types/tar": "^7.0.87",
|
||||
"@types/through2": "^5.0.0",
|
||||
"@types/unzip-stream": "^0.3.4",
|
||||
"@types/unzipper": "^0.10.11",
|
||||
"eslint": "^10.13.0",
|
||||
"prettier": "^3.9.10",
|
||||
"tsdown": "0.22.14",
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
import gulp from "gulp";
|
||||
import { Preset } from ".";
|
||||
import { Preset, Task } from ".";
|
||||
import { name, version } from "../package.json" with { type: "json" };
|
||||
|
||||
console.log(`[${name} ${version}]`);
|
||||
@@ -27,7 +27,7 @@ export const main = async () => {
|
||||
const preset = Preset.loader();
|
||||
Preset.validator(preset);
|
||||
const projects = Preset.compiler(preset);
|
||||
Preset.register(projects);
|
||||
Task.register(Task.compiler(projects));
|
||||
|
||||
if (process.argv.length > 2) {
|
||||
await runTask(process.argv[2]);
|
||||
|
||||
+1
-1
@@ -5,5 +5,5 @@ const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = path.dirname(__filename);
|
||||
|
||||
export default (name: string): string => {
|
||||
return path.join(__dirname, "..", "assets", name);
|
||||
return path.join(__dirname, "assets", name);
|
||||
};
|
||||
|
||||
@@ -4,9 +4,9 @@ import fse from "fs-extra";
|
||||
import got, { type Progress, type Request } from "got";
|
||||
import path from "path";
|
||||
import ps from "promise-streams";
|
||||
import type { Stream, Writable } from "stream";
|
||||
import { type Stream, type Writable } from "stream";
|
||||
import { x as tarX } from "tar";
|
||||
import unzip from "unzip-stream";
|
||||
import unzipper from "unzipper";
|
||||
|
||||
export interface DownloadOptions {
|
||||
progress?: boolean;
|
||||
@@ -19,7 +19,7 @@ const DEFAULT_OPTIONS: DownloadOptions = { progress: true, strip: 1, executable:
|
||||
type Extractor = (stream: Request, dest: string, options: DownloadOptions) => Stream;
|
||||
|
||||
const ZIP_EXTRACTOR: Extractor = (stream: Request, dest: string, options: DownloadOptions): Stream => {
|
||||
return stream.pipe(unzip.Parse()).on("entry", (entry: any) => {
|
||||
return stream.pipe(unzipper.Parse()).on("entry", (entry: unzipper.Entry) => {
|
||||
const filePath = entry.path.split("/").slice(options.strip).join(path.sep);
|
||||
if (filePath.length > 0) {
|
||||
if (entry.type === "Directory") {
|
||||
@@ -94,7 +94,7 @@ 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);
|
||||
let stream: Request = got.stream(url, { decompress: false });
|
||||
if (options.progress) {
|
||||
stream = progressBar.handle(stream);
|
||||
}
|
||||
|
||||
@@ -5,9 +5,12 @@ import { fileURLToPath } from "url";
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = path.dirname(__filename);
|
||||
|
||||
export default new Eta({
|
||||
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"),
|
||||
views: path.join(__dirname, "template"),
|
||||
});
|
||||
|
||||
export default template;
|
||||
|
||||
+12
-4
@@ -24,7 +24,6 @@ export const DEFAULT_CONFIG: Config = {
|
||||
},
|
||||
key: null,
|
||||
android: [],
|
||||
haxe: null,
|
||||
};
|
||||
|
||||
export const absolutePath = (file: string): string => {
|
||||
@@ -36,7 +35,7 @@ export const compile = (source: ConfigSource): Config => {
|
||||
return branch(DEFAULT_CONFIG, source);
|
||||
};
|
||||
|
||||
export const branch = (config: Config, source: ConfigSource): Config => {
|
||||
export const branch = (config: Config, source: ConfigSource | Config): Config => {
|
||||
const result = structuredClone(config);
|
||||
|
||||
if (source.buildSystem !== undefined) {
|
||||
@@ -85,8 +84,8 @@ export const branch = (config: Config, source: ConfigSource): Config => {
|
||||
if (source.haxe !== undefined) {
|
||||
result.haxe = source.haxe;
|
||||
}
|
||||
if (result.meta.icon) {
|
||||
result.icon = absolutePath(result.meta.icon);
|
||||
if (result.icon) {
|
||||
result.icon = absolutePath(result.icon);
|
||||
}
|
||||
|
||||
if (!result.meta.mobileWidth) {
|
||||
@@ -97,3 +96,12 @@ export const branch = (config: Config, source: ConfigSource): Config => {
|
||||
}
|
||||
return result;
|
||||
};
|
||||
|
||||
export const hasLib = (config: Config, name: string): boolean => {
|
||||
for (const lib of config.libs) {
|
||||
if (lib.name === name) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
};
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
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));
|
||||
}
|
||||
};
|
||||
+11
-4
@@ -2,10 +2,13 @@ import os from "os";
|
||||
import path from "path";
|
||||
import download from "../common/download";
|
||||
import { Logger } from "../common/log";
|
||||
import { resolveLink, type Link } from "./link";
|
||||
|
||||
export class Sdk {
|
||||
static _dir: string;
|
||||
|
||||
url!: string;
|
||||
|
||||
static set dir(value) {
|
||||
Sdk._dir = value;
|
||||
}
|
||||
@@ -45,8 +48,11 @@ export class Sdk {
|
||||
throw "Not implemented";
|
||||
}
|
||||
|
||||
get link(): string {
|
||||
throw "Not implemented";
|
||||
get link(): string | Link {
|
||||
return {
|
||||
version: this.version,
|
||||
url: this.url,
|
||||
};
|
||||
}
|
||||
|
||||
prepare(strip = 1): Promise<any> {
|
||||
@@ -54,8 +60,9 @@ export class Sdk {
|
||||
if (this.prepared) {
|
||||
return Promise.resolve();
|
||||
} else {
|
||||
this.log.i("download: *%s*", this.link);
|
||||
return download(this.link, this.path, { strip });
|
||||
const url = resolveLink(this.link, { name: this.name, version: this.version });
|
||||
this.log.i("download: *%s*", url);
|
||||
return download(url, this.path, { strip });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+2
-3
@@ -24,7 +24,6 @@ export interface LibDef {
|
||||
export interface ConfigMeta {
|
||||
title?: string;
|
||||
filename?: string;
|
||||
icon?: string;
|
||||
version?: string;
|
||||
pack?: string;
|
||||
author?: string;
|
||||
@@ -74,11 +73,11 @@ export interface Config {
|
||||
libs: LibDef[];
|
||||
macros: string[];
|
||||
flags: string[];
|
||||
icon: string | null;
|
||||
icon: string;
|
||||
meta: ConfigMeta;
|
||||
key: SignKey | null;
|
||||
android: AndroidPreset[];
|
||||
haxe: string | null;
|
||||
haxe?: string;
|
||||
}
|
||||
|
||||
export type PackageJson = Record<string, any>;
|
||||
|
||||
+27
-24
@@ -2,31 +2,47 @@ import fs from "fs";
|
||||
import os from "os";
|
||||
import path from "path";
|
||||
import through from "through2";
|
||||
import download from "../common/download";
|
||||
import env from "../common/env";
|
||||
import exec from "../common/exec";
|
||||
import { System } from "../common/system";
|
||||
import { HandlerWriter } from "../common/tail";
|
||||
import { Sdk } from "../core/sdk";
|
||||
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 {
|
||||
static ID = "android";
|
||||
|
||||
static VERSION_7302050 = "7302050";
|
||||
static VERSION = Android.VERSION_7302050;
|
||||
|
||||
static NDK_VERSION_R15C = "r15c";
|
||||
static NDK_VERSION_R21E = "r21e";
|
||||
static NDK_VERSION = Android.NDK_VERSION_R21E;
|
||||
private ndk: AndroidNdk;
|
||||
|
||||
private ndk_version: string;
|
||||
private repository: string;
|
||||
url = "https://dl.google.com/android/repository/commandlinetools-<%= os_name %>-<%= version %>_latest.zip";
|
||||
|
||||
constructor(version?: string, ndkVersion?: string) {
|
||||
super(Android.ID, version || Android.VERSION);
|
||||
this.ndk_version = ndkVersion || Android.NDK_VERSION;
|
||||
this.repository = "https://dl.google.com/android/repository";
|
||||
this.ndk = new AndroidNdk(ndkVersion);
|
||||
}
|
||||
|
||||
get prepared(): boolean {
|
||||
@@ -37,16 +53,12 @@ export class Android extends Sdk {
|
||||
}
|
||||
}
|
||||
|
||||
get link(): string {
|
||||
return `${this.repository}/commandlinetools-${System.os}-${this.version}_latest.zip`;
|
||||
}
|
||||
|
||||
get android_home(): string {
|
||||
return this.path;
|
||||
}
|
||||
|
||||
get ndk_home(): string {
|
||||
return Sdk.path('android-ndk', this.ndk_version);
|
||||
return this.ndk.path;
|
||||
}
|
||||
|
||||
get sdkmanager_bin(): string {
|
||||
@@ -56,19 +68,10 @@ export class Android extends Sdk {
|
||||
prepare(): Promise<any> {
|
||||
const result = [];
|
||||
result.push(super.prepare(0));
|
||||
if (!fs.existsSync(path.join(this.ndk_home))) {
|
||||
result.push(this.prepare_ndk());
|
||||
}
|
||||
result.push(this.ndk.prepare());
|
||||
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 download(url, this.ndk_home, { executable: true });
|
||||
}
|
||||
|
||||
sdkmanager(packages: string[]) {
|
||||
this.log.i("sdkmanager: *%s*", packages.join(", "));
|
||||
const installedFile = path.join(this.path, ".installed");
|
||||
|
||||
+5
-14
@@ -2,7 +2,6 @@ import fs from "fs";
|
||||
import fse from "fs-extra";
|
||||
import os from "os";
|
||||
import path from "path";
|
||||
import env from "../common/env";
|
||||
import { System } from "../common/system";
|
||||
import { watch } from "../common/watch";
|
||||
import { Sdk } from "../core/sdk";
|
||||
@@ -26,12 +25,15 @@ export class FlashPlayer extends Sdk {
|
||||
BASE_URL = "https://fpdownload.macromedia.com/pub/flashplayer/updaters";
|
||||
|
||||
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) {
|
||||
super(playerId, version || FlashPlayer.VERSION);
|
||||
this.debug = debug;
|
||||
this.baseUrl = env.get("FLASHPLAYER_URL") || this.BASE_URL;
|
||||
}
|
||||
|
||||
prepare() {
|
||||
@@ -46,17 +48,6 @@ 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 {
|
||||
if (System.isWindows) {
|
||||
const playerName = `flashplayer_${this.version}_sa${this.debug ? "_debug" : ""}.exe`;
|
||||
|
||||
+26
-24
@@ -33,6 +33,11 @@ export class Haxe extends Sdk {
|
||||
|
||||
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) {
|
||||
if (System.isWindows) {
|
||||
return path.join(this.path, name + ".exe");
|
||||
@@ -78,33 +83,30 @@ export class Haxe extends Sdk {
|
||||
env.addPath(this.path, "LD_LIBRARY_PATH");
|
||||
}
|
||||
|
||||
prepare() {
|
||||
return Promise.all([this.neko.prepare(), super.prepare()]).then(() => {
|
||||
fs.copyFileSync(
|
||||
path.resolve(import.meta.dirname, "..", "template/haxe/activate"),
|
||||
path.resolve(this.path, "activate"),
|
||||
);
|
||||
});
|
||||
async replaceHaxelib(version: string): Promise<any> {
|
||||
const haxe = new Haxe(version);
|
||||
await haxe.prepare();
|
||||
fs.copyFileSync(haxe.haxelibBin, this.haxelibBin);
|
||||
}
|
||||
|
||||
get link(): string {
|
||||
if (System.isWindows) {
|
||||
return `https://github.com/HaxeFoundation/haxe/releases/download/${this.version}/haxe-${this.version}-win.zip`;
|
||||
} else if (System.isLinux) {
|
||||
let arch = System.archInt;
|
||||
return `https://github.com/HaxeFoundation/haxe/releases/download/${this.version}/haxe-${this.version}-linux${arch}.tar.gz`;
|
||||
} else {
|
||||
throw `Unsupported os: ${System.os}`;
|
||||
async prepare(): Promise<any> {
|
||||
await Promise.all([this.neko.prepare(), super.prepare()]);
|
||||
fs.copyFileSync(path.resolve(import.meta.dirname, "template/haxe/activate"), path.resolve(this.path, "activate"));
|
||||
// TODO: old haxelib fail with EOF
|
||||
if (this.intVersion < 430) {
|
||||
await this.replaceHaxelib(Haxe.VERSION_4_3_7);
|
||||
}
|
||||
}
|
||||
|
||||
haxe(args: any) {
|
||||
this.activate();
|
||||
this.log.d("_haxe_ *%s*", args.join(" "));
|
||||
return exec(".", [this.haxeBin].concat(args).join(" "));
|
||||
}
|
||||
|
||||
haxelib(args: any) {
|
||||
this.activate();
|
||||
this.log.d("_haxelib_ *%s*", args.join(" "));
|
||||
return exec(".", [this.haxelibBin].concat(args).join(" "));
|
||||
}
|
||||
|
||||
@@ -179,7 +181,7 @@ export class Haxe extends Sdk {
|
||||
args.push("-debug");
|
||||
}
|
||||
const target = path.resolve(buildDir, platform, "bin");
|
||||
if (platform !== "cpp") {
|
||||
if (platform !== Platform.CPP) {
|
||||
fse.emptyDirSync(target);
|
||||
}
|
||||
for (const asset of config.assets) {
|
||||
@@ -193,7 +195,7 @@ export class Haxe extends Sdk {
|
||||
)[platform] || "**/*";
|
||||
return this.haxe(args).then(() => {
|
||||
let r = vfs.src(`${target}/${result}`, { encoding: false });
|
||||
if (platform === "cpp") {
|
||||
if (platform === Platform.CPP) {
|
||||
r = r.pipe(rename(config.meta.filename!));
|
||||
}
|
||||
return r;
|
||||
@@ -201,17 +203,17 @@ export class Haxe extends Sdk {
|
||||
}
|
||||
|
||||
install(packages: Record<string, string> | LibDef[]) {
|
||||
this.activate();
|
||||
let promise = this.haxelib(["setup", path.join(this.path, "lib")]);
|
||||
const next = (args: any) => () => {
|
||||
this.log.i("_haxelib_ _install_ *%s:%s*", args[1], args[2]);
|
||||
return this.haxelib(args);
|
||||
};
|
||||
|
||||
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();
|
||||
let promise = this.haxelib(["setup", path.join(this.path, "lib")]);
|
||||
const next = (args: any) => () => {
|
||||
return this.haxelib(args);
|
||||
};
|
||||
|
||||
for (let pack of packages) {
|
||||
const args = [];
|
||||
let version = null;
|
||||
|
||||
+6
-43
@@ -5,41 +5,6 @@ import env from "../common/env";
|
||||
import { Sdk } from "../core/sdk";
|
||||
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 {
|
||||
static ID = "neko";
|
||||
|
||||
@@ -48,14 +13,15 @@ export class Neko extends Sdk {
|
||||
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) {
|
||||
super(Neko.ID, version || Neko.VERSION);
|
||||
}
|
||||
|
||||
get link() {
|
||||
return NekoLink.get(this.version);
|
||||
}
|
||||
|
||||
get prepared() {
|
||||
try {
|
||||
return fs.existsSync(this.nekoBin);
|
||||
@@ -72,10 +38,7 @@ export class Neko extends Sdk {
|
||||
|
||||
prepare() {
|
||||
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"));
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
+4
-17
@@ -1,6 +1,5 @@
|
||||
import os from "os";
|
||||
import path from "path";
|
||||
import env from "../common/env";
|
||||
import { System } from "../common/system";
|
||||
import { watch } from "../common/watch";
|
||||
import run from "../run";
|
||||
@@ -9,30 +8,18 @@ import { FlashPlayer } from "./flashplayer";
|
||||
export class RufflePlayer extends FlashPlayer {
|
||||
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_6_0 = "0.6.0";
|
||||
static VERSION_0_7_1 = "0.7.1";
|
||||
static VERSION = RufflePlayer.VERSION_0_7_1;
|
||||
|
||||
BASE_URL = "https://github.com/ruffle-rs/ruffle/releases/download";
|
||||
url =
|
||||
"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) {
|
||||
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 {
|
||||
|
||||
@@ -2,7 +2,9 @@ export * from "./common/download";
|
||||
export * from "./common/log";
|
||||
export * from "./common/output";
|
||||
export * from "./common/system";
|
||||
export * from "./common/template";
|
||||
export * from "./core/config";
|
||||
export * from "./core/link";
|
||||
export * from "./core/sdk";
|
||||
export * from "./core/type";
|
||||
export * from "./impl/android";
|
||||
@@ -14,3 +16,4 @@ export * from "./impl/ruffle";
|
||||
export * from "./preset";
|
||||
export * from "./project";
|
||||
export * from "./project/impl";
|
||||
export * from "./task";
|
||||
|
||||
@@ -1,16 +1,14 @@
|
||||
import { branch, compile } from "../core/config";
|
||||
import type { Config, PresetJson } from "../core/type";
|
||||
import { Project } from "../project";
|
||||
|
||||
export default (preset: PresetJson): Project[] => {
|
||||
export default (preset: PresetJson): Config[] => {
|
||||
const config: Config = compile(preset["default"] || {});
|
||||
const projects: Project[] = [];
|
||||
const result: Config[] = [];
|
||||
for (const [k, v] of Object.entries(preset)) {
|
||||
if (k == "default") {
|
||||
continue;
|
||||
}
|
||||
const projectConfig = branch(config, { ...v, name: k });
|
||||
projects.push(new Project(projectConfig));
|
||||
result.push(branch(config, { ...v, name: k }));
|
||||
}
|
||||
return projects;
|
||||
return result;
|
||||
};
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
import compiler from "./compiler";
|
||||
import loader from "./loader";
|
||||
import register from "./register";
|
||||
import validator from "./validator";
|
||||
|
||||
export const Preset = {
|
||||
compiler,
|
||||
loader,
|
||||
register,
|
||||
validator,
|
||||
};
|
||||
|
||||
|
||||
@@ -4,9 +4,9 @@ import os from "os";
|
||||
import path from "path";
|
||||
import template from "../common/template";
|
||||
import { Sdk } from "../core/sdk";
|
||||
import type { ConfigJson, ConfigSource, PackageJson, PresetJson } from "../core/type";
|
||||
import { Platform, type ConfigJson, type ConfigSource, type PackageJson, type PresetJson } from "../core/type";
|
||||
import { Haxe } from "../impl/haxe";
|
||||
import { Project } from "../project";
|
||||
import { RuffleRunner, Runner } from "../project";
|
||||
|
||||
export const DEFAULT_CONFIG_JSON: ConfigJson = {
|
||||
SdkDir: "$HOME/sdk",
|
||||
@@ -15,8 +15,9 @@ export const DEFAULT_CONFIG_JSON: ConfigJson = {
|
||||
export const resolvePath = (path: string) => path.replace("$HOME", os.homedir());
|
||||
|
||||
export const applyConfig = (config: ConfigJson) => {
|
||||
// TODO: ruffle kludge
|
||||
if (config.UseRuffle) {
|
||||
Project.useRuffle();
|
||||
Runner.register(Platform.FLASH, RuffleRunner);
|
||||
}
|
||||
if (config.SdkDir) {
|
||||
Sdk.dir = resolvePath(config.SdkDir);
|
||||
|
||||
@@ -1,91 +0,0 @@
|
||||
import gulp from "gulp";
|
||||
import gulpClean from "gulp-clean";
|
||||
import type { Task } from "undertaker";
|
||||
import { System } from "../common/system";
|
||||
import { Platform } from "../core/type";
|
||||
import { Haxe } from "../impl/haxe";
|
||||
import { Builder, type Project } from "../project";
|
||||
|
||||
export default (projects: Project[]): Task => {
|
||||
gulp.task("clean", () => {
|
||||
return gulp.src("target/*", { read: false }).pipe(gulpClean());
|
||||
});
|
||||
|
||||
const project = projects[0];
|
||||
|
||||
gulp.task("setup", () => {
|
||||
return Promise.all(
|
||||
project.config.platforms.map((platform) =>
|
||||
Builder.new(project.config, platform, project.config.buildSystem).prepare(),
|
||||
),
|
||||
);
|
||||
});
|
||||
|
||||
const protohx = project.hasLib("protohx");
|
||||
if (protohx) {
|
||||
gulp.task("protohx:generate", () =>
|
||||
new Haxe().haxelib(["run", "protohx", "generate", "protohx.json"]).then((result: any) => {
|
||||
if (result.stdout.indexOf("FAIL") > -1) {
|
||||
throw result.stdout;
|
||||
}
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
for (const project of projects) {
|
||||
project.register(gulp);
|
||||
}
|
||||
|
||||
const defaultSeries: Task[] = [gulp.task("clean")!, gulp.task("setup")!];
|
||||
|
||||
if (protohx) {
|
||||
defaultSeries.push(gulp.task("protohx:generate")!);
|
||||
}
|
||||
|
||||
for (const project of projects) {
|
||||
for (const platform of project.config.platforms) {
|
||||
switch (platform) {
|
||||
case Platform.FLASH:
|
||||
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
|
||||
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:html`)!);
|
||||
break;
|
||||
case Platform.HTML5:
|
||||
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
|
||||
break;
|
||||
case Platform.LINUX:
|
||||
if (System.isLinux) {
|
||||
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
|
||||
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:archive`)!);
|
||||
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:deb`)!);
|
||||
}
|
||||
break;
|
||||
case Platform.CPP:
|
||||
if (System.isLinux) {
|
||||
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
|
||||
}
|
||||
break;
|
||||
case Platform.NEKO:
|
||||
if (System.isLinux) {
|
||||
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
|
||||
}
|
||||
break;
|
||||
case Platform.ANDROID:
|
||||
if (System.isLinux) {
|
||||
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
|
||||
}
|
||||
break;
|
||||
case Platform.WINDOWS:
|
||||
if (System.isWindows) {
|
||||
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
|
||||
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:archive`)!);
|
||||
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:installer`)!);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const defaultTask = gulp.series(defaultSeries);
|
||||
gulp.task("default", defaultTask);
|
||||
return defaultTask;
|
||||
};
|
||||
@@ -5,16 +5,16 @@ import { tail } from "../../common/tail";
|
||||
import { type Config, Platform } from "../../core/type";
|
||||
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 {
|
||||
static factory: Record<string, RunnerFactory> = {};
|
||||
|
||||
public debug: boolean;
|
||||
|
||||
constructor(config: Config, platform: Platform, debug: boolean) {
|
||||
constructor(config: Config, platform: Platform, debug?: boolean) {
|
||||
super(config, platform);
|
||||
this.debug = debug;
|
||||
this.debug = debug || false;
|
||||
}
|
||||
|
||||
log(stream: any) {
|
||||
@@ -25,7 +25,7 @@ export class Runner extends Target {
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ export class Target {
|
||||
this.target = "target";
|
||||
}
|
||||
|
||||
prepare(): Promise<any> {
|
||||
setup(): Promise<any> {
|
||||
return Promise.resolve();
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ export class HaxeBuilder extends Builder {
|
||||
this.android = new Android();
|
||||
}
|
||||
|
||||
prepare() {
|
||||
setup() {
|
||||
let result: Promise<any> = this.haxe.prepare().then(() => this.haxe.install(this.config.libs));
|
||||
if (this.buildSystem === BuildSystem.OPENFL) {
|
||||
if (this.platform === Platform.ANDROID) {
|
||||
@@ -25,13 +25,10 @@ export class HaxeBuilder extends Builder {
|
||||
.then(() => this.android.activate())
|
||||
.then(() =>
|
||||
this.android.sdkmanager([
|
||||
// ToDo: android sdk dependencies config?
|
||||
//'tools',
|
||||
// TODO: android sdk dependencies config?
|
||||
"platform-tools",
|
||||
"build-tools;27.0.3",
|
||||
"platforms;android-28", //ToDo: lime version 7.6.0 -> 28; 7.0.0 -> 26
|
||||
//'ndk-bundle',
|
||||
//'lldb;3.1',
|
||||
"platforms;android-28",
|
||||
"cmake;3.6.4111459",
|
||||
]),
|
||||
);
|
||||
|
||||
@@ -15,7 +15,7 @@ export class FlashHTMLPacker extends Packer {
|
||||
const target = this.targetPath;
|
||||
const index = template.render("flash/index.html", this.config);
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,12 @@ import template from "../../../../common/template";
|
||||
import { type Config, Platform } from "../../../../core/type";
|
||||
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 {
|
||||
static NAME = "deb";
|
||||
|
||||
@@ -18,7 +24,7 @@ export class LinuxDEBPacker extends Packer {
|
||||
call() {
|
||||
const target = this.targetPath;
|
||||
const buildDir = path.join(os.tmpdir(), "build", this.config.name, "debian");
|
||||
const icon = this.config.meta.icon!;
|
||||
const icon = this.config.icon;
|
||||
const iconfile = `${this.config.meta.filename}${path.extname(icon)}`;
|
||||
const desktop = template.render("linux/app.desktop", { iconfile: iconfile, ...this.config });
|
||||
fse.ensureDirSync(`${buildDir}/usr/share/applications`);
|
||||
@@ -35,11 +41,7 @@ export class LinuxDEBPacker extends Packer {
|
||||
maintainer: this.config.meta.author,
|
||||
description: this.config.meta.title,
|
||||
changelog: [],
|
||||
postinst: [
|
||||
'if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ] ; then\n' +
|
||||
" update-menus\n" +
|
||||
"fi",
|
||||
],
|
||||
postinst: [UPDATE_MENUS],
|
||||
_target: "/",
|
||||
_out: this.resolveTargetPath("debian"),
|
||||
_clean: true,
|
||||
|
||||
@@ -12,7 +12,7 @@ export class WindowsInstallerPacker extends Packer {
|
||||
this.innosetup = new InnoSetup();
|
||||
}
|
||||
|
||||
prepare() {
|
||||
setup() {
|
||||
return this.innosetup.prepare();
|
||||
}
|
||||
|
||||
|
||||
@@ -6,12 +6,12 @@ import { Runner } from "../../core/runner";
|
||||
export class AndroidRunner extends Runner {
|
||||
protected android: Android;
|
||||
|
||||
constructor(config: Config, debug: boolean) {
|
||||
constructor(config: Config, debug?: boolean) {
|
||||
super(config, Platform.ANDROID, debug);
|
||||
this.android = new Android();
|
||||
}
|
||||
|
||||
prepare() {
|
||||
setup() {
|
||||
return this.android.prepare();
|
||||
}
|
||||
|
||||
|
||||
@@ -6,12 +6,12 @@ import { Runner } from "../../core/runner";
|
||||
export class FlashRunner extends Runner {
|
||||
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);
|
||||
this.player = new player(debug);
|
||||
}
|
||||
|
||||
prepare() {
|
||||
setup() {
|
||||
return this.player.prepare();
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import { type Config, Platform } from "../../../core/type";
|
||||
import { Runner } from "../../core/runner";
|
||||
|
||||
export class Html5Runner extends Runner {
|
||||
constructor(config: Config, debug: boolean) {
|
||||
constructor(config: Config, debug?: boolean) {
|
||||
super(config, Platform.HTML5, debug);
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ import run from "../../../run";
|
||||
import { Runner } from "../../core/runner";
|
||||
|
||||
export class LinuxRunner extends Runner {
|
||||
constructor(config: Config, debug: boolean) {
|
||||
constructor(config: Config, debug?: boolean) {
|
||||
super(config, Platform.LINUX, debug);
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ export class LinuxRunner extends Runner {
|
||||
Runner.register(Platform.LINUX, LinuxRunner);
|
||||
|
||||
export class CPPRunner extends LinuxRunner {
|
||||
constructor(config: Config, debug: boolean) {
|
||||
constructor(config: Config, debug?: boolean) {
|
||||
super(config, debug);
|
||||
this.platform = Platform.CPP;
|
||||
}
|
||||
|
||||
@@ -6,12 +6,12 @@ import { Runner } from "../../core/runner";
|
||||
export class NekoRunner extends Runner {
|
||||
public neko: Neko;
|
||||
|
||||
constructor(config: Config, debug: boolean) {
|
||||
constructor(config: Config, debug?: boolean) {
|
||||
super(config, Platform.NEKO, debug);
|
||||
this.neko = new Neko();
|
||||
}
|
||||
|
||||
prepare() {
|
||||
setup() {
|
||||
return this.neko.prepare();
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import { RufflePlayer } from "../../../impl/ruffle";
|
||||
import { FlashRunner } from "./flash";
|
||||
|
||||
export class RuffleRunner extends FlashRunner {
|
||||
constructor(config: Config, debug: boolean) {
|
||||
constructor(config: Config, debug?: boolean) {
|
||||
super(config, debug, RufflePlayer);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ import run from "../../../run";
|
||||
import { Runner } from "../../core/runner";
|
||||
|
||||
export class WindowsRunner extends Runner {
|
||||
constructor(config: Config, debug: boolean) {
|
||||
constructor(config: Config, debug?: boolean) {
|
||||
super(config, Platform.WINDOWS, debug);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,77 +1,2 @@
|
||||
import gulp from "gulp";
|
||||
import type { Task, TaskFunction } from "undertaker";
|
||||
import { Platform, type Config } 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 "./impl";
|
||||
|
||||
export class Project {
|
||||
public config: Config;
|
||||
|
||||
constructor(config: Config) {
|
||||
this.config = config;
|
||||
}
|
||||
|
||||
hasLib(name: string): boolean {
|
||||
for (const lib of this.config.libs) {
|
||||
if (lib.name === name) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
build(platform: Platform, debug: boolean = false): Task[] {
|
||||
const builder = Builder.new(this.config, platform, this.config.buildSystem, debug);
|
||||
const tasks: Task[] = [builder.prepare.bind(builder)];
|
||||
tasks.push(builder.call.bind(builder));
|
||||
return tasks;
|
||||
}
|
||||
|
||||
run(platform: Platform, debug: boolean = false): Task[] {
|
||||
const runner = Runner.new(this.config, platform, debug);
|
||||
return [runner.prepare.bind(runner), runner.call.bind(runner)];
|
||||
}
|
||||
|
||||
test(platform: Platform, debug: boolean = true): Task[] {
|
||||
return this.build(platform, debug).concat(this.run(platform, debug));
|
||||
}
|
||||
|
||||
pack(platform: Platform, 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.config.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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
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;
|
||||
@@ -0,0 +1,9 @@
|
||||
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];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
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]), []),
|
||||
),
|
||||
);
|
||||
},
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
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];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
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,
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
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()),
|
||||
),
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
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;
|
||||
@@ -0,0 +1,15 @@
|
||||
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));
|
||||
}
|
||||
};
|
||||
@@ -1,11 +1,16 @@
|
||||
<% sources.forEach(function(item) { %>
|
||||
-cp "<%=item%>"<% }); %>
|
||||
-cp "<%=item%>"
|
||||
<% }); %>
|
||||
<% libs.forEach(function(item) { %>
|
||||
-lib <%=item.name%>:<%=item.version.split('@').shift()%><% }); %>
|
||||
-lib <%=item.name%>:<%=item.version.split('@').shift()%>
|
||||
|
||||
<% }); %>
|
||||
<% macros.forEach(function(item) { %>
|
||||
--macro "<%=item%>"<% }); %>
|
||||
--macro "<%=item%>"
|
||||
<% }); %>
|
||||
<% flags.forEach(function(item) { %>
|
||||
-D <%=item%><% }); %>
|
||||
-D <%=item%>
|
||||
<% }); %>
|
||||
|
||||
-main <%=main%>
|
||||
|
||||
|
||||
+9
-13
@@ -5,18 +5,14 @@ import { join } from "node:path";
|
||||
import test from "node:test";
|
||||
import { download } from "../dist/lib/index.mjs";
|
||||
|
||||
const resolveTargetDir = () => mkdtempSync(join(tmpdir(), "test-"));
|
||||
|
||||
const TEST_DATA = {
|
||||
"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",
|
||||
};
|
||||
|
||||
for (const [url, file] of Object.entries(TEST_DATA)) {
|
||||
test(`Test download: ${url}`, async () => {
|
||||
const target = resolveTargetDir();
|
||||
const testUrl = async (url, file) => {
|
||||
const target = mkdtempSync(join(tmpdir(), "test-"));
|
||||
await download(url, target);
|
||||
assert(existsSync(join(target, file)));
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
test("zip", async () => await testUrl("https://home.shmyga.ru/public/sdk/haxe/haxe-4.2.5-win.zip", "haxe.exe"));
|
||||
|
||||
test("tar.gz", async () => await testUrl("https://home.shmyga.ru/public/sdk/haxe/haxe-4.2.5-linux64.tar.gz", "haxe"));
|
||||
|
||||
test("plain", async () => await testUrl("https://home.shmyga.ru/public/test.txt", "test.txt"));
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
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"],
|
||||
]));
|
||||
Reference in New Issue
Block a user