feat: add version command line arg to all executables

This commit is contained in:
Jan
2024-01-23 23:14:09 +01:00
parent 7919683748
commit 05437cfd7d
12 changed files with 136 additions and 17 deletions

View File

@ -64,9 +64,13 @@ public:
int Run(const int argc, const char** argv)
{
if (!m_args.Parse(argc, argv))
auto shouldContinue = true;
if (!m_args.ParseArgs(argc, argv, shouldContinue))
return 1;
if (!shouldContinue)
return 0;
if (!ReadHeaderData() || !ReadCommandsData())
return 1;

View File

@ -1,5 +1,6 @@
#include "ZoneCodeGeneratorArguments.h"
#include "GitVersion.h"
#include "Utils/Arguments/CommandLineOption.h"
#include "Utils/Arguments/UsageInformation.h"
@ -9,6 +10,9 @@
const CommandLineOption* const OPTION_HELP =
CommandLineOption::Builder::Create().WithShortName("?").WithLongName("help").WithDescription("Displays usage information.").Build();
const CommandLineOption* const OPTION_VERSION =
CommandLineOption::Builder::Create().WithLongName("version").WithDescription("Prints the application version.").Build();
const CommandLineOption* const OPTION_VERBOSE =
CommandLineOption::Builder::Create().WithShortName("v").WithLongName("verbose").WithDescription("Outputs a lot more and more detailed messages.").Build();
@ -70,7 +74,15 @@ const CommandLineOption* const OPTION_GENERATE =
.Build();
const CommandLineOption* const COMMAND_LINE_OPTIONS[]{
OPTION_HELP, OPTION_VERBOSE, OPTION_HEADER, OPTION_COMMANDS_FILE, OPTION_OUTPUT_FOLDER, OPTION_PRINT, OPTION_GENERATE};
OPTION_HELP,
OPTION_VERSION,
OPTION_VERBOSE,
OPTION_HEADER,
OPTION_COMMANDS_FILE,
OPTION_OUTPUT_FOLDER,
OPTION_PRINT,
OPTION_GENERATE,
};
ZoneCodeGeneratorArguments::GenerationTask::GenerationTask()
: m_all_assets(false)
@ -91,7 +103,7 @@ ZoneCodeGeneratorArguments::GenerationTask::GenerationTask(std::string assetName
}
ZoneCodeGeneratorArguments::ZoneCodeGeneratorArguments()
: m_argument_parser(COMMAND_LINE_OPTIONS, std::extent<decltype(COMMAND_LINE_OPTIONS)>::value),
: m_argument_parser(COMMAND_LINE_OPTIONS, std::extent_v<decltype(COMMAND_LINE_OPTIONS)>),
m_task_flags(0)
{
m_verbose = false;
@ -109,8 +121,14 @@ void ZoneCodeGeneratorArguments::PrintUsage()
usage.Print();
}
bool ZoneCodeGeneratorArguments::Parse(const int argc, const char** argv)
void ZoneCodeGeneratorArguments::PrintVersion()
{
std::cout << "OpenAssetTools ZoneCodeGenerator " << std::string(GIT_VERSION) << "\n";
}
bool ZoneCodeGeneratorArguments::ParseArgs(const int argc, const char** argv, bool& shouldContinue)
{
shouldContinue = true;
if (!m_argument_parser.ParseArguments(argc - 1, &argv[1]))
{
PrintUsage();
@ -124,6 +142,14 @@ bool ZoneCodeGeneratorArguments::Parse(const int argc, const char** argv)
return false;
}
// Check if the user wants to see the version
if (m_argument_parser.IsOptionSpecified(OPTION_VERSION))
{
PrintVersion();
shouldContinue = false;
return true;
}
// -v; --verbose
m_verbose = m_argument_parser.IsOptionSpecified(OPTION_VERBOSE);

View File

@ -13,6 +13,7 @@ class ZoneCodeGeneratorArguments
* \brief Prints a command line usage help text for the Unlinker tool to stdout.
*/
static void PrintUsage();
static void PrintVersion();
public:
static constexpr unsigned FLAG_TASK_GENERATE = 1 << 0;
@ -40,8 +41,7 @@ public:
std::vector<GenerationTask> m_generation_tasks;
ZoneCodeGeneratorArguments();
bool Parse(int argc, const char** argv);
bool ParseArgs(int argc, const char** argv, bool& shouldContinue);
_NODISCARD bool ShouldGenerate() const;
_NODISCARD bool ShouldPrint() const;