From 62d77d4ee0687bef4dbdd3e9557b33466abc1fb1 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Thu, 15 Oct 2020 19:50:50 -0500 Subject: [PATCH] Cleanup: dependencies helper script. Rename individual_dependencies to dependencies_individual. Organize all dependencies by level. If possible, sort each dependency. --- build/scripts/package.sh | 65 ++++++++++++++++++---- level_0/f_console/data/build/settings | 2 +- level_0/f_conversion/data/build/settings | 2 +- level_0/f_fss/data/build/settings | 2 +- level_0/f_iki/data/build/settings | 2 +- level_0/f_serialize/data/build/settings | 2 +- level_1/fl_color/data/build/settings | 2 +- level_1/fl_console/data/build/settings | 2 +- level_1/fl_conversion/data/build/settings | 2 +- level_1/fl_directory/data/build/settings | 2 +- level_1/fl_environment/data/build/settings | 2 +- level_1/fl_fss/data/build/settings | 2 +- level_1/fl_iki/data/build/settings | 2 +- level_1/fl_print/data/build/settings | 2 +- level_1/fl_status/data/build/settings | 2 +- level_1/fl_string/data/build/settings | 2 +- level_1/fl_utf/data/build/settings | 2 +- level_1/fl_utf_file/data/build/settings | 2 +- level_2/fll_error/data/build/settings | 2 +- level_2/fll_execute/data/build/settings | 2 +- level_2/fll_file/data/build/settings | 2 +- level_2/fll_fss/data/build/settings | 2 +- level_2/fll_iki/data/build/settings | 2 +- level_2/fll_path/data/build/settings | 2 +- level_2/fll_program/data/build/settings | 2 +- level_2/fll_status/data/build/settings | 2 +- level_3/byte_dump/data/build/settings | 2 +- level_3/fake/data/build/settings | 2 +- level_3/firewall/data/build/settings | 2 +- level_3/fss_basic_list_read/data/build/settings | 2 +- level_3/fss_basic_list_write/data/build/settings | 2 +- level_3/fss_basic_read/data/build/settings | 2 +- level_3/fss_basic_write/data/build/settings | 2 +- level_3/fss_extended_list_read/data/build/settings | 2 +- .../fss_extended_list_write/data/build/settings | 2 +- level_3/fss_extended_read/data/build/settings | 2 +- level_3/fss_extended_write/data/build/settings | 2 +- level_3/fss_status_code/data/build/settings | 2 +- level_3/iki_read/data/build/settings | 2 +- level_3/iki_write/data/build/settings | 2 +- level_3/init/data/build/settings | 2 +- level_3/status_code/data/build/settings | 2 +- 42 files changed, 96 insertions(+), 51 deletions(-) diff --git a/build/scripts/package.sh b/build/scripts/package.sh index a8f8c98..0b13893 100644 --- a/build/scripts/package.sh +++ b/build/scripts/package.sh @@ -4,7 +4,7 @@ # # The purpose of this script is to create releases from the project source. # These release directories can then be used to compile the project or to package the project. -# The dependencies of this script are: basename, bash, chmod, grep, and sed. +# The dependencies of this script are: basename, bash, chmod, grep, sed, and sort. package_main() { local public_name="Simple FLL Project Package Script" @@ -466,6 +466,10 @@ package_dependencies_individual() { local settings= local name= local dependencies= + local dependencies_0= + local dependencies_1= + local dependencies_2= + local dependencies_individual= local dependency= local sub_level= local sub_dependencies= @@ -473,7 +477,6 @@ package_dependencies_individual() { local sub_sub_level= local sub_sub_dependencies= local sub_sub_dependency= - local individual_dependencies= for directory in ${path_sources}level_0/* ${path_sources}level_1/* ${path_sources}level_2/* ${path_sources}level_3/* ; do name="$(echo $directory | sed -e "s|${path_sources}level_0/||" -e "s|${path_sources}level_1/||" -e "s|${path_sources}level_2/||" -e "s|${path_sources}level_3/||")" @@ -504,11 +507,15 @@ package_dependencies_individual() { fi dependencies= + dependencies_0= + dependencies_1= + dependencies_2= + dependencies_individual= + if [[ -f ${directory}/data/build/dependencies ]] ; then dependencies=$(cat ${directory}/data/build/dependencies | sed -e "/^\s*#/d" -e "s|#\.*$||") fi - individual_dependencies= for dependency in $dependencies ; do if [[ $(echo "$dependency" | grep -o "^f_") != "" ]] ; then level=level_0 @@ -605,17 +612,17 @@ package_dependencies_individual() { break; fi - individual_dependencies=$(echo "$individual_dependencies" | sed -e 's|^[[:space:]]*||' -e 's|[[:space:]]*$||') - if [[ $individual_dependencies != "" ]] ; then + dependencies_individual=$(echo "$dependencies_individual" | sed -e 's|^[[:space:]]*||' -e 's|[[:space:]]*$||' -e 's|[[:space:]][[:space:]]*$| |') + if [[ $dependencies_individual != "" ]] ; then if [[ $verbosity == "verbose" ]] ; then - echo -e " $individual_dependencies" + echo -e " $dependencies_individual" fi - individual_dependencies=" $individual_dependencies" + dependencies_individual=" $dependencies_individual" fi settings=${directory}/data/build/settings - sed -i -e "s|^\s*build_libraries-individual\>.*\$|build_libraries-individual$individual_dependencies|" $settings + sed -i -e "s|^\s*build_libraries-individual\>.*\$|build_libraries-individual$dependencies_individual|" $settings if [[ $? -ne 0 ]] ; then if [[ $verbosity != "quiet" ]] ; then @@ -671,8 +678,46 @@ package_dependencies_individual_append() { libraries=$(grep -o '^\s*build_sources_library\>.*$' $settings | sed -e 's|^\s*build_sources_library\>||' -e 's|^[[:space:]]*||' -e 's|[[:space:]]*$||') if [[ $libraries != "" ]] ; then - if [[ $(echo -n $individual_dependencies | grep -o "\-l$dependency\>") == "" ]] ; then - individual_dependencies="-l$dependency $individual_dependencies" + if [[ $(echo -n $dependencies_individual | grep -o "\-l$dependency\>") == "" ]] ; then + + if [[ "$(type -p sort)" != "" ]] ; then + if [[ $level == "level_0" ]] ; then + dependencies_0="-l$dependency $dependencies_0" + dependencies_0="$(for i in $dependencies_0; do echo $i ; done | sort)" + dependencies_0=$(echo $dependencies_0) + elif [[ $level == "level_1" ]] ; then + dependencies_1="-l$dependency $dependencies_1" + dependencies_1=" $(for i in $dependencies_1; do echo $i ; done | sort)" + dependencies_1=$(echo $dependencies_1) + else + dependencies_2="-l$dependency $dependencies_2" + dependencies_2=" $(for i in $dependencies_2; do echo $i ; done | sort)" + dependencies_2=$(echo $dependencies_2) + fi + else + # sort is not available, so do not bother trying to sort. + if [[ $level == "level_0" ]] ; then + dependencies_0="-l$dependency $dependencies_0" + elif [[ $level == "level_1" ]] ; then + dependencies_1="-l$dependency $dependencies_1" + else + dependencies_2="-l$dependency $dependencies_2" + fi + fi + + dependencies_individual= + + if [[ $dependencies_0 != "" ]] ; then + dependencies_individual="$dependencies_0" + fi + + if [[ $dependencies_1 != "" ]] ; then + dependencies_individual="$dependencies_individual $dependencies_1" + fi + + if [[ $dependencies_2 != "" ]] ; then + dependencies_individual="$dependencies_individual $dependencies_2" + fi fi fi } diff --git a/level_0/f_console/data/build/settings b/level_0/f_console/data/build/settings index 7c849e4..bad7173 100644 --- a/level_0/f_console/data/build/settings +++ b/level_0/f_console/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_utf -lf_memory +build_libraries-individual -lf_memory -lf_utf build_sources_library console.c build_sources_program build_sources_headers console.h console-common.h diff --git a/level_0/f_conversion/data/build/settings b/level_0/f_conversion/data/build/settings index abc08fa..7686d31 100644 --- a/level_0/f_conversion/data/build/settings +++ b/level_0/f_conversion/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_utf -lf_memory +build_libraries-individual -lf_memory -lf_utf build_sources_library conversion.c build_sources_program build_sources_headers conversion.h conversion-common.h diff --git a/level_0/f_fss/data/build/settings b/level_0/f_fss/data/build/settings index c93199e..17e0545 100644 --- a/level_0/f_fss/data/build/settings +++ b/level_0/f_fss/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_utf -lf_memory +build_libraries-individual -lf_memory -lf_utf build_sources_library fss.c build_sources_program build_sources_headers fss.h fss-common.h fss_named.h fss_nest.h fss_quote.h fss_set.h diff --git a/level_0/f_iki/data/build/settings b/level_0/f_iki/data/build/settings index 39eba46..b13ebea 100644 --- a/level_0/f_iki/data/build/settings +++ b/level_0/f_iki/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_utf -lf_memory +build_libraries-individual -lf_memory -lf_utf build_sources_library iki.c private-iki.c build_sources_program build_sources_headers iki.h iki-common.h diff --git a/level_0/f_serialize/data/build/settings b/level_0/f_serialize/data/build/settings index d0f6cfc..98d859b 100644 --- a/level_0/f_serialize/data/build/settings +++ b/level_0/f_serialize/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_utf -lf_memory +build_libraries-individual -lf_memory -lf_utf build_sources_library serialize.c private-serialize.c build_sources_program build_sources_headers serialize.h serialize-common.h diff --git a/level_1/fl_color/data/build/settings b/level_1/fl_color/data/build/settings index 5254254..9c53b53 100644 --- a/level_1/fl_color/data/build/settings +++ b/level_1/fl_color/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_print -lf_file -lf_memory +build_libraries-individual -lf_file -lf_memory -lf_print build_sources_library color.c build_sources_program build_sources_headers color.h diff --git a/level_1/fl_console/data/build/settings b/level_1/fl_console/data/build/settings index 8daaed7..40c9d79 100644 --- a/level_1/fl_console/data/build/settings +++ b/level_1/fl_console/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_conversion -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_conversion -lf_memory -lf_utf build_sources_library console.c build_sources_program build_sources_headers console.h diff --git a/level_1/fl_conversion/data/build/settings b/level_1/fl_conversion/data/build/settings index 06cb000..fcdbe03 100644 --- a/level_1/fl_conversion/data/build/settings +++ b/level_1/fl_conversion/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_conversion -lf_utf -lf_memory +build_libraries-individual -lf_conversion -lf_memory -lf_utf build_sources_library conversion.c build_sources_program build_sources_headers conversion.h diff --git a/level_1/fl_directory/data/build/settings b/level_1/fl_directory/data/build/settings index 2f76bb1..84dbd40 100644 --- a/level_1/fl_directory/data/build/settings +++ b/level_1/fl_directory/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_path -lf_file -lf_directory -lf_utf -lf_memory +build_libraries-individual -lf_directory -lf_file -lf_memory -lf_path -lf_utf build_sources_library directory.c private-directory.c build_sources_program build_sources_headers directory.h diff --git a/level_1/fl_environment/data/build/settings b/level_1/fl_environment/data/build/settings index 58e59b3..c7fb98b 100644 --- a/level_1/fl_environment/data/build/settings +++ b/level_1/fl_environment/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_path -lf_environment -lf_utf -lf_memory +build_libraries-individual -lf_environment -lf_memory -lf_path -lf_utf build_sources_library environment.c build_sources_program build_sources_headers environment.h diff --git a/level_1/fl_fss/data/build/settings b/level_1/fl_fss/data/build/settings index 5247a0b..7a813e1 100644 --- a/level_1/fl_fss/data/build/settings +++ b/level_1/fl_fss/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_fss -lf_file -lf_utf -lf_memory +build_libraries-individual -lf_file -lf_fss -lf_memory -lf_utf build_sources_library private-fss.c fss_basic.c fss_basic_list.c fss_extended.c fss_extended_list.c build_sources_program build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_extended.h fss_extended_list.h fss_macro.h fss_status.h diff --git a/level_1/fl_iki/data/build/settings b/level_1/fl_iki/data/build/settings index 056c0c9..2ae8b8b 100644 --- a/level_1/fl_iki/data/build/settings +++ b/level_1/fl_iki/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_iki -lf_utf -lf_memory +build_libraries-individual -lf_iki -lf_memory -lf_utf build_sources_library iki.c build_sources_program build_sources_headers iki.h diff --git a/level_1/fl_print/data/build/settings b/level_1/fl_print/data/build/settings index 08757ef..dcfb180 100644 --- a/level_1/fl_print/data/build/settings +++ b/level_1/fl_print/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_print -lf_conversion -lf_utf -lf_memory +build_libraries-individual -lf_conversion -lf_memory -lf_print -lf_utf build_sources_library print.c build_sources_program build_sources_headers print.h diff --git a/level_1/fl_status/data/build/settings b/level_1/fl_status/data/build/settings index cbb48b4..22dde22 100644 --- a/level_1/fl_status/data/build/settings +++ b/level_1/fl_status/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_utf -lf_memory +build_libraries-individual -lf_memory -lf_utf build_sources_library status.c build_sources_program build_sources_headers status.h diff --git a/level_1/fl_string/data/build/settings b/level_1/fl_string/data/build/settings index b9d76a0..a5a780f 100644 --- a/level_1/fl_string/data/build/settings +++ b/level_1/fl_string/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_utf -lf_memory +build_libraries-individual -lf_memory -lf_utf build_sources_library string.c private-string.c build_sources_program build_sources_headers string.h diff --git a/level_1/fl_utf/data/build/settings b/level_1/fl_utf/data/build/settings index 92467c2..3b42ec3 100644 --- a/level_1/fl_utf/data/build/settings +++ b/level_1/fl_utf/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_utf -lf_memory +build_libraries-individual -lf_memory -lf_utf build_sources_library utf.c private-utf.c build_sources_program build_sources_headers utf.h diff --git a/level_1/fl_utf_file/data/build/settings b/level_1/fl_utf_file/data/build/settings index f13a495..fee6f82 100644 --- a/level_1/fl_utf_file/data/build/settings +++ b/level_1/fl_utf_file/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lf_file -lf_utf -lf_memory +build_libraries-individual -lf_file -lf_memory -lf_utf build_sources_library utf_file.c private-utf_file.c build_sources_program build_sources_headers utf_file.h diff --git a/level_2/fll_error/data/build/settings b/level_2/fll_error/data/build/settings index 649ceed..c03df46 100644 --- a/level_2/fll_error/data/build/settings +++ b/level_2/fll_error/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfl_string -lf_print -lf_file -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_file -lf_memory -lf_print -lf_utf -lfl_string build_sources_library error.c private-error.c build_sources_program build_sources_headers error.h error-common.h diff --git a/level_2/fll_execute/data/build/settings b/level_2/fll_execute/data/build/settings index b3842ac..0a67dd6 100644 --- a/level_2/fll_execute/data/build/settings +++ b/level_2/fll_execute/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfl_string -lfl_environment -lf_utf -lf_signal -lf_path -lf_file -lf_environment -lf_memory +build_libraries-individual -lf_environment -lf_file -lf_memory -lf_path -lf_signal -lf_utf -lfl_environment -lfl_string build_sources_library execute.c private-execute.c build_sources_program build_sources_headers execute.h diff --git a/level_2/fll_file/data/build/settings b/level_2/fll_file/data/build/settings index 055cb75..8f42a4b 100644 --- a/level_2/fll_file/data/build/settings +++ b/level_2/fll_file/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfl_directory -lf_path -lf_utf -lfl_color -lf_print -lf_file -lf_directory -lf_memory +build_libraries-individual -lf_directory -lf_file -lf_memory -lf_path -lf_print -lf_utf -lfl_color -lfl_directory build_sources_library file.c private-file.c build_sources_program build_sources_headers file.h diff --git a/level_2/fll_fss/data/build/settings b/level_2/fll_fss/data/build/settings index daaf14f..fb06e18 100644 --- a/level_2/fll_fss/data/build/settings +++ b/level_2/fll_fss/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfl_string -lfl_status -lfl_fss -lfl_conversion -lf_file -lf_fss -lf_conversion -lf_utf -lf_memory +build_libraries-individual -lf_conversion -lf_file -lf_fss -lf_memory -lf_utf -lfl_conversion -lfl_fss -lfl_status -lfl_string build_sources_library fss.c private-fss.c fss_basic.c fss_basic_list.c fss_extended.c fss_extended_list.c fss_status.c build_sources_program build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_extended.h fss_extended_list.h fss_status.h diff --git a/level_2/fll_iki/data/build/settings b/level_2/fll_iki/data/build/settings index 98d9f53..8a93c22 100644 --- a/level_2/fll_iki/data/build/settings +++ b/level_2/fll_iki/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfl_string -lfl_iki -lf_iki -lf_utf -lf_memory +build_libraries-individual -lf_iki -lf_memory -lf_utf -lfl_iki -lfl_string build_sources_library iki.c private-iki.c build_sources_program build_sources_headers iki.h diff --git a/level_2/fll_path/data/build/settings b/level_2/fll_path/data/build/settings index e3f3575..12d2454 100644 --- a/level_2/fll_path/data/build/settings +++ b/level_2/fll_path/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfl_string -lf_utf -lf_path -lf_memory +build_libraries-individual -lf_memory -lf_path -lf_utf -lfl_string build_sources_library path.c build_sources_program build_sources_headers path.h diff --git a/level_2/fll_program/data/build/settings b/level_2/fll_program/data/build/settings index 4dc8502..d261177 100644 --- a/level_2/fll_program/data/build/settings +++ b/level_2/fll_program/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfl_string -lfl_color -lf_print -lf_file -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_file -lf_memory -lf_print -lf_utf -lfl_color -lfl_string build_sources_library program.c build_sources_program build_sources_headers program.h diff --git a/level_2/fll_status/data/build/settings b/level_2/fll_status/data/build/settings index 388d563..88cdaef 100644 --- a/level_2/fll_status/data/build/settings +++ b/level_2/fll_status/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfl_string -lfl_status -lf_conversion -lf_utf -lf_memory +build_libraries-individual -lf_conversion -lf_memory -lf_utf -lfl_status -lfl_string build_sources_library status.c build_sources_program build_sources_headers status.h diff --git a/level_3/byte_dump/data/build/settings b/level_3/byte_dump/data/build/settings index 70771e3..9d9c0e9 100644 --- a/level_3/byte_dump/data/build/settings +++ b/level_3/byte_dump/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_program -lfll_error -lfl_utf -lfl_string -lfl_conversion -lfl_console -lfl_color -lf_print -lf_pipe -lf_file -lf_conversion -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_conversion -lf_file -lf_memory -lf_pipe -lf_print -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_string -lfl_utf -lfll_error -lfll_program build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library byte_dump.c private-byte_dump.c diff --git a/level_3/fake/data/build/settings b/level_3/fake/data/build/settings index 651782d..958c218 100644 --- a/level_3/fake/data/build/settings +++ b/level_3/fake/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_program -lfll_path -lfll_fss -lfll_file -lfll_execute -lfl_environment -lfll_error -lfl_utf -lfl_string -lfl_status -lfl_iki -lfl_fss -lfl_directory -lfl_conversion -lfl_console -lfl_color -lf_signal -lf_print -lf_path -lf_iki -lf_file -lf_fss -lf_environment -lf_directory -lf_conversion -lf_console -lf_account -lf_utf -lf_memory +build_libraries-individual -lf_account -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_iki -lf_memory -lf_path -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_iki -lfl_status -lfl_string -lfl_utf -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_path -lfll_program build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fake.c private-fake.c private-clean.c private-build.c private-make.c private-print.c private-skeleton.c diff --git a/level_3/firewall/data/build/settings b/level_3/firewall/data/build/settings index 88ff580..0fcd532 100644 --- a/level_3/firewall/data/build/settings +++ b/level_3/firewall/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_program -lfll_fss -lfll_execute -lfl_environment -lf_signal -lfll_error -lfl_string -lfl_status -lfl_fss -lfl_conversion -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_path -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_environment -lfl_fss -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_fss -lfll_program build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library firewall.c private-firewall.c diff --git a/level_3/fss_basic_list_read/data/build/settings b/level_3/fss_basic_list_read/data/build/settings index 5671dad..c804c24 100644 --- a/level_3/fss_basic_list_read/data/build/settings +++ b/level_3/fss_basic_list_read/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_print -lfl_fss -lfl_conversion -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_print -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_basic_list_read.c private-fss_basic_list_read.c diff --git a/level_3/fss_basic_list_write/data/build/settings b/level_3/fss_basic_list_write/data/build/settings index 8348d98..49876b5 100644 --- a/level_3/fss_basic_list_write/data/build/settings +++ b/level_3/fss_basic_list_write/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_fss -lfl_conversion -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_basic_list_write.c private-fss_basic_list_write.c diff --git a/level_3/fss_basic_read/data/build/settings b/level_3/fss_basic_read/data/build/settings index 9ba364a..05c7fa1 100644 --- a/level_3/fss_basic_read/data/build/settings +++ b/level_3/fss_basic_read/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_print -lfl_fss -lfl_conversion -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_print -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_basic_read.c private-fss_basic_read.c diff --git a/level_3/fss_basic_write/data/build/settings b/level_3/fss_basic_write/data/build/settings index 333aee4..f22bfdf 100644 --- a/level_3/fss_basic_write/data/build/settings +++ b/level_3/fss_basic_write/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_fss -lfl_conversion -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_basic_write.c private-fss_basic_write.c diff --git a/level_3/fss_extended_list_read/data/build/settings b/level_3/fss_extended_list_read/data/build/settings index afaaaeb..2f20a28 100644 --- a/level_3/fss_extended_list_read/data/build/settings +++ b/level_3/fss_extended_list_read/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_print -lfl_fss -lfl_conversion -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_print -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_extended_list_read.c private-fss_extended_list_read.c diff --git a/level_3/fss_extended_list_write/data/build/settings b/level_3/fss_extended_list_write/data/build/settings index 1ea864c..ffa49d2 100644 --- a/level_3/fss_extended_list_write/data/build/settings +++ b/level_3/fss_extended_list_write/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_fss -lfl_conversion -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_extended_list_write.c private-fss_extended_list_write.c diff --git a/level_3/fss_extended_read/data/build/settings b/level_3/fss_extended_read/data/build/settings index 6a985d7..41669b1 100644 --- a/level_3/fss_extended_read/data/build/settings +++ b/level_3/fss_extended_read/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_print -lfl_fss -lfl_console -lfl_conversion -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_print -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_extended_read.c private-fss_extended_read.c diff --git a/level_3/fss_extended_write/data/build/settings b/level_3/fss_extended_write/data/build/settings index 04861e4..d4c0141 100644 --- a/level_3/fss_extended_write/data/build/settings +++ b/level_3/fss_extended_write/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_fss -lfl_conversion -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_extended_write.c private-fss_extended_write.c diff --git a/level_3/fss_status_code/data/build/settings b/level_3/fss_status_code/data/build/settings index 2f748e8..5139378 100644 --- a/level_3/fss_status_code/data/build/settings +++ b/level_3/fss_status_code/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_status -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_utf -lfl_string -lfl_status -lfl_fss -lfl_conversion -lfl_console -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_conversion -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_status -lfl_string -lfl_utf -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program -lfll_status build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_status_code.c private-fss_status_code.c diff --git a/level_3/iki_read/data/build/settings b/level_3/iki_read/data/build/settings index 6c149cc..357659b 100644 --- a/level_3/iki_read/data/build/settings +++ b/level_3/iki_read/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_program -lfll_error -lfl_string -lfl_iki -lfl_conversion -lfl_console -lfl_color -lf_print -lf_pipe -lf_iki -lf_file -lf_conversion -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_conversion -lf_file -lf_iki -lf_memory -lf_pipe -lf_print -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_iki -lfl_string -lfll_error -lfll_program build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library iki_read.c private-iki_read.c diff --git a/level_3/iki_write/data/build/settings b/level_3/iki_write/data/build/settings index aa1be1d..b80b90f 100644 --- a/level_3/iki_write/data/build/settings +++ b/level_3/iki_write/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_program -lfll_error -lfll_iki -lfl_string -lfl_iki -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_iki -lf_file -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_conversion -lf_file -lf_iki -lf_memory -lf_pipe -lf_print -lf_utf -lfl_color -lfl_console -lfl_iki -lfl_string -lfll_error -lfll_iki -lfll_program build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library iki_write.c private-iki_write.c diff --git a/level_3/init/data/build/settings b/level_3/init/data/build/settings index 6d0e79a..097bdab 100644 --- a/level_3/init/data/build/settings +++ b/level_3/init/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_program -lfll_fss -lfl_conversion -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_fss -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_environment -lfl_fss -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_fss -lfll_program build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library init.c private-init.c diff --git a/level_3/status_code/data/build/settings b/level_3/status_code/data/build/settings index 64bcff2..c10e716 100644 --- a/level_3/status_code/data/build/settings +++ b/level_3/status_code/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_status -lfll_program -lfll_error -lfl_utf -lfl_string -lfl_status -lfl_conversion -lfl_console -lfl_color -lf_print -lf_pipe -lf_file -lf_conversion -lf_console -lf_utf -lf_memory +build_libraries-individual -lf_console -lf_conversion -lf_file -lf_memory -lf_pipe -lf_print -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_status -lfl_string -lfl_utf -lfll_error -lfll_program -lfll_status build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library status_code.c private-status_code.c -- 1.8.3.1