gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improved the Command Line Util

Browse Source
This commit is contained in:
NeeEoo
2024-04-10 15:57:19 +02:00
parent c8ef7ef967
commit 4ef43dfbec
8 changed files with 210 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/linux.yml
+1 -1
View File
@@ -31,7 +31,7 @@ jobs:
sudo apt-get install libvlc-dev libvlccore-dev
- name: Installing/Updating libraries
run: |
haxe -cp commandline -D analyzer-optimize --run Main setup
haxe -cp commandline -D analyzer-optimize --run Main setup -s
- name: Building the game
run: |
haxelib run lime build linux
.github/workflows/macos.yml
+1 -1
View File
@@ -28,7 +28,7 @@ jobs:
cache-build-mac
- name: Installing/Updating libraries
run: |
haxe -cp commandline -D analyzer-optimize --run Main setup
haxe -cp commandline -D analyzer-optimize --run Main setup -s
- name: Building the game
run: |
haxelib run lime build mac
.github/workflows/windows.yml
+1 -1
View File
@@ -28,7 +28,7 @@ jobs:
cache-build-windows
- name: Installing/Updating libraries
run: |
haxe -cp commandline -D analyzer-optimize --run Main setup
haxe -cp commandline -D analyzer-optimize --run Main setup -s --no-vscheck
- name: Building the game
run: |
haxelib run lime build windows
commandline/ArgParser.hx
+81
View File
@@ -0,0 +1,81 @@
package;
using StringTools;
class ArgParser {
public static function parse(args:Array<String>, ?renameMap:Map<String, String> = null):ArgParser {
return new ArgParser(args, renameMap);
}
private function new(args:Array<String>, ?renameMap:Map<String, String>) {
if (renameMap == null) {
renameMap = new Map();
}
function rename(name:String) {
return renameMap.exists(name) ? renameMap.get(name) : name;
}
this.args = args;
this.options = new Map();
var copy = args.copy();
var i = 0;
while(copy.length > 0) {
var arg = copy.shift();
// this parses the -NAME=VALUE
if (arg.startsWith("-")) {
var key = arg.substr(1);
var isLongKey = key.startsWith("-");
if (isLongKey) {
key = key.substr(1);
}
var split = key.split("=");
var longName = split.shift();
if(!isLongKey) {
// Allow -ABC to be parsed as -A -B -C
// Values will only work for the last one
while(longName.length > 1) {
var name = rename(longName.charAt(0));
options.set(name, null);
longName = longName.substr(1);
}
longName = longName.charAt(0);
// Parse the last option with value support
}
var name = rename(longName);
var value = (split.length > 0) ? split.join("=") : null;
options.set(name, value);
args.splice(i, 1);
i--;
}
i++;
}
}
/**
* Options are arguments that start with a "-", if they are followed by an "=" they are a key/value pair.
* otherwise they are stored as a key with an null value.
**/
public var options(default, null):Map<String, String>;
public var args(default, null):Array<String>;
public var length(get, never):Int;
inline function get_length():Int {
return args.length;
}
public function get(index:Int):String {
return args[index];
}
public function existsOption(name:String):Bool {
return options.exists(name);
}
public function getOption(name:String):String {
return options.get(name);
}
}
commandline/Main.hx
+76 -21
View File
@@ -5,57 +5,108 @@ import commands.*;
class Main {
public static var commands:Array<Command> = [];
public static var curCommand:Command;
public static function initCommands() {
commands = [
{
names: ["setup"],
doc: "Setups (or updates) all libraries required for the engine.",
func: Update.main,
dDoc: "This command runs through all libraries in libs.xml, and install them.\nIf they're already installed, they will be updated."
dDoc: [
"Usage: setup",
"",
"This command runs through all libraries in libs.xml, and install them.",
"If they're already installed, they will be updated.",
"",
"--all : Reinstall all libraries.",
"--no-vscheck : Don't check if Visual Studio is installed.",
"-s | --silent | --silent-progress : Don't show download progress."
].join("\n")
},
{
names: ["help", null],
doc: "Shows help. Pass a command name to get additional help.",
func: help,
dDoc: "Usage: help <cmd>\n\nFor example, use \"cne help test\" to get additional help on the test command."
dDoc: [
"Usage: help <cmd>",
"",
"For example, use \"cne help test\" to get additional help on the test command."
].join("\n")
},
{
names: ["test"],
doc: "Creates a non final test build, then runs it.",
func: Compiler.test,
dDoc: "Usage: test <optional args>\n" +
"\nThis will create a quick debug build binded to the source then run it, which means:" +
"\n- The assets WON'T be copied over - Assets will be read from the game's source." +
"\n- This build WON'T be ready for release - Running anywhere else than in the bin folder will result in a crash from missing assets" +
"\n- This build will also use the mods folder from the source directory." +
"\n\nIf you want a full build which contains all assets, run \"cne release\" or \"cne test-release\"" +
"\nAdditional arguments will be sent to the lime compiler."
dDoc: [
"Usage: test <optional args>",
"",
"This will create a quick debug build binded to the source then run it, which means:",
"- The assets WON'T be copied over - Assets will be read from the game's source.",
"- This build WON'T be ready for release - Running anywhere else than in the bin folder will result in a crash from missing assets",
"- This build will also use the mods folder from the source directory.",
"",
"If you want a full build which contains all assets, run \"cne release\" or \"cne test-release\"",
"Additional arguments will be sent to the lime compiler.",
"",
"-debug : Builds a debug build."
].join("\n")
},
{
names: ["build"],
doc: "Creates a non final test build, without running it.",
func: Compiler.build,
dDoc: "Usage: build <optional arguments>\n" +
"\nThis will create a quick debug build binded to the source then run it, which means:" +
"\n- The assets WON'T be copied over - Assets will be read from the game's source." +
"\n- This build WON'T be ready for release - Running anywhere else than in the bin folder will result in a crash from missing assets" +
"\n- This build will also use the mods folder from the source directory." +
"\n\nIf you want a full build which contains all assets, run \"cne release\" or \"cne test-release\"" +
"\nAdditional arguments will be sent to the lime compiler."
dDoc: [
"Usage: build <optional arguments>",
"",
"This will create a quick debug build binded to the source then run it, which means:",
"- The assets WON'T be copied over - Assets will be read from the game's source.",
"- This build WON'T be ready for release - Running anywhere else than in the bin folder will result in a crash from missing assets",
"- This build will also use the mods folder from the source directory.",
"",
"If you want a full build which contains all assets, run \"cne release\" or \"cne test-release\"",
"Additional arguments will be sent to the lime compiler.",
"",
"-debug : Builds a debug build."
].join("\n")
},
{
names: ["release"],
doc: "Creates a final non debug build, containing all assets.",
func: Compiler.release,
dDoc: "Usage: release <optional arguments>\n" +
"\nThis will create a final ready-for-release build, which means this build will be able to be release on websites such as GameBanana without worrying about source-dependant stuff."
dDoc: [
"Usage: release <optional arguments>",
"",
"This will create and run a final ready-for-release build,",
"which means this build will be able to be release on websites such as GameBanana without worrying about source-dependant stuff.",
"Additional arguments will be sent to the lime compiler."
].join("\n")
},
{
names: ["test-release"],
doc: "Creates a final non debug build, containing all assets.",
func: Compiler.testRelease,
dDoc: "Usage: release <optional arguments>\n" +
"\nThis will create and run a final ready-for-release build, which means this build will be able to be release on websites such as GameBanana without worrying about source-dependant stuff."
dDoc: [
"Usage: test-release <optional arguments>",
"",
"This will create and run a final ready-for-release build,",
"which means this build will be able to be release on websites such as GameBanana without worrying about source-dependant stuff.",
"Additional arguments will be sent to the lime compiler."
].join("\n")
},
{
names: ["optimize"],
doc: "Optimizes a JSON file.",
func: Optimizer.main,
dDoc: [
"Usage: optimize <optional arguments>",
"",
"This will optimize a JSON file, which means it will remove all unnecessary spacing from the file.",
"WARNING: Order might be lost.",
"WARNING: Comments arent supported.",
"",
"-O | --no-old : No Old file will be created.",
].join("\n")
}
];
}
@@ -66,8 +117,12 @@ class Main {
var commandName = args.shift();
if (commandName != null)
commandName = commandName.toLowerCase();
else
commandName = "help";
for(c in commands) {
if (c.names.contains(commandName)) {
curCommand = c;
c.func(args);
return;
}
@@ -90,7 +145,7 @@ class Main {
return;
}
Sys.println('${matchingCommand.names.join(", ")}');
Sys.println('Command: ${matchingCommand.names.filter(v->v != null).join(", ")}');
Sys.println("---");
Sys.println(matchingCommand.dDoc);
commandline/commands/Compiler.hx
+2 -2
View File
@@ -2,10 +2,10 @@ package commands;
class Compiler {
public static function test(args:Array<String>) {
__build(args, ["test", getBuildTarget(), "-D", "TEST_BUILD"]);
__build(args, ["test", getBuildTarget(), "-DTEST_BUILD"]);
}
public static function build(args:Array<String>) {
__build(args, ["build", getBuildTarget(), "-D", "TEST_BUILD"]);
__build(args, ["build", getBuildTarget(), "-DTEST_BUILD"]);
}
public static function release(args:Array<String>) {
__build(args, ["build", getBuildTarget()]);
commandline/commands/Optimizer.hx
+31
View File
@@ -0,0 +1,31 @@
package commands;
import sys.io.File;
class Optimizer {
public static function main(args:Array<String>) {
var args = ArgParser.parse(args);
var saveOld = args.existsOption("no-old");
if(args.length == 0) {
Sys.println(Main.curCommand.dDoc);
return;
}
var filename = args.get(0);
var data = File.getContent(filename);
var json = null;
try {
json = haxe.Json.parse(data);
} catch(e:Dynamic) {
Sys.println("Error parsing JSON file.");
Sys.println(e);
return;
}
if(saveOld)
File.saveContent(filename + ".old", data);
File.saveContent(filename, haxe.Json.stringify(json));
}
}
commandline/commands/Update.hx
+17 -3
View File
@@ -10,10 +10,20 @@ class Update {
public static function main(args:Array<String>) {
prettyPrint("Preparing installation...");
var args = ArgParser.parse(args, ["S" => "silent-progress", "silent" => "silent-progress"]);
var CHECK_VSTUDIO = !args.existsOption("no-vscheck");
var REINSTALL_ALL = args.existsOption("all");
var SILENT = args.existsOption("silent-progress");
// to prevent messing with currently installed libs
if (!FileSystem.exists('.haxelib'))
FileSystem.createDirectory('.haxelib');
if (REINSTALL_ALL) {
FileSystem.deleteDirectory('.haxelib');
FileSystem.createDirectory('.haxelib');
}
var libs:Array<Library> = [];
var libsXML:Access = new Access(Xml.parse(File.getContent('./libs.xml')).firstElement());
@@ -33,15 +43,19 @@ class Update {
libs.push(lib);
}
var commandSuffix = " --always";
if (SILENT) commandSuffix += " --silent";
for(lib in libs) {
var globalism:Null<String> = lib.global == "true" ? "--global" : null;
var globalSuffix = globalism != null ? ' $globalism' : '';
switch(lib.type) {
case "lib":
prettyPrint((lib.global == "true" ? "Globally installing" : "Locally installing") + ' "${lib.name}"...');
Sys.command('haxelib install ${lib.name} ${lib.version != null ? " " + lib.version : " "}${globalism != null ? ' $globalism' : ''} --always');
Sys.command('haxelib install ${lib.name} ${lib.version != null ? " " + lib.version : " "}$globalSuffix$commandSuffix');
case "git":
prettyPrint((lib.global == "true" ? "Globally installing" : "Locally installing") + ' "${lib.name}" from git url "${lib.url}"');
Sys.command('haxelib git ${lib.name} ${lib.url}${lib.ref != null ? ' ${lib.ref}' : ''}${globalism != null ? ' $globalism' : ''} --always');
Sys.command('haxelib git ${lib.name} ${lib.url}${lib.ref != null ? ' ${lib.ref}' : ''}$globalSuffix$commandSuffix');
default:
prettyPrint('Cannot resolve library of type "${lib.type}"');
}
@@ -73,7 +87,7 @@ class Update {
}
// vswhere.exe its used to find any visual studio related installations on the system, including full visual studio ide installations, visual studio build tools installations, and other related components - Nex
if (Compiler.getBuildTarget().toLowerCase() == "windows" && new Process('"C:/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -property catalog_productDisplayVersion').exitCode(true) == 1) {
if (CHECK_VSTUDIO && Compiler.getBuildTarget().toLowerCase() == "windows" && new Process('"C:/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -property catalog_productDisplayVersion').exitCode(true) == 1) {
prettyPrint("Installing Microsoft Visual Studio Community (Dependency)");
// thanks to @crowplexus for these two lines! - Nex