From 9097ab8008b5d90ea17f8b12eddbcc7b5b64fa4b Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 13 Feb 2022 23:34:15 -0600 Subject: [PATCH] Refactor: path_standard to has_path_standard. Just like with the preserve_path_headers, change path_standard to has_path_standard. This hopefully makes the terminology easier to understand by maintaining that all path_* Objects represent paths. The commit changing path_headers_preserve to preserve_path_headers could have made more changes. Further update preserve_path_headers to handle what was missed. --- build/level_0/settings | 5 +- build/level_1/settings | 5 +- build/level_2/settings | 5 +- build/monolithic/settings | 5 +- build/scripts/bootstrap.sh | 82 +++++++++++----------- level_0/f_account/data/build/settings | 5 +- level_0/f_account/data/build/settings-mocks | 5 +- level_0/f_account/data/build/settings-tests | 5 +- level_0/f_capability/data/build/settings | 5 +- level_0/f_capability/data/build/settings-mocks | 5 +- level_0/f_capability/data/build/settings-tests | 5 +- level_0/f_color/data/build/settings | 5 +- level_0/f_color/data/build/settings-mocks | 5 +- level_0/f_color/data/build/settings-tests | 5 +- level_0/f_console/data/build/settings | 5 +- level_0/f_console/data/build/settings-tests | 5 +- level_0/f_control_group/data/build/settings | 5 +- level_0/f_control_group/data/build/settings-tests | 5 +- level_0/f_conversion/data/build/settings | 5 +- level_0/f_conversion/data/build/settings-mocks | 5 +- level_0/f_conversion/data/build/settings-tests | 5 +- level_0/f_directory/data/build/settings | 5 +- level_0/f_environment/data/build/settings | 5 +- level_0/f_execute/data/build/settings | 5 +- level_0/f_file/data/build/settings | 5 +- level_0/f_fss/data/build/settings | 5 +- level_0/f_iki/data/build/settings | 5 +- level_0/f_limit/data/build/settings | 5 +- level_0/f_memory/data/build/settings | 5 +- level_0/f_memory/data/build/settings-tests | 5 +- level_0/f_path/data/build/settings | 5 +- level_0/f_pipe/data/build/settings | 5 +- level_0/f_print/data/build/settings | 5 +- level_0/f_serialize/data/build/settings | 5 +- level_0/f_signal/data/build/settings | 5 +- level_0/f_socket/data/build/settings | 5 +- level_0/f_status/data/build/settings | 5 +- level_0/f_status_string/data/build/settings | 5 +- level_0/f_string/data/build/settings | 5 +- level_0/f_thread/data/build/settings | 5 +- level_0/f_type/data/build/settings | 5 +- level_0/f_type_array/data/build/settings | 5 +- level_0/f_type_array/data/build/settings-tests | 5 +- level_0/f_utf/data/build/settings | 5 +- level_1/fl_control_group/data/build/settings | 5 +- level_1/fl_conversion/data/build/settings | 5 +- level_1/fl_directory/data/build/settings | 5 +- level_1/fl_environment/data/build/settings | 5 +- level_1/fl_execute/data/build/settings | 5 +- level_1/fl_fss/data/build/settings | 5 +- level_1/fl_iki/data/build/settings | 5 +- level_1/fl_print/data/build/settings | 5 +- level_1/fl_signal/data/build/settings | 5 +- level_1/fl_string/data/build/settings | 5 +- level_1/fl_utf/data/build/settings | 5 +- level_1/fl_utf_file/data/build/settings | 5 +- level_2/fll_control_group/data/build/settings | 5 +- level_2/fll_error/data/build/settings | 5 +- level_2/fll_execute/data/build/settings | 5 +- level_2/fll_file/data/build/settings | 5 +- level_2/fll_fss/data/build/settings | 5 +- level_2/fll_fss_status_string/data/build/settings | 5 +- level_2/fll_iki/data/build/settings | 5 +- level_2/fll_path/data/build/settings | 5 +- level_2/fll_print/data/build/settings | 5 +- level_2/fll_program/data/build/settings | 5 +- level_2/fll_status_string/data/build/settings | 5 +- level_3/byte_dump/data/build/settings | 5 +- level_3/control/data/build/settings | 5 +- level_3/controller/data/build/settings | 5 +- level_3/fake/c/private-build-load.c | 50 ++++++------- level_3/fake/c/private-build-objects.c | 2 +- level_3/fake/c/private-build.c | 6 +- level_3/fake/c/private-common.c | 4 +- level_3/fake/c/private-common.h | 14 ++-- level_3/fake/c/private-make-operate.c | 4 +- level_3/fake/data/build/settings | 5 +- level_3/fake/documents/settings.txt | 14 ++-- level_3/fake/specifications/settings.txt | 2 +- level_3/firewall/data/build/settings | 5 +- level_3/fss_basic_list_read/data/build/settings | 5 +- level_3/fss_basic_list_write/data/build/settings | 5 +- level_3/fss_basic_read/data/build/settings | 5 +- level_3/fss_basic_write/data/build/settings | 5 +- level_3/fss_embedded_list_read/data/build/settings | 5 +- .../fss_embedded_list_write/data/build/settings | 5 +- level_3/fss_extended_list_read/data/build/settings | 5 +- .../fss_extended_list_write/data/build/settings | 5 +- level_3/fss_extended_read/data/build/settings | 5 +- level_3/fss_extended_write/data/build/settings | 5 +- level_3/fss_identify/data/build/settings | 5 +- level_3/fss_payload_read/data/build/settings | 5 +- level_3/fss_payload_write/data/build/settings | 5 +- level_3/fss_status_code/data/build/settings | 5 +- level_3/iki_read/data/build/settings | 5 +- level_3/iki_write/data/build/settings | 5 +- level_3/status_code/data/build/settings | 5 +- level_3/utf8/data/build/settings | 5 +- 98 files changed, 356 insertions(+), 267 deletions(-) diff --git a/build/level_0/settings b/build/level_0/settings index 8f50de3..ef3d170 100644 --- a/build/level_0/settings +++ b/build/level_0/settings @@ -52,7 +52,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -64,7 +63,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/build/level_1/settings b/build/level_1/settings index c4e1d77..f646521 100644 --- a/build/level_1/settings +++ b/build/level_1/settings @@ -52,7 +52,6 @@ build_shared yes build_static no path_headers fll/level_1 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -64,7 +63,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/build/level_2/settings b/build/level_2/settings index eb1981c..ddc28e6 100644 --- a/build/level_2/settings +++ b/build/level_2/settings @@ -52,7 +52,6 @@ build_shared yes build_static no path_headers fll/level_2 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -64,7 +63,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/build/monolithic/settings b/build/monolithic/settings index dd4c552..2d2b283 100644 --- a/build/monolithic/settings +++ b/build/monolithic/settings @@ -52,7 +52,6 @@ build_shared yes build_static no path_headers fll -preserve_path_headers yes path_library_script script path_library_shared shared path_library_static static @@ -64,7 +63,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers yes search_exclusive yes search_shared yes diff --git a/build/scripts/bootstrap.sh b/build/scripts/bootstrap.sh index 553e707..c3079e2 100644 --- a/build/scripts/bootstrap.sh +++ b/build/scripts/bootstrap.sh @@ -491,22 +491,22 @@ bootstrap_id() { "flags_program_static") echo -n 53;; "flags_shared") echo -n 54;; "flags_static") echo -n 55;; - "modes") echo -n 56;; - "modes_default") echo -n 57;; - "path_headers") echo -n 58;; - "path_language") echo -n 59;; - "path_library_script") echo -n 60;; - "path_library_shared") echo -n 61;; - "path_library_static") echo -n 62;; - "path_object_script") echo -n 63;; - "path_object_shared") echo -n 64;; - "path_object_static") echo -n 65;; - "path_program_script") echo -n 66;; - "path_program_shared") echo -n 67;; - "path_program_static") echo -n 68;; - "path_sources") echo -n 69;; - "path_sources_object") echo -n 70;; - "path_standard") echo -n 71;; + "has_path_standard") echo -n 56;; + "modes") echo -n 57;; + "modes_default") echo -n 58;; + "path_headers") echo -n 59;; + "path_language") echo -n 60;; + "path_library_script") echo -n 61;; + "path_library_shared") echo -n 62;; + "path_library_static") echo -n 63;; + "path_object_script") echo -n 64;; + "path_object_shared") echo -n 65;; + "path_object_static") echo -n 66;; + "path_program_script") echo -n 67;; + "path_program_shared") echo -n 68;; + "path_program_static") echo -n 69;; + "path_sources") echo -n 70;; + "path_sources_object") echo -n 71;; "preserve_path_headers") echo -n 72;; "process_post") echo -n 73;; "process_pre") echo -n 74;; @@ -580,8 +580,8 @@ bootstrap_id() { "flags_program_static-$mode") echo -n 141;; "flags_shared-$mode") echo -n 142;; "flags_static-$mode") echo -n 143;; - "path_headers-$mode") echo -n 144;; - "preserve_path_headers-$mode") echo -n 145;; + "has_path_standard-$mode") echo -n 144;; + "path_headers-$mode") echo -n 145;; "path_language-$mode") echo -n 146;; "path_library_script-$mode") echo -n 147;; "path_library_shared-$mode") echo -n 148;; @@ -594,7 +594,7 @@ bootstrap_id() { "path_program_static-$mode") echo -n 155;; "path_sources-$mode") echo -n 156;; "path_sources_object-$mode") echo -n 157;; - "path_standard-$mode") echo -n 158;; + "preserve_path_headers-$mode") echo -n 158;; "process_post-$mode") echo -n 159;; "process_pre-$mode") echo -n 160;; "search_exclusive-$mode") echo -n 161;; @@ -611,18 +611,18 @@ bootstrap_id() { "version_nano_prefix-$mode") echo -n 172;; "version_target-$mode") echo -n 173;; - "has-path_library_script") echo -n 175;; - "has-path_library_shared") echo -n 176;; - "has-path_library_static") echo -n 177;; - "has-path_object_script") echo -n 178;; - "has-path_object_shared") echo -n 179;; - "has-path_object_static") echo -n 180;; - "has-path_program_script") echo -n 181;; - "has-path_program_shared") echo -n 182;; - "has-path_program_static") echo -n 183;; - "has-path_sources") echo -n 184;; - "has-path_sources_object") echo -n 185;; - "has-path_standard") echo -n 186;; + "has-has_path_standard") echo -n 175;; + "has-path_library_script") echo -n 176;; + "has-path_library_shared") echo -n 177;; + "has-path_library_static") echo -n 178;; + "has-path_object_script") echo -n 179;; + "has-path_object_shared") echo -n 180;; + "has-path_object_static") echo -n 181;; + "has-path_program_script") echo -n 182;; + "has-path_program_shared") echo -n 183;; + "has-path_program_static") echo -n 184;; + "has-path_sources") echo -n 185;; + "has-path_sources_object") echo -n 186;; "has-search_shared") echo -n 187;; "has-version_major_prefix") echo -n 188;; "has-version_micro_prefix") echo -n 189;; @@ -666,7 +666,7 @@ bootstrap_load_settings() { fi done - for i in environment flags flags_library flags_library_shared flags_library_static flags_object flags_object_shared flags_object_static flags_program flags_program_shared flags_program_static flags_shared flags_static modes modes_default path_headers path_language path_library_script path_library_shared path_library_static path_object_script path_object_shared path_object_static path_program_script path_program_shared path_program_static path_sources path_sources_object path_standard preserve_path_headers process_post process_pre search_exclusive search_shared search_static version_file version_major version_major_prefix version_micro version_micro_prefix version_minor version_minor_prefix version_nano version_nano_prefix version_target ; do + for i in environment flags flags_library flags_library_shared flags_library_static flags_object flags_object_shared flags_object_static flags_program flags_program_shared flags_program_static flags_shared flags_static has_path_standard modes modes_default path_headers path_language path_library_script path_library_shared path_library_static path_object_script path_object_shared path_object_static path_program_script path_program_shared path_program_static path_sources path_sources_object preserve_path_headers process_post process_pre search_exclusive search_shared search_static version_file version_major version_major_prefix version_micro version_micro_prefix version_minor version_minor_prefix version_nano version_nano_prefix version_target ; do key=$(bootstrap_id $i) if [[ $key == "" ]] ; then @@ -695,7 +695,7 @@ bootstrap_load_settings_mode() { fi done - for i in environment-$mode flags-$mode flags_library-$mode flags_library_shared-$mode flags_library_static-$mode flags_object-$mode flags_object_shared-$mode flags_object_static-$mode flags_program-$mode flags_program_shared-$mode flags_program_static-$mode flags_shared-$mode flags_static-$mode path_headers-$mode path_language-$mode path_library_script-$mode path_library_shared-$mode path_library_static-$mode path_object_script-$mode path_object_shared-$mode path_object_static-$mode path_program_script-$mode path_program_shared-$mode path_program_static-$mode path_sources-$mode path_sources_object-$mode path_standard-$mode preserve_path_headers-$mode process_post-$mode process_pre-$mode search_exclusive-$mode search_shared-$mode search_static-$mode version_file-$mode version_major-$mode version_major_prefix-$mode version_micro-$mode version_micro_prefix-$mode version_minor-$mode version_minor_prefix-$mode version_nano-$mode version_nano_prefix-$mode version_target-$mode ; do + for i in environment-$mode flags-$mode flags_library-$mode flags_library_shared-$mode flags_library_static-$mode flags_object-$mode flags_object_shared-$mode flags_object_static-$mode flags_program-$mode flags_program_shared-$mode flags_program_static-$mode flags_shared-$mode flags_static-$mode has_path_standard-$mode path_headers-$mode path_language-$mode path_library_script-$mode path_library_shared-$mode path_library_static-$mode path_object_script-$mode path_object_shared-$mode path_object_static-$mode path_program_script-$mode path_program_shared-$mode path_program_static-$mode path_sources-$mode path_sources_object-$mode preserve_path_headers-$mode process_post-$mode process_pre-$mode search_exclusive-$mode search_shared-$mode search_static-$mode version_file-$mode version_major-$mode version_major_prefix-$mode version_micro-$mode version_micro_prefix-$mode version_minor-$mode version_minor_prefix-$mode version_nano-$mode version_nano_prefix-$mode version_target-$mode ; do key=$(bootstrap_id $i) if [[ $key == "" ]] ; then @@ -711,7 +711,7 @@ bootstrap_load_settings_mode() { bootstrap_load_settings_has() { local i= - for i in build_compiler build_indexer build_shared-$mode path_library_script path_library_shared path_library_static path_object_script path_object_shared path_object_static path_program_script path_program_shared path_program_static path_sources path_sources_object path_standard search_shared version_major_prefix version_minor_prefix version_micro_prefix version_nano_prefix ; do + for i in build_compiler build_indexer build_shared has_path_standard path_library_script path_library_shared path_library_static path_object_script path_object_shared path_object_static path_program_script path_program_shared path_program_static path_sources path_sources_object search_shared version_major_prefix version_minor_prefix version_micro_prefix version_nano_prefix ; do if [[ $(grep -s -o "^[[:space:]]*$i\>" $settings_file | sed -e "s|^[[:space:]]*||") ]] ; then variables[$(bootstrap_id has-$i)]="yes" else @@ -719,7 +719,7 @@ bootstrap_load_settings_has() { fi done - for i in build_compiler-$mode build_indexer-$mode build_shared-$mode path_library_script-$mode path_library_shared-$mode path_library_static-$mode path_object_script-$mode path_object_shared-$mode path_object_static-$mode path_program_script-$mode path_program_shared-$mode path_program_static-$mode path_sources-$mode path_sources_object-$mode path_standard-$mode search_shared-$mode version_major_prefix-$mode version_minor_prefix-$mode version_micro_prefix-$mode version_nano_prefix-$mode ; do + for i in build_compiler-$mode build_indexer-$mode build_shared-$mode has_path_standard-$mode path_library_script-$mode path_library_shared-$mode path_library_static-$mode path_object_script-$mode path_object_shared-$mode path_object_static-$mode path_program_script-$mode path_program_shared-$mode path_program_static-$mode path_sources-$mode path_sources_object-$mode search_shared-$mode version_major_prefix-$mode version_minor_prefix-$mode version_micro_prefix-$mode version_nano_prefix-$mode ; do if [[ $(grep -s -o "^[[:space:]]*$i-$mode\>" $settings_file | sed -e "s|^[[:space:]]*||") ]] ; then variables[$(bootstrap_id has-$i)]="yes" else @@ -827,7 +827,7 @@ bootstrap_operation_build() { local path_program_script=${variables[$(bootstrap_id path_program_script)]} local path_program_shared=${variables[$(bootstrap_id path_program_shared)]} local path_program_static=${variables[$(bootstrap_id path_program_static)]} - local path_standard=${variables[$(bootstrap_id path_standard)]} + local has_path_standard=${variables[$(bootstrap_id has_path_standard)]} local search_exclusive=${variables[$(bootstrap_id search_exclusive)]} local search_shared=${variables[$(bootstrap_id search_shared)]} local search_static=${variables[$(bootstrap_id search_static)]} @@ -1263,8 +1263,8 @@ bootstrap_operation_build_prepare_defaults() { path_sources_object="sources/" fi - if [[ ${variables[$(bootstrap_id has-path_standard)]} != "yes" ]] ; then - path_standard="yes" + if [[ ${variables[$(bootstrap_id has-has_path_standard)]} != "yes" ]] ; then + has_path_standard="yes" fi if [[ ${variables[$(bootstrap_id has-search_shared)]} != "yes" ]] ; then @@ -1635,11 +1635,11 @@ bootstrap_operation_build_prepare_paths() { path_headers=$(echo $path_headers | sed -e 's|//*|/|g' -e 's|/*$|/|') fi - if [[ ${variables[$(bootstrap_id path_standard-$mode)]} != "" ]] ; then - path_standard=${variables[$(bootstrap_id path_standard-$mode)]} + if [[ ${variables[$(bootstrap_id has_path_standard-$mode)]} != "" ]] ; then + has_path_standard=${variables[$(bootstrap_id has_path_standard-$mode)]} fi - if [[ $path_standard == "no" ]] ; then + if [[ $has_path_standard == "no" ]] ; then path_language= else if [[ ${variables[$(bootstrap_id path_language-$mode)]} != "" ]] ; then diff --git a/level_0/f_account/data/build/settings b/level_0/f_account/data/build/settings index 8fa4917..90930ed 100644 --- a/level_0/f_account/data/build/settings +++ b/level_0/f_account/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_account/data/build/settings-mocks b/level_0/f_account/data/build/settings-mocks index 27f340e..ff84114 100644 --- a/level_0/f_account/data/build/settings-mocks +++ b/level_0/f_account/data/build/settings-mocks @@ -35,11 +35,12 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_account/data/build/settings-tests b/level_0/f_account/data/build/settings-tests index 23b02c0..79b63fe 100644 --- a/level_0/f_account/data/build/settings-tests +++ b/level_0/f_account/data/build/settings-tests @@ -25,9 +25,10 @@ build_shared yes build_static no path_headers tests/unit/c -preserve_path_headers no path_sources tests/unit/c -path_standard no + +has_path_standard no +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_capability/data/build/settings b/level_0/f_capability/data/build/settings index 7fffa01..42ad843 100644 --- a/level_0/f_capability/data/build/settings +++ b/level_0/f_capability/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_capability/data/build/settings-mocks b/level_0/f_capability/data/build/settings-mocks index 740d03b..a2770a6 100644 --- a/level_0/f_capability/data/build/settings-mocks +++ b/level_0/f_capability/data/build/settings-mocks @@ -42,13 +42,14 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_capability/data/build/settings-tests b/level_0/f_capability/data/build/settings-tests index c4e2cdb..bc97454 100644 --- a/level_0/f_capability/data/build/settings-tests +++ b/level_0/f_capability/data/build/settings-tests @@ -25,9 +25,10 @@ build_shared yes build_static no path_headers tests/unit/c -preserve_path_headers no path_sources tests/unit/c -path_standard no + +has_path_standard no +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_color/data/build/settings b/level_0/f_color/data/build/settings index 0c4b685..5508bfd 100644 --- a/level_0/f_color/data/build/settings +++ b/level_0/f_color/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_color/data/build/settings-mocks b/level_0/f_color/data/build/settings-mocks index 3c7b0e2..f04b3f0 100644 --- a/level_0/f_color/data/build/settings-mocks +++ b/level_0/f_color/data/build/settings-mocks @@ -37,13 +37,14 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_color/data/build/settings-tests b/level_0/f_color/data/build/settings-tests index 90dc1fd..2ef4099 100644 --- a/level_0/f_color/data/build/settings-tests +++ b/level_0/f_color/data/build/settings-tests @@ -25,9 +25,10 @@ build_shared yes build_static no path_headers tests/unit/c -preserve_path_headers no path_sources tests/unit/c -path_standard no + +has_path_standard no +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_console/data/build/settings b/level_0/f_console/data/build/settings index 37e4a1e..e4536fd 100644 --- a/level_0/f_console/data/build/settings +++ b/level_0/f_console/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_console/data/build/settings-tests b/level_0/f_console/data/build/settings-tests index f35e3f1..ab9e847 100644 --- a/level_0/f_console/data/build/settings-tests +++ b/level_0/f_console/data/build/settings-tests @@ -25,9 +25,10 @@ build_shared yes build_static no path_headers tests/unit/c -preserve_path_headers no path_sources tests/unit/c -path_standard no + +has_path_standard no +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_control_group/data/build/settings b/level_0/f_control_group/data/build/settings index 566cf79..2ec64ca 100644 --- a/level_0/f_control_group/data/build/settings +++ b/level_0/f_control_group/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_control_group/data/build/settings-tests b/level_0/f_control_group/data/build/settings-tests index 9e579f7..48e488d 100644 --- a/level_0/f_control_group/data/build/settings-tests +++ b/level_0/f_control_group/data/build/settings-tests @@ -25,9 +25,10 @@ build_shared yes build_static no path_headers tests/unit/c -preserve_path_headers no path_sources tests/unit/c -path_standard no + +has_path_standard no +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_conversion/data/build/settings b/level_0/f_conversion/data/build/settings index 7756618..9b4614a 100644 --- a/level_0/f_conversion/data/build/settings +++ b/level_0/f_conversion/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_conversion/data/build/settings-mocks b/level_0/f_conversion/data/build/settings-mocks index 94317a1..034b591 100644 --- a/level_0/f_conversion/data/build/settings-mocks +++ b/level_0/f_conversion/data/build/settings-mocks @@ -37,13 +37,14 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_conversion/data/build/settings-tests b/level_0/f_conversion/data/build/settings-tests index 18bd2c0..18a507e 100644 --- a/level_0/f_conversion/data/build/settings-tests +++ b/level_0/f_conversion/data/build/settings-tests @@ -25,9 +25,10 @@ build_shared yes build_static no path_headers tests/unit/c -preserve_path_headers no path_sources tests/unit/c -path_standard no + +has_path_standard no +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_directory/data/build/settings b/level_0/f_directory/data/build/settings index 42e58a7..309c0ac 100644 --- a/level_0/f_directory/data/build/settings +++ b/level_0/f_directory/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_environment/data/build/settings b/level_0/f_environment/data/build/settings index f518b98..2d91bfd 100644 --- a/level_0/f_environment/data/build/settings +++ b/level_0/f_environment/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_execute/data/build/settings b/level_0/f_execute/data/build/settings index f32dd6a..fd6d612 100644 --- a/level_0/f_execute/data/build/settings +++ b/level_0/f_execute/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_file/data/build/settings b/level_0/f_file/data/build/settings index 0cce9e6..e2ef5ab 100644 --- a/level_0/f_file/data/build/settings +++ b/level_0/f_file/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_fss/data/build/settings b/level_0/f_fss/data/build/settings index 52c6338..cd92aef 100644 --- a/level_0/f_fss/data/build/settings +++ b/level_0/f_fss/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_iki/data/build/settings b/level_0/f_iki/data/build/settings index 7670885..489a727 100644 --- a/level_0/f_iki/data/build/settings +++ b/level_0/f_iki/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_limit/data/build/settings b/level_0/f_limit/data/build/settings index 8fab95a..05d6f04 100644 --- a/level_0/f_limit/data/build/settings +++ b/level_0/f_limit/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_memory/data/build/settings b/level_0/f_memory/data/build/settings index 7d7cd2d..c1cd152 100644 --- a/level_0/f_memory/data/build/settings +++ b/level_0/f_memory/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_memory/data/build/settings-tests b/level_0/f_memory/data/build/settings-tests index 419caa9..89ee65b 100644 --- a/level_0/f_memory/data/build/settings-tests +++ b/level_0/f_memory/data/build/settings-tests @@ -23,9 +23,10 @@ build_shared yes build_static no path_headers tests/unit/c -preserve_path_headers no path_sources tests/unit/c -path_standard no + +has_path_standard no +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_path/data/build/settings b/level_0/f_path/data/build/settings index 1371934..d6a9f92 100644 --- a/level_0/f_path/data/build/settings +++ b/level_0/f_path/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_pipe/data/build/settings b/level_0/f_pipe/data/build/settings index d39a485..ffec130 100644 --- a/level_0/f_pipe/data/build/settings +++ b/level_0/f_pipe/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_print/data/build/settings b/level_0/f_print/data/build/settings index 091b8b0..6b7dbed 100644 --- a/level_0/f_print/data/build/settings +++ b/level_0/f_print/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_serialize/data/build/settings b/level_0/f_serialize/data/build/settings index 3eefb21..3b0a081 100644 --- a/level_0/f_serialize/data/build/settings +++ b/level_0/f_serialize/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_signal/data/build/settings b/level_0/f_signal/data/build/settings index 6add29f..a45d8fe 100644 --- a/level_0/f_signal/data/build/settings +++ b/level_0/f_signal/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_socket/data/build/settings b/level_0/f_socket/data/build/settings index 37821c3..f8cd04c 100644 --- a/level_0/f_socket/data/build/settings +++ b/level_0/f_socket/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_status/data/build/settings b/level_0/f_status/data/build/settings index dbf3d28..493c51e 100644 --- a/level_0/f_status/data/build/settings +++ b/level_0/f_status/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_status_string/data/build/settings b/level_0/f_status_string/data/build/settings index e459937..f8a3236 100644 --- a/level_0/f_status_string/data/build/settings +++ b/level_0/f_status_string/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_string/data/build/settings b/level_0/f_string/data/build/settings index 6301736..cf3c5a1 100644 --- a/level_0/f_string/data/build/settings +++ b/level_0/f_string/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_thread/data/build/settings b/level_0/f_thread/data/build/settings index 071e7e0..eb59aa7 100644 --- a/level_0/f_thread/data/build/settings +++ b/level_0/f_thread/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_type/data/build/settings b/level_0/f_type/data/build/settings index ea25dfb..68630d0 100644 --- a/level_0/f_type/data/build/settings +++ b/level_0/f_type/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_type_array/data/build/settings b/level_0/f_type_array/data/build/settings index e2e1090..ff821d5 100644 --- a/level_0/f_type_array/data/build/settings +++ b/level_0/f_type_array/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_type_array/data/build/settings-tests b/level_0/f_type_array/data/build/settings-tests index 26833d4..8a344c6 100644 --- a/level_0/f_type_array/data/build/settings-tests +++ b/level_0/f_type_array/data/build/settings-tests @@ -34,9 +34,10 @@ build_shared yes build_static no path_headers tests/unit/c -preserve_path_headers no path_sources tests/unit/c -path_standard no + +has_path_standard no +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_0/f_utf/data/build/settings b/level_0/f_utf/data/build/settings index 3910de2..b7d6548 100644 --- a/level_0/f_utf/data/build/settings +++ b/level_0/f_utf/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_0 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_1/fl_control_group/data/build/settings b/level_1/fl_control_group/data/build/settings index 3d74607..c3ff85c 100644 --- a/level_1/fl_control_group/data/build/settings +++ b/level_1/fl_control_group/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_1 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_1/fl_conversion/data/build/settings b/level_1/fl_conversion/data/build/settings index 1fac30d..0652e59 100644 --- a/level_1/fl_conversion/data/build/settings +++ b/level_1/fl_conversion/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_1 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_1/fl_directory/data/build/settings b/level_1/fl_directory/data/build/settings index 4040cdc..9bcf591 100644 --- a/level_1/fl_directory/data/build/settings +++ b/level_1/fl_directory/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_1 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_1/fl_environment/data/build/settings b/level_1/fl_environment/data/build/settings index 61c6f80..9d39bc9 100644 --- a/level_1/fl_environment/data/build/settings +++ b/level_1/fl_environment/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_1 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_1/fl_execute/data/build/settings b/level_1/fl_execute/data/build/settings index 6254252..f367570 100644 --- a/level_1/fl_execute/data/build/settings +++ b/level_1/fl_execute/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_1 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_1/fl_fss/data/build/settings b/level_1/fl_fss/data/build/settings index 769bccb..ae66169 100644 --- a/level_1/fl_fss/data/build/settings +++ b/level_1/fl_fss/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_1 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_1/fl_iki/data/build/settings b/level_1/fl_iki/data/build/settings index 85610ac..0df87de 100644 --- a/level_1/fl_iki/data/build/settings +++ b/level_1/fl_iki/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_1 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_1/fl_print/data/build/settings b/level_1/fl_print/data/build/settings index 5365c02..e5bcbb5 100644 --- a/level_1/fl_print/data/build/settings +++ b/level_1/fl_print/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_1 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_1/fl_signal/data/build/settings b/level_1/fl_signal/data/build/settings index 1a850b7..4ae316e 100644 --- a/level_1/fl_signal/data/build/settings +++ b/level_1/fl_signal/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_1 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_1/fl_string/data/build/settings b/level_1/fl_string/data/build/settings index fd6c43a..6cf487c 100644 --- a/level_1/fl_string/data/build/settings +++ b/level_1/fl_string/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_1 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_1/fl_utf/data/build/settings b/level_1/fl_utf/data/build/settings index 239e72b..5807766 100644 --- a/level_1/fl_utf/data/build/settings +++ b/level_1/fl_utf/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_1 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_1/fl_utf_file/data/build/settings b/level_1/fl_utf_file/data/build/settings index 06d0278..3585ced 100644 --- a/level_1/fl_utf_file/data/build/settings +++ b/level_1/fl_utf_file/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_1 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_2/fll_control_group/data/build/settings b/level_2/fll_control_group/data/build/settings index 7eff622..a7823fe 100644 --- a/level_2/fll_control_group/data/build/settings +++ b/level_2/fll_control_group/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_2 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_2/fll_error/data/build/settings b/level_2/fll_error/data/build/settings index 6d69410..8bef3cd 100644 --- a/level_2/fll_error/data/build/settings +++ b/level_2/fll_error/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_2 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_2/fll_execute/data/build/settings b/level_2/fll_execute/data/build/settings index fe0f0d4..86743d9 100644 --- a/level_2/fll_execute/data/build/settings +++ b/level_2/fll_execute/data/build/settings @@ -50,7 +50,6 @@ build_shared yes build_static no path_headers fll/level_2 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -62,7 +61,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_2/fll_file/data/build/settings b/level_2/fll_file/data/build/settings index fe0b1af..647b27a 100644 --- a/level_2/fll_file/data/build/settings +++ b/level_2/fll_file/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_2 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_2/fll_fss/data/build/settings b/level_2/fll_fss/data/build/settings index d31cf44..60f0d00 100644 --- a/level_2/fll_fss/data/build/settings +++ b/level_2/fll_fss/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_2 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_2/fll_fss_status_string/data/build/settings b/level_2/fll_fss_status_string/data/build/settings index f218762..cc00950 100644 --- a/level_2/fll_fss_status_string/data/build/settings +++ b/level_2/fll_fss_status_string/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_2 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_2/fll_iki/data/build/settings b/level_2/fll_iki/data/build/settings index 189b34a..f8b3acb 100644 --- a/level_2/fll_iki/data/build/settings +++ b/level_2/fll_iki/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_2 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_2/fll_path/data/build/settings b/level_2/fll_path/data/build/settings index b0402ce..08fe5a5 100644 --- a/level_2/fll_path/data/build/settings +++ b/level_2/fll_path/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_2 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_2/fll_print/data/build/settings b/level_2/fll_print/data/build/settings index 26d0b5b..9c0d5f0 100644 --- a/level_2/fll_print/data/build/settings +++ b/level_2/fll_print/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_2 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_2/fll_program/data/build/settings b/level_2/fll_program/data/build/settings index adc6c78..4b12fe3 100644 --- a/level_2/fll_program/data/build/settings +++ b/level_2/fll_program/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_2 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_2/fll_status_string/data/build/settings b/level_2/fll_status_string/data/build/settings index 3ac6025..3516ecf 100644 --- a/level_2/fll_status_string/data/build/settings +++ b/level_2/fll_status_string/data/build/settings @@ -49,7 +49,6 @@ build_shared yes build_static no path_headers fll/level_2 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -61,7 +60,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/byte_dump/data/build/settings b/level_3/byte_dump/data/build/settings index d6c21be..f04f44c 100644 --- a/level_3/byte_dump/data/build/settings +++ b/level_3/byte_dump/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/byte_dump -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/control/data/build/settings b/level_3/control/data/build/settings index fe71c2c..427c53b 100644 --- a/level_3/control/data/build/settings +++ b/level_3/control/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/control -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/controller/data/build/settings b/level_3/controller/data/build/settings index a70964d..5bab469 100644 --- a/level_3/controller/data/build/settings +++ b/level_3/controller/data/build/settings @@ -62,7 +62,6 @@ build_shared yes build_static no path_headers program/controller -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -74,7 +73,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/fake/c/private-build-load.c b/level_3/fake/c/private-build-load.c index ef7d6e4..f21edc8 100644 --- a/level_3/fake/c/private-build-load.c +++ b/level_3/fake/c/private-build-load.c @@ -200,8 +200,8 @@ extern "C" { f_string_dynamics_t build_sources_object_shared = f_string_dynamics_t_initialize; f_string_dynamics_t build_sources_object_static = f_string_dynamics_t_initialize; f_string_dynamics_t build_static = f_string_dynamics_t_initialize; + f_string_dynamics_t has_path_standard = f_string_dynamics_t_initialize; f_string_dynamics_t path_headers = f_string_dynamics_t_initialize; - f_string_dynamics_t preserve_path_headers = f_string_dynamics_t_initialize; f_string_dynamics_t path_language = f_string_dynamics_t_initialize; f_string_dynamics_t path_library_script = f_string_dynamics_t_initialize; f_string_dynamics_t path_library_shared = f_string_dynamics_t_initialize; @@ -214,7 +214,7 @@ extern "C" { f_string_dynamics_t path_program_static = f_string_dynamics_t_initialize; f_string_dynamics_t path_sources = f_string_dynamics_t_initialize; f_string_dynamics_t path_sources_object = f_string_dynamics_t_initialize; - f_string_dynamics_t path_standard = f_string_dynamics_t_initialize; + f_string_dynamics_t preserve_path_headers = f_string_dynamics_t_initialize; f_string_dynamics_t process_post = f_string_dynamics_t_initialize; f_string_dynamics_t process_pre = f_string_dynamics_t_initialize; f_string_dynamics_t search_exclusive = f_string_dynamics_t_initialize; @@ -288,6 +288,7 @@ extern "C" { fake_build_setting_name_flags_program_static_s, fake_build_setting_name_flags_shared_s, fake_build_setting_name_flags_static_s, + fake_build_setting_name_has_path_standard_s, fake_build_setting_name_modes_s, fake_build_setting_name_modes_default_s, fake_build_setting_name_path_headers_s, @@ -304,7 +305,6 @@ extern "C" { fake_build_setting_name_path_program_static_s, fake_build_setting_name_path_sources_s, fake_build_setting_name_path_sources_object_s, - fake_build_setting_name_path_standard_s, fake_build_setting_name_process_post_s, fake_build_setting_name_process_pre_s, fake_build_setting_name_search_exclusive_s, @@ -379,10 +379,10 @@ extern "C" { &setting->flags_program_static, &setting->flags_shared, &setting->flags_static, + &has_path_standard, &setting->modes, &setting->modes_default, &path_headers, - &preserve_path_headers, &path_language, &path_library_script, &path_library_shared, @@ -395,7 +395,7 @@ extern "C" { &path_program_static, &path_sources, &path_sources_object, - &path_standard, + &preserve_path_headers, &process_post, &process_pre, &search_exclusive, @@ -660,8 +660,8 @@ extern "C" { fake_build_setting_name_build_sources_object_shared_s, fake_build_setting_name_build_sources_object_static_s, fake_build_setting_name_build_static_s, + fake_build_setting_name_has_path_standard_s, fake_build_setting_name_path_headers_s, - fake_build_setting_name_preserve_path_headers_s, fake_build_setting_name_path_language_s, fake_build_setting_name_path_library_script_s, fake_build_setting_name_path_library_shared_s, @@ -674,7 +674,7 @@ extern "C" { fake_build_setting_name_path_program_static_s, fake_build_setting_name_path_sources_s, fake_build_setting_name_path_sources_object_s, - fake_build_setting_name_path_standard_s, + fake_build_setting_name_preserve_path_headers_s, fake_build_setting_name_process_post_s, fake_build_setting_name_process_pre_s, fake_build_setting_name_search_exclusive_s, @@ -703,8 +703,8 @@ extern "C" { &build_sources_object_shared, &build_sources_object_static, &build_static, + &has_path_standard, &path_headers, - &preserve_path_headers, &path_language, &path_library_script, &path_library_shared, @@ -717,7 +717,7 @@ extern "C" { &path_program_static, &path_sources, &path_sources_object, - &path_standard, + &preserve_path_headers, &process_post, &process_pre, &search_exclusive, @@ -746,8 +746,8 @@ extern "C" { 0, // build_sources_object_shared 0, // build_sources_object_static &setting->build_static, // build_static + &setting->has_path_standard, // has_path_standard 0, // path_headers - &setting->preserve_path_headers, // preserve_path_headers 0, // path_language 0, // path_library_script 0, // path_library_shared @@ -760,7 +760,7 @@ extern "C" { 0, // path_program_static 0, // path_sources 0, // path_sources_object - &setting->path_standard, // path_standard + &setting->preserve_path_headers, // preserve_path_headers 0, // process_post 0, // process_pre &setting->search_exclusive, // search_exclusive @@ -779,8 +779,8 @@ extern "C" { &setting->build_sources_object_shared, // build_sources_object_shared &setting->build_sources_object_static, // build_sources_object_static 0, // build_static + 0, // has_path_standard &setting->path_headers, // path_headers - 0, // preserve_path_headers &setting->path_language, // path_language &setting->path_library_script, // path_library_script &setting->path_library_shared, // path_library_shared @@ -793,7 +793,7 @@ extern "C" { &setting->path_program_static, // path_program_static &setting->path_sources, // path_sources &setting->path_sources_object, // path_sources_object - 0, // path_standard + 0, // preserve_path_headers &setting->process_post, // process_post &setting->process_pre, // process_pre 0, // search_exclusive @@ -822,8 +822,8 @@ extern "C" { f_string_empty_s, // build_sources_object_shared f_string_empty_s, // build_sources_object_static f_string_empty_s, // build_static + fake_build_setting_default_yes_s, // has_path_standard f_string_empty_s, // path_headers - f_string_empty_s, // preserve_path_headers f_string_empty_s, // path_language fake_path_part_script_s, // path_library_script fake_path_part_shared_s, // path_library_shared @@ -836,7 +836,7 @@ extern "C" { fake_path_part_static_s, // path_program_static f_string_empty_s, // path_sources f_string_empty_s, // path_sources_object - fake_build_setting_default_yes_s, // path_standard + f_string_empty_s, // preserve_path_headers f_string_empty_s, // process_post f_string_empty_s, // process_pre fake_build_setting_default_yes_s, // search_exclusive @@ -871,8 +871,8 @@ extern "C" { 0, // build_sources_object_shared 0, // build_sources_object_static 0, // build_static + 0, // has_path_standard 0, // path_headers - 0, // preserve_path_headers 0, // path_language 0, // path_library_script 0, // path_library_shared @@ -885,7 +885,7 @@ extern "C" { 0, // path_program_static 0, // path_sources 0, // path_sources_object - 0, // path_standard + 0, // preserve_path_headers 0, // process_post 0, // process_pre 0, // search_exclusive @@ -914,8 +914,8 @@ extern "C" { 0, // build_sources_object_shared 0, // build_sources_object_static 0, // build_static + 0, // has_path_standard 0, // path_headers - 0, // preserve_path_headers 0, // path_language 0, // path_library_script 0, // path_library_shared @@ -928,7 +928,7 @@ extern "C" { 0, // path_program_static 0, // path_sources 0, // path_sources_object - 0, // path_standard + 0, // preserve_path_headers 0, // process_post 0, // process_pre 0, // search_exclusive @@ -957,8 +957,8 @@ extern "C" { f_string_empty_s, // build_sources_object_shared f_string_empty_s, // build_sources_object_static f_string_empty_s, // build_static + f_string_empty_s, // has_path_standard f_string_empty_s, // path_headers - f_string_empty_s, // preserve_path_headers f_string_empty_s, // path_language f_string_empty_s, // path_library_script f_string_empty_s, // path_library_shared @@ -971,7 +971,7 @@ extern "C" { f_string_empty_s, // path_program_static f_string_empty_s, // path_sources f_string_empty_s, // path_sources_object - f_string_empty_s, // path_standard + f_string_empty_s, // preserve_path_headers f_string_empty_s, // process_post f_string_empty_s, // process_pre f_string_empty_s, // search_exclusive @@ -1001,8 +1001,8 @@ extern "C" { 3, // build_sources_object_shared 3, // build_sources_object_static 1, // build_static + 1, // has_path_standard 2, // path_headers - 1, // preserve_path_headers 2, // path_language 2, // path_library_script 2, // path_library_shared @@ -1015,7 +1015,7 @@ extern "C" { 2, // path_program_static 2, // path_sources 2, // path_sources_object - 1, // path_standard + 1, // preserve_path_headers 3, // process_post 3, // process_pre 1, // search_exclusive @@ -1266,8 +1266,8 @@ extern "C" { f_string_dynamics_resize(0, &build_sources_object_shared); f_string_dynamics_resize(0, &build_sources_object_static); f_string_dynamics_resize(0, &build_static); + f_string_dynamics_resize(0, &has_path_standard); f_string_dynamics_resize(0, &path_headers); - f_string_dynamics_resize(0, &preserve_path_headers); f_string_dynamics_resize(0, &path_language); f_string_dynamics_resize(0, &path_library_script); f_string_dynamics_resize(0, &path_library_shared); @@ -1280,7 +1280,7 @@ extern "C" { f_string_dynamics_resize(0, &path_program_static); f_string_dynamics_resize(0, &path_sources); f_string_dynamics_resize(0, &path_sources_object); - f_string_dynamics_resize(0, &path_standard); + f_string_dynamics_resize(0, &preserve_path_headers); f_string_dynamics_resize(0, &process_post); f_string_dynamics_resize(0, &process_pre); f_string_dynamics_resize(0, &search_exclusive); diff --git a/level_3/fake/c/private-build-objects.c b/level_3/fake/c/private-build-objects.c index 1a16245..7610c05 100644 --- a/level_3/fake/c/private-build-objects.c +++ b/level_3/fake/c/private-build-objects.c @@ -41,7 +41,7 @@ extern "C" { int result = main->child; - if (data_build->setting.path_standard) { + if (data_build->setting.has_path_standard) { path_sources = &main->path_sources_c; if (data_build->setting.build_language == fake_build_language_type_cpp_e) { diff --git a/level_3/fake/c/private-build.c b/level_3/fake/c/private-build.c index 3f83291..9f0e4ae 100644 --- a/level_3/fake/c/private-build.c +++ b/level_3/fake/c/private-build.c @@ -917,7 +917,7 @@ extern "C" { if (data_build.setting.build_sources_headers.used) { f_string_static_t path_sources = main->path_sources; - if (data_build.setting.path_standard) { + if (data_build.setting.has_path_standard) { path_sources = main->path_sources_c; if (data_build.setting.build_language == fake_build_language_type_cpp_e) { @@ -1001,7 +1001,7 @@ extern "C" { specific, }; - if (data_build->setting.path_standard) { + if (data_build->setting.has_path_standard) { if (data_build->setting.build_language == fake_build_language_type_c_e) { path_sources = &main->path_sources_c; } @@ -1048,7 +1048,7 @@ extern "C" { f_string_dynamic_t *path_sources = &main->path_sources_object; // @fixme review this, these paths (like path_sources_object) need to be build on a per-settings basis rather than using a global value. - if (data_build->setting.path_standard) { + if (data_build->setting.has_path_standard) { if (data_build->setting.build_language == fake_build_language_type_c_e) { path_sources = &main->path_sources_object_c; } diff --git a/level_3/fake/c/private-common.c b/level_3/fake/c/private-common.c index 6586f06..49b8466 100644 --- a/level_3/fake/c/private-common.c +++ b/level_3/fake/c/private-common.c @@ -69,10 +69,10 @@ extern "C" { const f_string_static_t fake_build_setting_name_flags_program_static_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_flags_program_static_s, 0, FAKE_build_setting_name_flags_program_static_s_length); const f_string_static_t fake_build_setting_name_flags_shared_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_flags_shared_s, 0, FAKE_build_setting_name_flags_shared_s_length); const f_string_static_t fake_build_setting_name_flags_static_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_flags_static_s, 0, FAKE_build_setting_name_flags_static_s_length); + const f_string_static_t fake_build_setting_name_has_path_standard_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_has_path_standard_s, 0, FAKE_build_setting_name_has_path_standard_s_length); const f_string_static_t fake_build_setting_name_modes_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_modes_s, 0, FAKE_build_setting_name_modes_s_length); const f_string_static_t fake_build_setting_name_modes_default_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_modes_default_s, 0, FAKE_build_setting_name_modes_default_s_length); const f_string_static_t fake_build_setting_name_path_headers_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_path_headers_s, 0, FAKE_build_setting_name_path_headers_s_length); - const f_string_static_t fake_build_setting_name_preserve_path_headers_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_preserve_path_headers_s, 0, FAKE_build_setting_name_preserve_path_headers_s_length); const f_string_static_t fake_build_setting_name_path_language_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_path_language_s, 0, FAKE_build_setting_name_path_language_s_length); const f_string_static_t fake_build_setting_name_path_library_script_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_path_library_script_s, 0, FAKE_build_setting_name_path_library_script_s_length); const f_string_static_t fake_build_setting_name_path_library_shared_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_path_library_shared_s, 0, FAKE_build_setting_name_path_library_shared_s_length); @@ -85,7 +85,7 @@ extern "C" { const f_string_static_t fake_build_setting_name_path_program_static_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_path_program_static_s, 0, FAKE_build_setting_name_path_program_static_s_length); const f_string_static_t fake_build_setting_name_path_sources_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_path_sources_s, 0, FAKE_build_setting_name_path_sources_s_length); const f_string_static_t fake_build_setting_name_path_sources_object_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_path_sources_object_s, 0, FAKE_build_setting_name_path_sources_object_s_length); - const f_string_static_t fake_build_setting_name_path_standard_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_path_standard_s, 0, FAKE_build_setting_name_path_standard_s_length); + const f_string_static_t fake_build_setting_name_preserve_path_headers_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_preserve_path_headers_s, 0, FAKE_build_setting_name_preserve_path_headers_s_length); const f_string_static_t fake_build_setting_name_process_post_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_process_post_s, 0, FAKE_build_setting_name_process_post_s_length); const f_string_static_t fake_build_setting_name_process_pre_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_process_pre_s, 0, FAKE_build_setting_name_process_pre_s_length); const f_string_static_t fake_build_setting_name_search_exclusive_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_search_exclusive_s, 0, FAKE_build_setting_name_search_exclusive_s_length); diff --git a/level_3/fake/c/private-common.h b/level_3/fake/c/private-common.h index 7a23dd0..38b06e1 100644 --- a/level_3/fake/c/private-common.h +++ b/level_3/fake/c/private-common.h @@ -23,7 +23,7 @@ extern "C" { bool build_shared; bool build_static; - bool path_standard; + bool has_path_standard; bool preserve_path_headers; bool search_exclusive; @@ -342,10 +342,10 @@ extern "C" { #define FAKE_build_setting_name_flags_program_static_s "flags_program_static" #define FAKE_build_setting_name_flags_shared_s "flags_shared" #define FAKE_build_setting_name_flags_static_s "flags_static" + #define FAKE_build_setting_name_has_path_standard_s "has_path_standard" #define FAKE_build_setting_name_modes_s "modes" #define FAKE_build_setting_name_modes_default_s "modes_default" #define FAKE_build_setting_name_path_headers_s "path_headers" - #define FAKE_build_setting_name_preserve_path_headers_s "preserve_path_headers" #define FAKE_build_setting_name_path_language_s "path_language" #define FAKE_build_setting_name_path_library_script_s "path_library_script" #define FAKE_build_setting_name_path_library_shared_s "path_library_shared" @@ -358,7 +358,7 @@ extern "C" { #define FAKE_build_setting_name_path_program_static_s "path_program_static" #define FAKE_build_setting_name_path_sources_s "path_sources" #define FAKE_build_setting_name_path_sources_object_s "path_sources_object" - #define FAKE_build_setting_name_path_standard_s "path_standard" + #define FAKE_build_setting_name_preserve_path_headers_s "preserve_path_headers" #define FAKE_build_setting_name_process_post_s "process_post" #define FAKE_build_setting_name_process_pre_s "process_pre" #define FAKE_build_setting_name_search_exclusive_s "search_exclusive" @@ -437,10 +437,10 @@ extern "C" { #define FAKE_build_setting_name_flags_program_static_s_length 20 #define FAKE_build_setting_name_flags_shared_s_length 12 #define FAKE_build_setting_name_flags_static_s_length 12 + #define FAKE_build_setting_name_has_path_standard_s_length 17 #define FAKE_build_setting_name_modes_s_length 5 #define FAKE_build_setting_name_modes_default_s_length 13 #define FAKE_build_setting_name_path_headers_s_length 12 - #define FAKE_build_setting_name_preserve_path_headers_s_length 21 #define FAKE_build_setting_name_path_language_s_length 13 #define FAKE_build_setting_name_path_library_script_s_length 19 #define FAKE_build_setting_name_path_library_shared_s_length 19 @@ -453,7 +453,7 @@ extern "C" { #define FAKE_build_setting_name_path_program_static_s_length 19 #define FAKE_build_setting_name_path_sources_s_length 12 #define FAKE_build_setting_name_path_sources_object_s_length 19 - #define FAKE_build_setting_name_path_standard_s_length 13 + #define FAKE_build_setting_name_preserve_path_headers_s_length 21 #define FAKE_build_setting_name_process_post_s_length 12 #define FAKE_build_setting_name_process_pre_s_length 11 #define FAKE_build_setting_name_search_exclusive_s_length 16 @@ -532,10 +532,10 @@ extern "C" { extern const f_string_static_t fake_build_setting_name_flags_program_static_s; extern const f_string_static_t fake_build_setting_name_flags_shared_s; extern const f_string_static_t fake_build_setting_name_flags_static_s; + extern const f_string_static_t fake_build_setting_name_has_path_standard_s; extern const f_string_static_t fake_build_setting_name_modes_s; extern const f_string_static_t fake_build_setting_name_modes_default_s; extern const f_string_static_t fake_build_setting_name_path_headers_s; - extern const f_string_static_t fake_build_setting_name_preserve_path_headers_s; extern const f_string_static_t fake_build_setting_name_path_language_s; extern const f_string_static_t fake_build_setting_name_path_library_script_s; extern const f_string_static_t fake_build_setting_name_path_library_shared_s; @@ -548,7 +548,7 @@ extern "C" { extern const f_string_static_t fake_build_setting_name_path_program_static_s; extern const f_string_static_t fake_build_setting_name_path_sources_s; extern const f_string_static_t fake_build_setting_name_path_sources_object_s; - extern const f_string_static_t fake_build_setting_name_path_standard_s; + extern const f_string_static_t fake_build_setting_name_preserve_path_headers_s; extern const f_string_static_t fake_build_setting_name_process_post_s; extern const f_string_static_t fake_build_setting_name_process_pre_s; extern const f_string_static_t fake_build_setting_name_search_exclusive_s; diff --git a/level_3/fake/c/private-make-operate.c b/level_3/fake/c/private-make-operate.c index 7ed6334..260ede2 100644 --- a/level_3/fake/c/private-make-operate.c +++ b/level_3/fake/c/private-make-operate.c @@ -608,7 +608,7 @@ extern "C" { fake_build_setting_name_build_script_s, fake_build_setting_name_build_shared_s, fake_build_setting_name_build_static_s, - fake_build_setting_name_path_standard_s, + fake_build_setting_name_has_path_standard_s, fake_build_setting_name_search_exclusive_s, fake_build_setting_name_search_shared_s, fake_build_setting_name_search_static_s, @@ -618,7 +618,7 @@ extern "C" { data_make->setting_build.build_script, data_make->setting_build.build_shared, data_make->setting_build.build_static, - data_make->setting_build.path_standard, + data_make->setting_build.has_path_standard, data_make->setting_build.search_exclusive, data_make->setting_build.search_shared, data_make->setting_build.search_static, diff --git a/level_3/fake/data/build/settings b/level_3/fake/data/build/settings index 32ad839..b8413ab 100644 --- a/level_3/fake/data/build/settings +++ b/level_3/fake/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/fake -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/fake/documents/settings.txt b/level_3/fake/documents/settings.txt index 7468da3..f3d4992 100644 --- a/level_3/fake/documents/settings.txt +++ b/level_3/fake/documents/settings.txt @@ -330,6 +330,13 @@ Settings Documentation: This includes the any compiler specific parameters to defined this, such as the "-f" used by gcc and clang. These are applied to only static builds. + - has_path_standard\: + When "yes", the sources path will be built using the sources path with the language, such as "sources/c/". + When "no", the default sources path structure is not used and instead "path_sources" is used. + When the parameter -S/--sources is specified, such as "-S xxx", then when this is set to "yes" is used then the path would be "xxx/c/" and when this is set to "no" then the path would be "xxx/". + + This defaults to "yes". + - modes\: A collection of available build modes. Build modes provide custom variants of the build process where certain settings are appended onto others. @@ -408,13 +415,6 @@ Settings Documentation: This defaults to "sources". - - path_standard\: - When "yes", the sources path will be built using the sources path with the language, such as "sources/c/". - When "no", the default sources path structure is not used and instead "path_sources" is used. - When the parameter -S/--sources is specified, such as "-S xxx", then when this is set to "yes" is used then the path would be "xxx/c/" and when this is set to "no" then the path would be "xxx/". - - This defaults to "yes". - - preserve_path_headers\: When this is "yes", then the relative directory structure in the source (as defined in "build_sources_headers") is preserved. If the "build_sources_headers" has the header files "xxx/a.h yyy/zzz/b.h" and this is "yes", then the directories "xxx/" and "yyy/zzz/" are created and the files are stored within them. diff --git a/level_3/fake/specifications/settings.txt b/level_3/fake/specifications/settings.txt index 9a0aac5..021a2dc 100644 --- a/level_3/fake/specifications/settings.txt +++ b/level_3/fake/specifications/settings.txt @@ -66,6 +66,7 @@ Settings Specification: - flags_program_static: Must only contain any number of parameters supported by the compiler specified in "build_compiler". - flags_shared: Must only contain any number of parameters supported by the compiler specified in "build_compiler". - flags_static: Must only contain any number of parameters supported by the compiler specified in "build_compiler". + - has_path_standard: Must only one of: "yes" or "no". - modes: Any valid word character, '-', or '+'. - modes_default: May only be a single complete Content word defined in "modes" Object. - path_headers: Must be a single valid path. @@ -81,7 +82,6 @@ Settings Specification: - path_program_static: Must be a single valid path. - path_sources: Must only be a valid directory path or not specified. - path_sources_object: Must only be a valid directory path or not specified. - - path_standard: Must only one of: "yes" or "no". - preserve_path_headers: Must only be one of "yes" or "no". - process_post: Must contain only a single valid filename. - process_pre: Must contain only a single valid filename. diff --git a/level_3/firewall/data/build/settings b/level_3/firewall/data/build/settings index eac7d39..640df7b 100644 --- a/level_3/firewall/data/build/settings +++ b/level_3/firewall/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/firewall -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/fss_basic_list_read/data/build/settings b/level_3/fss_basic_list_read/data/build/settings index bcdea4a..b1afbde 100644 --- a/level_3/fss_basic_list_read/data/build/settings +++ b/level_3/fss_basic_list_read/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/fss_basic_list_read -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/fss_basic_list_write/data/build/settings b/level_3/fss_basic_list_write/data/build/settings index e3a2a83..3400f33 100644 --- a/level_3/fss_basic_list_write/data/build/settings +++ b/level_3/fss_basic_list_write/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/fss_basic_list_write -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/fss_basic_read/data/build/settings b/level_3/fss_basic_read/data/build/settings index 01d36a2..5bf1f9c 100644 --- a/level_3/fss_basic_read/data/build/settings +++ b/level_3/fss_basic_read/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/fss_basic_read -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/fss_basic_write/data/build/settings b/level_3/fss_basic_write/data/build/settings index 245eeb5..824118e 100644 --- a/level_3/fss_basic_write/data/build/settings +++ b/level_3/fss_basic_write/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/fss_basic_write -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/fss_embedded_list_read/data/build/settings b/level_3/fss_embedded_list_read/data/build/settings index 42aecb2..b0e810e 100644 --- a/level_3/fss_embedded_list_read/data/build/settings +++ b/level_3/fss_embedded_list_read/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/fss_embedded_list_read -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/fss_embedded_list_write/data/build/settings b/level_3/fss_embedded_list_write/data/build/settings index bab5987..0a254a6 100644 --- a/level_3/fss_embedded_list_write/data/build/settings +++ b/level_3/fss_embedded_list_write/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/fss_embedded_list_write -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/fss_extended_list_read/data/build/settings b/level_3/fss_extended_list_read/data/build/settings index 0b338f0..1d02ce3 100644 --- a/level_3/fss_extended_list_read/data/build/settings +++ b/level_3/fss_extended_list_read/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/fss_extended_list_read -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/fss_extended_list_write/data/build/settings b/level_3/fss_extended_list_write/data/build/settings index 3f9ffd1..fece3b7 100644 --- a/level_3/fss_extended_list_write/data/build/settings +++ b/level_3/fss_extended_list_write/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/fss_extended_list_write -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/fss_extended_read/data/build/settings b/level_3/fss_extended_read/data/build/settings index 37823ef..6553164 100644 --- a/level_3/fss_extended_read/data/build/settings +++ b/level_3/fss_extended_read/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/fss_extended_read -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/fss_extended_write/data/build/settings b/level_3/fss_extended_write/data/build/settings index 67f1bd0..845f5a4 100644 --- a/level_3/fss_extended_write/data/build/settings +++ b/level_3/fss_extended_write/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/fss_extended_write -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/fss_identify/data/build/settings b/level_3/fss_identify/data/build/settings index 24c5a89..58dab22 100644 --- a/level_3/fss_identify/data/build/settings +++ b/level_3/fss_identify/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/fss_identify -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/fss_payload_read/data/build/settings b/level_3/fss_payload_read/data/build/settings index 75a61d4..d798bed 100644 --- a/level_3/fss_payload_read/data/build/settings +++ b/level_3/fss_payload_read/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/fss_payload_read -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/fss_payload_write/data/build/settings b/level_3/fss_payload_write/data/build/settings index 962a640..d3552fb 100644 --- a/level_3/fss_payload_write/data/build/settings +++ b/level_3/fss_payload_write/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/fss_payload_write -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/fss_status_code/data/build/settings b/level_3/fss_status_code/data/build/settings index 459c6db..a0c2e02 100644 --- a/level_3/fss_status_code/data/build/settings +++ b/level_3/fss_status_code/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/fss_status_code -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/iki_read/data/build/settings b/level_3/iki_read/data/build/settings index dac22ac..9003c43 100644 --- a/level_3/iki_read/data/build/settings +++ b/level_3/iki_read/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/iki_read -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/iki_write/data/build/settings b/level_3/iki_write/data/build/settings index c11a4fb..c1ed8eb 100644 --- a/level_3/iki_write/data/build/settings +++ b/level_3/iki_write/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/iki_write -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/status_code/data/build/settings b/level_3/status_code/data/build/settings index be29b79..655c33f 100644 --- a/level_3/status_code/data/build/settings +++ b/level_3/status_code/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/status_code -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes diff --git a/level_3/utf8/data/build/settings b/level_3/utf8/data/build/settings index b195a8e..39ac4ae 100644 --- a/level_3/utf8/data/build/settings +++ b/level_3/utf8/data/build/settings @@ -51,7 +51,6 @@ build_shared yes build_static no path_headers program/utf8 -preserve_path_headers no path_library_script script path_library_shared shared path_library_static static @@ -63,7 +62,9 @@ path_program_shared shared path_program_static static path_sources path_sources_object -path_standard yes + +has_path_standard yes +preserve_path_headers no search_exclusive yes search_shared yes -- 1.8.3.1