From bcac462ff2de57a62ca42de895eadec6caf7e789 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 7 Jun 2020 14:05:29 -0500 Subject: [PATCH] Update: bootstrap dependency functionality, fix missing dependencies, also ensure level and monolithic It seems I wrote a dependency generator to make my life easier and then I went and forgot about it. Update this to work with the more recent changes to the build settings structure. While I am at it, generate all of the dependencies and save the generated dependencies. This exposed a typoe in the dependencies file, now fixed. Might as well make sure the level and monolithic dependencies are generated as well. --- build/level_0/settings | 2 +- build/level_1/settings | 2 +- build/level_2/settings | 6 +- build/monolithic/settings | 4 +- build/scripts/package.sh | 133 +++++++++++++-------- level_0/f_file/data/build/settings | 2 +- level_1/fl_color/data/build/settings | 2 +- level_1/fl_console/data/build/dependencies | 2 +- level_1/fl_console/data/build/settings | 2 +- level_1/fl_directory/data/build/settings | 2 +- level_1/fl_fss/data/build/settings | 2 +- level_1/fl_print/data/build/settings | 2 +- level_2/fll_directory/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_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 +- 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/init/data/build/settings | 2 +- level_3/status_code/data/build/settings | 2 +- 31 files changed, 115 insertions(+), 84 deletions(-) diff --git a/build/level_0/settings b/build/level_0/settings index 5775fb8..fa59970 100644 --- a/build/level_0/settings +++ b/build/level_0/settings @@ -22,7 +22,7 @@ build_libraries -lc build_libraries-level build_sources_library console.c conversion.c directory.c private-directory.c environment.c private-environment.c file.c private-file.c memory.c path.c pipe.c print.c utf.c private-utf.c build_sources_program -build_sources_headers color.h console.h conversion.h directory.h directory_type.h environment.h file.h fss.h memory.h path_fll.h path_filesystem.h path.h pipe.h print.h serialized.h socket.h status.h status_array.h string.h type.h type_array.h utf.h +build_sources_headers color.h console.h conversion.h directory.h directory_type.h environment.h file.h fss.h memory.h path.h pipe.h print.h serialized.h socket.h status.h status_array.h string.h type.h type_array.h utf.h build_sources_script build_sources_setting build_script yes diff --git a/build/level_1/settings b/build/level_1/settings index dfa8ba3..d2a3529 100644 --- a/build/level_1/settings +++ b/build/level_1/settings @@ -22,7 +22,7 @@ build_libraries -lc build_libraries-level -lfll_0 build_sources_library color.c console.c directory.c private-directory.c file.c fss.c fss_basic.c fss_basic_list.c fss_extended.c fss_extended_list.c print.c serialized.c private-serialized.c socket.c status.c string.c private-string.c utf.c private-utf.c utf_file.c private-utf_file.c build_sources_program -build_sources_headers color.h console.h directory.h file.h fss.h fss_basic.h fss_basic_list.h fss_status.h fss_extended.h fss_extended_list.h fss_macro.h print.h serialized.h socket.h status.h string.h utf.h utf_file.h +build_sources_headers color.h console.h directory.h file.h fss.h fss_basic.h fss_basic_list.h fss_extended.h fss_extended_list.h fss_macro.h fss_status.h print.h serialized.h socket.h status.h string.h utf.h utf_file.h build_sources_script build_sources_setting build_script yes diff --git a/build/level_2/settings b/build/level_2/settings index 616e707..0ab15e9 100644 --- a/build/level_2/settings +++ b/build/level_2/settings @@ -19,10 +19,10 @@ build_compiler gcc build_language c build_linker ar build_libraries -lc -build_libraries-level -lfll_0 -lfll_1 -build_sources_library execute.c private-execute.c file.c fss.c fss_basic.c fss_basic_list.c fss_extended.c fss_extended_list.c fss_status.c program.c status.c +build_libraries-level -lfll_1 -lfll_0 +build_sources_library directory.c execute.c private-execute.c file.c fss.c fss_basic.c fss_basic_list.c fss_extended.c fss_extended_list.c fss_status.c program.c status.c build_sources_program -build_sources_headers execute.h file.h fss.h fss_basic.h fss_basic_list.h fss_extended.h fss_extended_list.h fss_status.h program.h status.h +build_sources_headers directory.h execute.h file.h fss.h fss_basic.h fss_basic_list.h fss_extended.h fss_extended_list.h fss_status.h program.h status.h build_sources_script build_sources_setting build_script yes diff --git a/build/monolithic/settings b/build/monolithic/settings index 8ce3157..c8fe6f0 100644 --- a/build/monolithic/settings +++ b/build/monolithic/settings @@ -20,9 +20,9 @@ build_language c build_linker ar build_libraries -lc build_libraries-monolithic -build_sources_library level_0/console.c level_0/conversion.c level_0/directory.c level_0/private-directory.c level_0/environment.c level_0/private-environment.c level_0/file.c level_0/private-file.c level_0/memory.c level_0/path.c level_0/pipe.c level_0/print.c level_0/utf.c level_0/private-utf.c level_1/color.c level_1/console.c level_1/directory.c level_1/private-directory.c level_1/file.c level_1/fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_extended.c level_1/fss_extended_list.c level_1/print.c level_1/serialized.c level_1/private-serialized.c level_1/socket.c level_1/status.c level_1/string.c level_1/private-string.c level_1/utf.c level_1/private-utf.c level_1/utf_file.c level_1/private-utf_file.c level_2/execute.c level_2/private-execute.c level_2/file.c level_2/fss.c level_2/fss_basic.c level_2/fss_basic_list.c level_2/fss_extended.c level_2/fss_extended_list.c level_2/fss_status.c level_2/program.c level_2/status.c +build_sources_library level_0/console.c level_0/conversion.c level_0/directory.c level_0/private-directory.c level_0/environment.c level_0/private-environment.c level_0/file.c level_0/private-file.c level_0/memory.c level_0/path.c level_0/pipe.c level_0/print.c level_0/utf.c level_0/private-utf.c level_1/color.c level_1/console.c level_1/directory.c level_1/private-directory.c level_1/file.c level_1/fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_extended.c level_1/fss_extended_list.c level_1/print.c level_1/serialized.c level_1/private-serialized.c level_1/socket.c level_1/status.c level_1/string.c level_1/private-string.c level_1/utf.c level_1/private-utf.c level_1/utf_file.c level_1/private-utf_file.c level_2/directory.c level_2/execute.c level_2/private-execute.c level_2/file.c level_2/fss.c level_2/fss_basic.c level_2/fss_basic_list.c level_2/fss_extended.c level_2/fss_extended_list.c level_2/fss_status.c level_2/program.c level_2/status.c build_sources_program -build_sources_headers level_0/color.h level_0/console.h level_0/conversion.h level_0/directory.h level_0/directory_type.h level_0/environment.h level_0/file.h level_0/fss.h level_0/memory.h level_0/path_fll.h level_0/path_filesystem.h level_0/path.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/socket.h level_0/status.h level_0/status_array.h level_0/string.h level_0/type.h level_0/type_array.h level_0/utf.h level_1/color.h level_1/console.h level_1/directory.h level_1/file.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_status.h level_1/fss_extended.h level_1/fss_extended_list.h level_1/fss_macro.h level_1/print.h level_1/serialized.h level_1/socket.h level_1/status.h level_1/string.h level_1/utf.h level_1/utf_file.h level_2/execute.h level_2/file.h level_2/fss.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_extended.h level_2/fss_extended_list.h level_2/fss_status.h level_2/program.h level_2/status.h +build_sources_headers level_0/color.h level_0/console.h level_0/conversion.h level_0/directory.h level_0/directory_type.h level_0/environment.h level_0/file.h level_0/fss.h level_0/memory.h level_0/path.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/socket.h level_0/status.h level_0/status_array.h level_0/string.h level_0/type.h level_0/type_array.h level_0/utf.h level_1/color.h level_1/console.h level_1/directory.h level_1/file.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_extended.h level_1/fss_extended_list.h level_1/fss_macro.h level_1/fss_status.h level_1/print.h level_1/serialized.h level_1/socket.h level_1/status.h level_1/string.h level_1/utf.h level_1/utf_file.h level_2/directory.h level_2/execute.h level_2/file.h level_2/fss.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_extended.h level_2/fss_extended_list.h level_2/fss_status.h level_2/program.h level_2/status.h build_sources_script build_sources_setting build_script yes diff --git a/build/scripts/package.sh b/build/scripts/package.sh index 8bf3a49..b74d023 100644 --- a/build/scripts/package.sh +++ b/build/scripts/package.sh @@ -378,29 +378,9 @@ package_create_base_files() { fi } -package_dependencies_append() { - local level="$1" - local dependency="$2" - local settings= - local libraries= - - settings=${path_sources}${level}/${dependency}/data/build/settings - if [[ ! -f $settings ]] ; then - echo -e "${c_error}ERROR: failed to find dependency settings file $c_notice$settings$c_error.$c_reset" - failure=1 - return - fi - - libraries=$(grep -o '^build_sources_library\>.*$' $settings | sed -e 's|^build_sources_library\>||' -e 's|^[[:space:]]*||' -e 's|[[:space:]]*$||') - if [[ $libraries != "" ]] ; then - if [[ $(echo $individual_dependencies | grep -o "\-l$dependency\>") == "" ]] ; then - individual_dependencies="-l$dependency $individual_dependencies" - fi - fi -} - package_dependencies_individual() { local level= + local level_current= local directory= local settings= local name= @@ -417,8 +397,10 @@ package_dependencies_individual() { 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/||")" + level_current="$(echo $directory | grep -o '\.*\$|build_libraries_fll$individual_dependencies|" $settings + sed -i -e "s|^\s*build_libraries-individual\>.*\$|build_libraries-individual$individual_dependencies|" $settings if [[ $? -ne 0 ]] ; then echo -e "${c_error}ERROR: failed to update settings file $c_notice${settings}$c_error.$c_reset" failure=1 return fi + + # all level 3 are expected to support all modes: individual, level, and monolithic. + if [[ $level_current == "3" ]] ; then + sed -i -e "s|^\s*build_libraries-level\>.*\$|build_libraries-level -lfll_2 -lfll_1 -lfll_0|" $settings + + if [[ $? -ne 0 ]] ; then + echo -e "${c_error}ERROR: failed to update settings file $c_notice${settings}$c_error.$c_reset" + failure=1 + return + fi + + sed -i -e "s|^\s*build_libraries-monolithic\>.*\$|build_libraries-monolithic -lfll|" $settings + + if [[ $? -ne 0 ]] ; then + echo -e "${c_error}ERROR: failed to update settings file $c_notice${settings}$c_error.$c_reset" + failure=1 + return + fi + fi done } +package_dependencies_individual_append() { + local level="$1" + local dependency="$2" + local settings= + local libraries= + + settings=${path_sources}${level}/${dependency}/data/build/settings + if [[ ! -f $settings ]] ; then + echo -e "${c_error}ERROR: failed to find dependency settings file $c_notice$settings$c_error.$c_reset" + failure=1 + return + fi + + 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" + fi + fi +} + package_dependencies_level() { local directory= local name= @@ -544,25 +566,26 @@ package_dependencies_level() { local header= local headers= - package_dependencies_level_update "level_0" + package_dependencies_level_update "level_0" "" if [[ $failure != "" ]] ; then return; fi - package_dependencies_level_update "level_1" + package_dependencies_level_update "level_1" " -lfll_0" if [[ $failure != "" ]] ; then return; fi - package_dependencies_level_update "level_2" + package_dependencies_level_update "level_2" " -lfll_1 -lfll_0" } package_dependencies_level_update() { local level="$1" - local level_libraries= - local level_headers= + local level_libraries="$2" + local level_sources_library= + local level_sources_headers= local monolithic_libraries= local monolithic_headers= @@ -579,15 +602,15 @@ package_dependencies_level_update() { return fi - libraries=$(grep -o '^build_sources_library\>.*$' $settings | sed -e 's|^build_sources_library\>||' -e 's|^[[:space:]]*||' -e 's|[[:space:]]*$||') + libraries=$(grep -o '^\s*build_sources_library\>.*$' $settings | sed -e 's|^\s*build_sources_library\>||' -e 's|^[[:space:]]*||' -e 's|[[:space:]]*$||') for library in $libraries ; do - level_libraries="$level_libraries $library" + level_sources_library="$level_sources_library $library" monolithic_libraries="$monolithic_libraries $level/$library" done - headers=$(grep -o '^build_sources_headers\>.*$' $settings | sed -e 's|^build_sources_headers\>||' -e 's|^[[:space:]]*||' -e 's|[[:space:]]*$||') + headers=$(grep -o '^\s*build_sources_headers\>.*$' $settings | sed -e 's|^\s*build_sources_headers\>||' -e 's|^[[:space:]]*||' -e 's|[[:space:]]*$||') for header in $headers ; do - level_headers="$level_headers $header" + level_sources_headers="$level_sources_headers $header" monolithic_headers="$monolithic_headers $level/$header" done done @@ -600,13 +623,21 @@ package_dependencies_level_update() { return fi - level_libraries=$(echo "$level_libraries" | sed -e 's|^[[:space:]]*||' -e 's|[[:space:]]*$||') - if [[ $level_libraries != "" ]] ; then - echo " $level_libraries" - level_libraries=" $level_libraries" + sed -i -e "s|^\s*build_libraries-level\>.*\$|build_libraries-level$level_libraries|" $settings + + if [[ $? -ne 0 ]] ; then + echo -e "${c_error}ERROR: failed to update libraries for settings file $c_notice$settings$c_error.$c_reset" + failure=1 + return + fi + + level_sources_library=$(echo "$level_sources_library" | sed -e 's|^[[:space:]]*||' -e 's|[[:space:]]*$||') + if [[ $level_sources_library != "" ]] ; then + echo " $level_sources_library" + level_sources_library=" $level_sources_library" fi - sed -i -e "s|^build_sources_library\>.*\$|build_sources_library$level_libraries|" $settings + sed -i -e "s|^\s*build_sources_library\>.*\$|build_sources_library$level_sources_library|" $settings if [[ $? -ne 0 ]] ; then echo -e "${c_error}ERROR: failed to update libraries for settings file $c_notice$settings$c_error.$c_reset" @@ -614,13 +645,13 @@ package_dependencies_level_update() { return fi - level_headers=$(echo "$level_headers" | sed -e 's|^[[:space:]]*||' -e 's|[[:space:]]*$||') - if [[ $level_headers != "" ]] ; then - echo " $level_headers" - level_headers=" $level_headers" + level_sources_headers=$(echo "$level_sources_headers" | sed -e 's|^[[:space:]]*||' -e 's|[[:space:]]*$||') + if [[ $level_sources_headers != "" ]] ; then + echo " $level_sources_headers" + level_sources_headers=" $level_sources_headers" fi - sed -i -e "s|^build_sources_headers\>.*\$|build_sources_headers$level_headers|" $settings + sed -i -e "s|^\s*build_sources_headers\>.*\$|build_sources_headers$level_sources_headers|" $settings if [[ $? -ne 0 ]] ; then echo -e "${c_error}ERROR: failed to update headers for settings file $c_notice$settings$c_error.$c_reset" @@ -690,11 +721,11 @@ package_dependencies_monolithic() { settings=${path_sources}/build/monolithic/settings if [[ $monolithic_libraries != "" ]] ; then - echo " $monolithic_libraries" + echo " $monolithic_libraries" monolithic_libraries=" $monolithic_libraries" fi - sed -i -e "s|^build_sources_library\>.*\$|build_sources_library$monolithic_libraries|" $settings + sed -i -e "s|^\s*build_sources_library\>.*\$|build_sources_library$monolithic_libraries|" $settings if [[ $? -ne 0 ]] ; then echo -e "${c_error}ERROR: failed to update libraries for settings file $c_notice$settings$c_error.$c_reset" @@ -704,11 +735,11 @@ package_dependencies_monolithic() { if [[ $monolithic_headers != "" ]] ; then - echo " $monolithic_headers" + echo " $monolithic_headers" monolithic_headers=" $monolithic_headers" fi - sed -i -e "s|^build_sources_headers\>.*\$|build_sources_headers$monolithic_headers|" $settings + sed -i -e "s|^\s*build_sources_headers\>.*\$|build_sources_headers$monolithic_headers|" $settings if [[ $? -ne 0 ]] ; then echo -e "${c_error}ERROR: failed to update headers for settings file $c_notice$settings$c_error.$c_reset" @@ -1166,10 +1197,10 @@ package_cleanup() { unset package_build unset package_create_base_files unset package_dependencies_individual + unset package_dependencies_individual_append unset package_dependencies_level unset package_dependencies_level_update unset package_dependencies_monolithic - unset package_dependencies_append unset package_operation_clean unset package_operation_copy_package unset package_operation_individual diff --git a/level_0/f_file/data/build/settings b/level_0/f_file/data/build/settings index a5f70e1..f4e5b3e 100644 --- a/level_0/f_file/data/build/settings +++ b/level_0/f_file/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_language c build_linker ar build_libraries -lc -build_libraries-individual +build_libraries-individual -lf_memory build_sources_library file.c private-file.c build_sources_program build_sources_headers file.h diff --git a/level_1/fl_color/data/build/settings b/level_1/fl_color/data/build/settings index db80f84..6fcde1b 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lf_file -lf_print -lf_memory +build_libraries-individual -lf_print -lf_file -lf_memory build_sources_library color.c build_sources_program build_sources_headers color.h diff --git a/level_1/fl_console/data/build/dependencies b/level_1/fl_console/data/build/dependencies index 9c37f71..a7982aa 100644 --- a/level_1/fl_console/data/build/dependencies +++ b/level_1/fl_console/data/build/dependencies @@ -3,5 +3,5 @@ f_status f_memory f_string f_console -f_convesion +f_conversion f_utf diff --git a/level_1/fl_console/data/build/settings b/level_1/fl_console/data/build/settings index 8bfeb98..07bd5b9 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lf_console -lf_conversion -lf_utf -lf_memory +build_libraries-individual -lf_conversion -lf_console -lf_utf -lf_memory build_sources_library console.c build_sources_program build_sources_headers console.h diff --git a/level_1/fl_directory/data/build/settings b/level_1/fl_directory/data/build/settings index dab8b02..964b2e1 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lf_file -lf_directory -lf_path -lf_utf -lf_memory +build_libraries-individual -lf_path -lf_file -lf_directory -lf_utf -lf_memory build_sources_library directory.c private-directory.c build_sources_program build_sources_headers directory.h diff --git a/level_1/fl_fss/data/build/settings b/level_1/fl_fss/data/build/settings index 9e9568d..2d50eeb 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lf_conversion -lf_file -lf_utf -lf_memory +build_libraries-individual -lf_file -lf_conversion -lf_utf -lf_memory build_sources_library 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_print/data/build/settings b/level_1/fl_print/data/build/settings index 778d2ab..dd5f33d 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lf_conversion -lf_print -lf_utf -lf_memory +build_libraries-individual -lf_print -lf_conversion -lf_utf -lf_memory build_sources_library print.c build_sources_program build_sources_headers print.h diff --git a/level_2/fll_directory/data/build/settings b/level_2/fll_directory/data/build/settings index 1f38eae..831cda3 100644 --- a/level_2/fll_directory/data/build/settings +++ b/level_2/fll_directory/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_language c build_linker ar build_libraries -lc -build_libraries-individual -lfl_string -lf_directory -lf_file -lf_memory +build_libraries-individual -lfl_string -lf_utf -lf_file -lf_directory -lf_memory build_sources_library directory.c build_sources_program build_sources_headers directory.h diff --git a/level_2/fll_execute/data/build/settings b/level_2/fll_execute/data/build/settings index 36b43f8..4423432 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lfl_string -lf_file -lf_environment -lf_path -lf_memory +build_libraries-individual -lfl_string -lf_path -lf_utf -lf_file -lf_environment -lf_memory 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 d74071b..b9ad7ca 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lfl_color -lf_utf -lf_memory +build_libraries-individual -lfl_color -lf_print -lf_file -lf_utf -lf_memory build_sources_library 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 db6549e..4e112c2 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lfl_status -lfl_string -lfl_fss -lf_conversion -lf_file -lf_utf -lf_memory +build_libraries-individual -lfl_string -lfl_status -lfl_fss -lf_file -lf_conversion -lf_utf -lf_memory build_sources_library 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_program/data/build/settings b/level_2/fll_program/data/build/settings index 51b4547..444b5d0 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lfl_color -lfl_string -lf_console -lf_file -lf_print -lf_utf -lf_memory +build_libraries-individual -lfl_string -lfl_color -lf_print -lf_file -lf_console -lf_utf -lf_memory 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 d9e1170..e32703e 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lfl_status -lfl_string -lf_conversion -lf_utf -lf_memory +build_libraries-individual -lfl_string -lfl_status -lf_conversion -lf_utf -lf_memory 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 0c9487e..309ed82 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lfll_program -lfl_color -lfl_console -lfl_file -lfl_string -lfl_utf -lf_console -lf_conversion -lf_file -lf_pipe -lf_print -lf_utf -lf_memory +build_libraries-individual -lfll_program -lfl_utf -lfl_string -lfl_file -lfl_console -lfl_color -lf_print -lf_pipe -lf_file -lf_conversion -lf_console -lf_utf -lf_memory 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 c5451f5..819a87b 100644 --- a/level_3/fake/data/build/settings +++ b/level_3/fake/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_language c build_linker ar build_libraries -lc -build_libraries-individual -lfll_execute -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_directory -lfl_file -lfl_fss -lfl_status -lfl_string -lfl_utf -lf_environment -lf_file -lf_console -lf_conversion -lf_directory -lf_path -lf_print -lf_utf -lf_memory +build_libraries-individual -lfll_program -lfll_execute -lfll_fss -lfl_utf -lfl_string -lfl_status -lfl_fss -lfl_file -lfl_directory -lfl_console -lfl_color -lf_print -lf_path -lf_file -lf_environment -lf_directory -lf_conversion -lf_console -lf_utf -lf_memory 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 25952cb..a67c324 100644 --- a/level_3/firewall/data/build/settings +++ b/level_3/firewall/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_language c build_linker ar build_libraries -lc -build_libraries-individual -lfll_execute -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_file -lfl_fss -lfl_status -lfl_string -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory +build_libraries-individual -lfll_program -lfll_fss -lfll_execute -lfl_string -lfl_status -lfl_fss -lfl_file -lfl_console -lf_conversion -lfl_color -lf_file -lf_print -lf_pipe -lf_path -lf_environment -lf_directory -lf_console -lf_utf -lf_memory 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 e91f279..e9665a5 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lfll_execute -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_file -lfl_fss -lfl_print -lfl_status -lfl_string -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory +build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfll_execute -lf_path -lfl_string -lfl_status -lfl_print -lfl_fss -lfl_file -lfl_console -lf_conversion -lfl_color -lf_file -lf_print -lf_pipe -lf_environment -lf_directory -lf_console -lf_utf -lf_memory 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 d07f74e..740e72e 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lfll_program -lfll_execute -lfll_file -lfll_fss -lfl_status -lfl_string -lfl_fss -lfl_file -lfl_console -lfl_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory +build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfll_execute -lf_path -lfl_string -lfl_status -lfl_fss -lfl_file -lfl_console -lf_conversion -lfl_color -lf_file -lf_print -lf_pipe -lf_environment -lf_directory -lf_console -lf_utf -lf_memory build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library 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 1b11454..92c3103 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lfll_execute -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_file -lfl_fss -lfl_print -lfl_status -lfl_string -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory +build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfll_execute -lf_path -lfl_string -lfl_status -lfl_print -lfl_fss -lfl_file -lfl_console -lf_conversion -lfl_color -lf_file -lf_print -lf_pipe -lf_environment -lf_directory -lf_console -lf_utf -lf_memory 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 01d9e29..a1f0330 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lfll_execute -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_fss -lfl_file -lfl_status -lfl_string -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory +build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfll_execute -lf_path -lfl_string -lfl_status -lfl_fss -lfl_file -lfl_console -lf_conversion -lfl_color -lf_file -lf_print -lf_pipe -lf_environment -lf_directory -lf_console -lf_utf -lf_memory build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library 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 09da2e6..43b1442 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lfll_execute -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_file -lfl_fss -lfl_print -lfl_status -lfl_string -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory +build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfll_execute -lf_path -lfl_string -lfl_status -lfl_print -lfl_fss -lfl_file -lfl_console -lf_conversion -lfl_color -lf_file -lf_print -lf_pipe -lf_environment -lf_directory -lf_console -lf_utf -lf_memory 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_read/data/build/settings b/level_3/fss_extended_read/data/build/settings index 77f1a19..eba1ece 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lfll_execute -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_file -lfl_fss -lfl_print -lfl_status -lfl_string -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory +build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfll_execute -lf_path -lfl_string -lfl_status -lfl_print -lfl_fss -lfl_file -lfl_console -lf_conversion -lfl_color -lf_file -lf_print -lf_pipe -lf_environment -lf_directory -lf_console -lf_utf -lf_memory 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 24fa857..45705f9 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lfll_execute -lfll_file -lfll_fss -lfll_program -lfl_status -lfl_string -lfl_fss -lfl_file -lfl_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory +build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfll_execute -lf_path -lfl_string -lfl_status -lfl_fss -lf_conversion -lfl_file -lfl_color -lf_file -lf_print -lf_pipe -lf_environment -lf_directory -lf_console -lf_utf -lf_memory build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library 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 8089df0..c9c5b31 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lfll_execute -lfll_file -lfll_fss -lfll_program -lfll_status -lfl_console -lfl_color -lfl_file -lfl_fss -lfl_status -lfl_string -lfl_utf -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory +build_libraries-individual -lfll_status -lfll_program -lfll_fss -lfll_file -lfll_execute -lf_path -lfl_utf -lfl_string -lfl_status -lfl_fss -lfl_file -lfl_console -lfl_color -lf_print -lf_pipe -lf_file -lf_environment -lf_directory -lf_conversion -lf_console -lf_utf -lf_memory 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/init/data/build/settings b/level_3/init/data/build/settings index c24711d..8cbe01a 100644 --- a/level_3/init/data/build/settings +++ b/level_3/init/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_language c build_linker ar build_libraries -lc -build_libraries-individual -lfll_execute -lfll_fss -lfll_program -lfl_console -lfl_color -lfl_file -lfl_fss -lfl_status -lfl_string -lf_file -lf_console -lf_conversion -lf_directory -lf_environment -lf_path -lf_pipe -lf_print -lf_utf -lf_memory +build_libraries-individual -lfll_program -lfll_fss -lfll_execute -lf_path -lfl_string -lfl_status -lfl_fss -lfl_file -lfl_console -lf_conversion -lfl_color -lf_file -lf_print -lf_pipe -lf_environment -lf_directory -lf_console -lf_utf -lf_memory 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 33ca91a..a3ce011 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_language c build_linker ar build_libraries -lc -build_libraries-individual -lfll_program -lfll_status -lfl_color -lfl_console -lfl_file -lfl_status -lfl_string -lfl_utf -lf_console -lf_conversion -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory +build_libraries-individual -lfll_status -lfll_program -lfl_utf -lfl_string -lfl_status -lfl_file -lfl_console -lfl_color -lf_print -lf_pipe -lf_file -lf_conversion -lf_console -lf_utf -lf_memory 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