Update: bootstrap dependency functionality, fix missing dependencies, also ensure...

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.

diff --git a/build/level_0/settings b/build/level_0/settings
index 5775fb89ce30e1c2415fc44017d7c229fa3e530b..fa5997046450bea475f3cee520b01c0e0f3425a7 100644 (file)
--- 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 dfa8ba3a4046c1c51e4f569caab7292f8cc3f4f3..d2a35291111bdbf2ed1047ffb86c2968a975db71 100644 (file)
--- 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 616e7073098baab5f1d5c43ff52887739b393324..0ab15e919a48d10b1be43efce105f1189aeb7bed 100644 (file)
--- 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 8ce31575aa14a1c7e95319fbd41b127922c555e1..c8fe6f0ad78a770428a7017d499b44f1a88a4c0a 100644 (file)
--- 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 8bf3a490a537a7fd273915a475b225794d4df581..b74d023437843e7413a985a8f4f8ba7fb89dd14a 100644 (file)
--- 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 '\<level_[[:digit:]]/' | sed -e 's|level_||' -e 's|/$||')"
+
     echo
-    echo -e "${c_highlight}Building Dependencies For $c_reset$c_notice${name}$c_reset${c_highlight}.$c_reset"
+    echo -e "${c_highlight}Building Dependencies for $c_reset$c_notice${name}$c_reset${c_highlight}.$c_reset"
 
     if [[ ! -f ${directory}/data/build/dependencies ]] ; then
       echo -e "${c_error}ERROR: cannot build dependencies, failed to find $c_notice${directory}/data/build/dependencies$c_error.$c_reset"
@@ -489,14 +471,14 @@ package_dependencies_individual() {
             continue
           fi
 
-          package_dependencies_append "$sub_sub_level" "$sub_sub_dependency"
+          package_dependencies_individual_append "$sub_sub_level" "$sub_sub_dependency"
         done
 
         if [[ $failure != "" ]] ; then
           break;
         fi
 
-        package_dependencies_append "$sub_level" "$sub_dependency"
+        package_dependencies_individual_append "$sub_level" "$sub_dependency"
 
         if [[ $failure != "" ]] ; then
           break;
@@ -507,7 +489,7 @@ package_dependencies_individual() {
         break;
       fi
 
-      package_dependencies_append "$level" "$dependency"
+      package_dependencies_individual_append "$level" "$dependency"
 
       if [[ $failure != "" ]] ; then
         break;
@@ -520,21 +502,61 @@ package_dependencies_individual() {
 
     individual_dependencies=$(echo "$individual_dependencies" | sed -e 's|^[[:space:]]*||' -e 's|[[:space:]]*$||')
     if [[ $individual_dependencies != "" ]] ; then
-      echo -e "  $individual_dependencies"
+      echo -e " $individual_dependencies"
       individual_dependencies=" $individual_dependencies"
     fi
 
     settings=${directory}/data/build/settings
-    sed -i -e "s|^build_libraries_fll\>.*\$|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 a5f70e17dd738966be353c7d6239aef5e40e5c5a..f4e5b3ee3df8be3e23d828991b596a945583dffd 100644 (file)
--- 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 db80f8469c7561feb327f63116c4845278bf27da..6fcde1b1dde3c9041369830dbfc10ffa0f87ea6d 100644 (file)
--- 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 9c37f71c692b21d836d861a0e926e695864566c2..a7982aa77a4a89baccdb92da0d84d090b724c3f0 100644 (file)
--- 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 8bfeb98e4425f971e7b29579a9a5ccb2b8c1e435..07bd5b99f4fb8f4b2eb6116200ac437ba03d1cc4 100644 (file)
--- 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 dab8b02052a8fcaa1742458bb4b81cec741bea41..964b2e1af45e4467bcf128837dd07b0caba88d3f 100644 (file)
--- 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 9e9568d64998b296318714c7cb716d0830881b55..2d50eebce899920babf32783800beae0b58d4bb6 100644 (file)
--- 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 778d2abc73d36aad74062810e2c5e9274b6c2f7a..dd5f33d9b95a3b5b411ec7d6964f767286557615 100644 (file)
--- 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 1f38eae69b3bf5a7476db4f09bf9dfbd4396f4de..831cda32282f382ea6fa60e4f98c060ebfafac4d 100644 (file)
--- 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 36b43f8203ac17d75be68c9c741fd1d94a6bc9ad..4423432e10449841555e8b9a8eafc9d2e5beebb3 100644 (file)
--- 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 d74071b0262798b9e229fa1295b2e4efb658b0eb..b9ad7ca2b1a9a431d5b80b3ec1b9088184c424f1 100644 (file)
--- 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 db6549e93a99f9285d361dd64e00c241c62723c4..4e112c27c6eeca913259a1dbca674a2f55c2eca4 100644 (file)
--- 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 51b45479da209301075a083eccb9d5a68cc6e987..444b5d0c74f36c23151b2949129b710761c0c607 100644 (file)
--- 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 d9e11704ecf6a79e2808287e3f1e53132b98caa0..e32703e18625f6c7378ec127de6236ea09d9767f 100644 (file)
--- 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 0c9487e9b6cb93787c44e8936a03dee94d583e4c..309ed82285b838e53ab6f1318f6c8692cde6c7bc 100644 (file)
--- 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 c5451f51ecb91957ad3295f4b3adef95e6d1b5f3..819a87bc875888f822897d418f10a018345a289d 100644 (file)
--- 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 25952cba203ea2c291d06e2e2c4c33d4c0d9006e..a67c32487fcb7310f6672c3aa28878002cd9e834 100644 (file)
--- 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 e91f2790283f44887b93aa9801eaf5c6b72bd614..e9665a5ab063db379aff474fc253aeaf3705d1ef 100644 (file)
--- 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 d07f74e85c177be8f33045f55a2463d3ff0bae33..740e72e0c8490f643d2d38dc9e5db659df39e8e4 100644 (file)
--- 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 1b11454214aa54e468aafebbe54733bc60164fe6..92c31030ee7988b7b96e6d3781b6d71f4d490580 100644 (file)
--- 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 01d9e29119cb326727f904d6a921bb7192f00712..a1f03307c75262b9a8dc14c3216cb148c0be6fa1 100644 (file)
--- 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 09da2e6d02e1cd48923291f3d652d907eb37b8d9..43b1442bf3fbfbbb4629b653662666d56f2595b2 100644 (file)
--- 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 77f1a196e6b946050e5f630fed1187501bd8974f..eba1ece8f82ca18425c4d67ce2e1b5697133a2c4 100644 (file)
--- 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 24fa857c98be41fc71fa91319614b6c53ad59567..45705f9527d7d8d2b1a4eaab88e0e926d4dd5ebf 100644 (file)
--- 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 8089df0f30eb157727e2424b9d21bd98937c2fa1..c9c5b31d732e3111fbeeb4934e7e7a96001c9119 100644 (file)
--- 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 c24711d990f7d683ccdcfdb91b85571a630d0de1..8cbe01ac99639551c22e7171f3e39110f4c9c66c 100644 (file)
--- 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 33ca91ac68217ea2f46cb6d67b9127f883357c86..a3ce01119f52f63e5ba68c50bf7ef2ac849db8fa 100644 (file)
--- 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