From: Kevin Day <thekevinday@gmail.com>
Date: Sat, 5 Sep 2020 01:58:08 +0000 (-0500)
Subject: Bugfix: fake settings parameter is ignored.
X-Git-Tag: 0.5.0~26
X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=d1430fece0610cb0ac67a0dcfa1922ecac733313;p=fll

Bugfix: fake settings parameter is ignored.

The default value is always being used.
Change the behavior to use the loaded settings that was processed based off of the parameter -s/--settings instead.
---

diff --git a/level_3/fake/c/fake.c b/level_3/fake/c/fake.c
index c33cb61..6263cc0 100644
--- a/level_3/fake/c/fake.c
+++ b/level_3/fake/c/fake.c
@@ -27,7 +27,7 @@ extern "C" {
     fll_program_print_help_option(context, fake_short_define, fake_long_define, f_console_symbol_short_enable, f_console_symbol_long_enable, "  Override defines from settings file with this define.");
     fll_program_print_help_option(context, fake_short_mode, fake_long_mode, f_console_symbol_short_enable, f_console_symbol_long_enable, "    Use this mode when processing the build settings.");
     fll_program_print_help_option(context, fake_short_process, fake_long_process, f_console_symbol_short_enable, f_console_symbol_long_enable, " Process name for storing build states.");
-    fll_program_print_help_option(context, fake_short_settings, fake_long_settings, f_console_symbol_short_enable, f_console_symbol_long_enable, "Use this settings file, from within the source settings directory.");
+    fll_program_print_help_option(context, fake_short_settings, fake_long_settings, f_console_symbol_short_enable, f_console_symbol_long_enable, "Use this settings file, from within the data build directory.");
 
     printf("%c", f_string_eol[0]);
 
diff --git a/level_3/fake/c/private-fake.c b/level_3/fake/c/private-fake.c
index 5e50501..cfe6e3c 100644
--- a/level_3/fake/c/private-fake.c
+++ b/level_3/fake/c/private-fake.c
@@ -295,7 +295,7 @@ extern "C" {
         fake_file_defines,
         fake_file_dependencies,
         fake_file_fakefile,
-        fake_file_settings,
+        data->settings.string,
         fake_file_readme,
       };
 
@@ -309,7 +309,7 @@ extern "C" {
         fake_file_defines_length,
         fake_file_dependencies_length,
         fake_file_fakefile_length,
-        fake_file_settings_length,
+        data->settings.used,
         fake_file_readme_length,
       };
 
diff --git a/level_3/fake/data/build/settings-example-bzip2 b/level_3/fake/data/build/settings-example-bzip2
index a1beb2a..92ff391 100644
--- a/level_3/fake/data/build/settings-example-bzip2
+++ b/level_3/fake/data/build/settings-example-bzip2
@@ -5,7 +5,6 @@
 # 2) need to provide a way to designate path prefixes (instead of just hardcoded sources/c/, etc...
 # 3) need to be able to build shared program without library (add a 'build_library' setting).
 # 4) need to remove the auto-appending of the -D in the defines.
-# 5) the -s/--settings does not appear to be working correctly, confirm this.
 
 project_name bzip2
 
diff --git a/level_3/fake/data/build/settings-example-bzip2recover b/level_3/fake/data/build/settings-example-bzip2recover
index 5ac911d..97914c0 100644
--- a/level_3/fake/data/build/settings-example-bzip2recover
+++ b/level_3/fake/data/build/settings-example-bzip2recover
@@ -5,7 +5,6 @@
 # 2) need to provide a way to designate path prefixes (instead of just hardcoded sources/c/, etc...
 # 3) need to be able to build shared program without library (add a 'build_library' setting).
 # 4) need to remove the auto-appending of the -D in the defines.
-# 5) the -s/--settings does not appear to be working correctly, confirm this.
 
 project_name bzip2recover