Dark-Horse-Linux/dpm-core
1
0
Fork 0
Code Pull Requests Releases Activity

implemented better options availability for build stage

Browse Source
This commit is contained in:
Chris Punches
2025-03-14 02:50:24 -04:00
parent 2cd350c910
commit 558d9d2738
3 changed files with 65 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
modules/build/src/cli_parsers.cpp
View File

@@ -16,6 +16,8 @@ int parse_create_options(int argc, char** argv, BuildOptions& options) {
bool hooks_dir_provided = false;
bool package_name_provided = false;
bool package_version_provided = false;
bool architecture_provided = false;
bool os_provided = false;
bool force_provided = false;
bool verbose_provided = false;
bool help_provided = false;
@@ -54,6 +56,12 @@ int parse_create_options(int argc, char** argv, BuildOptions& options) {
} else if (option == "--version") {
options.package_version = value;
package_version_provided = true;
} else if (option == "--architecture") {
options.architecture = value;
architecture_provided = true;
} else if (option == "--os") {
options.os = value;
os_provided = true;
} else if (option == "--force") {
// Parse the boolean value
options.force = (value == "true" || value == "1" || value == "yes");
@@ -79,6 +87,8 @@ int parse_create_options(int argc, char** argv, BuildOptions& options) {
{"hooks", required_argument, 0, 'H'},
{"name", required_argument, 0, 'n'},
{"version", required_argument, 0, 'V'},
{"architecture", required_argument, 0, 'a'},
{"os", required_argument, 0, 'O'},
{"force", no_argument, 0, 'f'},
{"verbose", no_argument, 0, 'v'},
{"help", no_argument, 0, 'h'},
@@ -93,7 +103,7 @@ int parse_create_options(int argc, char** argv, BuildOptions& options) {
int opt;
int option_index = 0;
while ((opt = getopt_long(argc, argv, "o:c:H:n:V:fvh", long_options, &option_index)) != -1) {
while ((opt = getopt_long(argc, argv, "o:c:H:n:V:a:O:fvh", long_options, &option_index)) != -1) {
switch (opt) {
case 'o':
options.output_dir = optarg;
@@ -115,6 +125,14 @@ int parse_create_options(int argc, char** argv, BuildOptions& options) {
options.package_version = optarg;
package_version_provided = true;
break;
case 'a':
options.architecture = optarg;
architecture_provided = true;
break;
case 'O':
options.os = optarg;
os_provided = true;
break;
case 'f':
options.force = true;
force_provided = true;
@@ -177,6 +195,16 @@ int parse_create_options(int argc, char** argv, BuildOptions& options) {
any_options_provided = true;
}
if (architecture_provided) {
dpm_log(LOG_DEBUG, (" architecture=" + options.architecture).c_str());
any_options_provided = true;
}
if (os_provided) {
dpm_log(LOG_DEBUG, (" os=" + options.os).c_str());
any_options_provided = true;
}
if (force_provided) {
dpm_log(LOG_DEBUG, (" force=" + std::string(options.force ? "true" : "false")).c_str());
any_options_provided = true;
@@ -249,6 +277,12 @@ int validate_build_options(const BuildOptions& options) {
return 1;
}
// Check if architecture is provided
if (options.architecture.empty()) {
dpm_log(LOG_ERROR, "Architecture is required (--architecture)");
return 1;
}
// Check if hooks directory exists if provided
if (!options.hooks_dir.empty() && !std::filesystem::exists(options.hooks_dir)) {
dpm_log(LOG_ERROR, ("Hooks directory does not exist: " + options.hooks_dir).c_str());