From 66817a06dec737d29f9aed357f75ec64bf895a35 Mon Sep 17 00:00:00 2001 From: Timur Date: Mon, 23 Oct 2023 19:33:03 +1000 Subject: [PATCH 1/3] Determine if app is run by haxelib instead of assuming it always is --- src/massive/sys/cmd/CommandLineRunner.hx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/massive/sys/cmd/CommandLineRunner.hx b/src/massive/sys/cmd/CommandLineRunner.hx index 82d8b47..57c8d5b 100644 --- a/src/massive/sys/cmd/CommandLineRunner.hx +++ b/src/massive/sys/cmd/CommandLineRunner.hx @@ -60,7 +60,8 @@ class CommandLineRunner private function createConsole():Console { - return new Console(true); + var isHaxelibRun = Sys.getEnv('HAXELIB_RUN') != null; + return new Console(isHaxelibRun); } private function set_console(value:Console):Console From 65a52c1c6934a4842481333c79cd1776da67cd88 Mon Sep 17 00:00:00 2001 From: T1mL3arn Date: Mon, 23 Oct 2023 20:35:02 +1000 Subject: [PATCH 2/3] fix setter --- src/massive/sys/haxelib/Haxelib.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/massive/sys/haxelib/Haxelib.hx b/src/massive/sys/haxelib/Haxelib.hx index 2c5ef53..cf61ec9 100644 --- a/src/massive/sys/haxelib/Haxelib.hx +++ b/src/massive/sys/haxelib/Haxelib.hx @@ -46,7 +46,7 @@ class Haxelib public static inline var PATCH:String = "patch"; public static inline var BUILD:String = "build"; - public var file(default, set_file):File; + public var file(default, set):File; public var name(default, set):String; public var url:String; From 6b2984688683d64a6bca7e16393c3a0c3994bf77 Mon Sep 17 00:00:00 2001 From: T1mL3arn Date: Mon, 23 Oct 2023 20:35:23 +1000 Subject: [PATCH 3/3] fix app main() signature --- src/massive/mlib/Mlib.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/massive/mlib/Mlib.hx b/src/massive/mlib/Mlib.hx index 5bdd1ad..3d3571c 100644 --- a/src/massive/mlib/Mlib.hx +++ b/src/massive/mlib/Mlib.hx @@ -49,7 +49,7 @@ import massive.mlib.cmd.PreProcessHxmlCommand; class Mlib extends CommandLineRunner { - static public function main():Mlib{return new Mlib();} + static public function main():Void{ new Mlib(); } private var settings:MlibSettings; private var haxelib:Haxelib;