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 c33cb6146562b6fd8b942be3aefbed4ff12d62a2..6263cc010e46c8704ab0fa61194fd0697bf9ac1e 100644 (file)
--- 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 5e50501545d122a32fd3c4d6b5f5722182aa7959..cfe6e3c376ebd1ac5096604653a2272d85a440d2 100644 (file)
--- 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 a1beb2a1a72e698a7cef9857de1b2cd3ee24d73c..92ff391812c75fae3856d724f692a7591bf0b266 100644 (file)
--- 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 5ac911dd6ad6d465684e47434cd5910b948541a9..97914c06c855fe4b4d4281f4f0c942445e863711 100644 (file)
--- 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