Progress: featureless make

In particular, defines file to skeleton build.

diff --git a/level_3/fake/c/fake.c b/level_3/fake/c/fake.c
index 45327409da2ccd8b931a2764bafa298030a40299..656ba06bb5536bfaee5d66c47b180706273d74da 100644 (file)
--- a/level_3/fake/c/fake.c
+++ b/level_3/fake/c/fake.c
@@ -403,6 +403,7 @@ extern "C" {
     f_macro_string_dynamic_delete_simple(data->path_work_programs_shared);
     f_macro_string_dynamic_delete_simple(data->path_work_programs_static);
 
+    f_macro_string_dynamic_delete_simple(data->file_data_build_defines);
     f_macro_string_dynamic_delete_simple(data->file_data_build_dependencies);
     f_macro_string_dynamic_delete_simple(data->file_data_build_settings);
     f_macro_string_dynamic_delete_simple(data->file_documents_readme);

diff --git a/level_3/fake/c/fake.h b/level_3/fake/c/fake.h
index 4d29261c7336b4b60a2bc9d7dcbac7169c50a411..ca20d8a4aa04d6685fa6bc66992fbc6899be32eb 100644 (file)
--- a/level_3/fake/c/fake.h
+++ b/level_3/fake/c/fake.h
@@ -199,12 +199,14 @@ extern "C" {
 #endif // _di_fake_path_
 
 #ifndef _di_fake_file_
+  #define fake_file_defines      "defines"
   #define fake_file_dependencies "dependencies"
   #define fake_file_process_post "process_post.sh"
   #define fake_file_process_pre  "process_pre.sh"
   #define fake_file_readme       "readme"
   #define fake_file_settings     "settings"
 
+  #define fake_file_defines_length      7
   #define fake_file_dependencies_length 12
   #define fake_file_process_post_length 15
   #define fake_file_process_pre_length  14
@@ -461,6 +463,7 @@ extern "C" {
     f_string_dynamic path_work_programs_shared;
     f_string_dynamic path_work_programs_static;
 
+    f_string_dynamic file_data_build_defines;
     f_string_dynamic file_data_build_dependencies;
     f_string_dynamic file_data_build_settings;
     f_string_dynamic file_documents_readme;
@@ -514,6 +517,7 @@ extern "C" {
       f_string_dynamic_initialize, \
       f_string_dynamic_initialize, \
       f_string_dynamic_initialize, \
+      f_string_dynamic_initialize, \
       fl_color_context_initialize, \
     }
 #endif // _di_fake_data_

diff --git a/level_3/fake/c/private-build.c b/level_3/fake/c/private-build.c
index 2b7a1aba2c4620dbbd14a2744ad2b2aeaa484e75..5897e3b0192ad71ec1727584be2dc896c8969cd7 100644 (file)
--- a/level_3/fake/c/private-build.c
+++ b/level_3/fake/c/private-build.c
@@ -153,9 +153,11 @@ extern "C" {
       }
     }
 
-    int results = 0;
+    {
+      int result = 0;
 
-    status = fll_execute_path(path.string, arguments, &results);
+      status = fll_execute_path(path.string, arguments, &result);
+    }
 
     if (f_status_is_error(status)) {
       if (f_status_set_fine(status) == f_failure) {

diff --git a/level_3/fake/c/private-fake.c b/level_3/fake/c/private-fake.c
index 93aa2c194b4fbc4ac763c953fe473a21f7926a64..51b5d4b1e3d6a88638997a5dd47a029ea9913922 100644 (file)
--- a/level_3/fake/c/private-fake.c
+++ b/level_3/fake/c/private-fake.c
@@ -129,7 +129,7 @@ extern "C" {
       const uint8_t parameters_length[] = {
         3,
         3,
-        2,
+        3,
         1,
       };
 
@@ -146,6 +146,7 @@ extern "C" {
       };
 
       f_string_dynamic *parameters_value_2[] = {
+        &data->file_data_build_defines,
         &data->file_data_build_dependencies,
         &data->file_data_build_settings,
       };
@@ -179,6 +180,7 @@ extern "C" {
         fake_path_part_script,
         fake_path_part_shared,
         fake_path_part_static,
+        fake_file_defines,
         fake_file_dependencies,
         fake_file_settings,
         fake_file_readme,
@@ -191,6 +193,7 @@ extern "C" {
         fake_path_part_script_length,
         fake_path_part_shared_length,
         fake_path_part_static_length,
+        fake_file_defines_length,
         fake_file_dependencies_length,
         fake_file_settings_length,
         fake_file_readme_length,
@@ -203,12 +206,13 @@ extern "C" {
         &data->path_build_programs_script,
         &data->path_build_programs_shared,
         &data->path_build_programs_static,
+        &data->file_data_build_defines,
         &data->file_data_build_dependencies,
         &data->file_data_build_settings,
         &data->file_documents_readme,
       };
 
-      for (i = 0; i < 9; i++) {
+      for (i = 0; i < 10; i++) {
         status = fl_string_append_nulless(parameters_source[i], parameters_length[i], parameters_value[i]);
 
         if (f_status_is_error(status)) {
@@ -371,12 +375,13 @@ extern "C" {
         &data->path_work_programs_script,
         &data->path_work_programs_shared,
         &data->path_work_programs_static,
+        &data->file_data_build_defines,
         &data->file_data_build_dependencies,
         &data->file_data_build_settings,
         &data->file_documents_readme,
       };
 
-      for (i = 0; i < 30; i++) {
+      for (i = 0; i < 31; i++) {
         if (parameters_value[i]->used == 0) continue;
 
         status = fl_string_dynamic_terminate(parameters_value[i]);

diff --git a/level_3/fake/c/private-skeleton.c b/level_3/fake/c/private-skeleton.c
index b02740bfbf931b296ffd6c4980b0b1586f3a917e..b9c0fd2d1ff3dc42b95be81983dcde0925987700 100644 (file)
--- a/level_3/fake/c/private-skeleton.c
+++ b/level_3/fake/c/private-skeleton.c
@@ -52,6 +52,10 @@ extern "C" {
     f_string_dynamic file_data_build_process_pre = f_string_dynamic_initialize;
 
     if (!f_status_is_error(status)) {
+      status = fake_skeleton_operate_file_create(data, data.file_data_build_defines, f_false);
+    }
+
+    if (!f_status_is_error(status)) {
       status = fake_skeleton_operate_file_create(data, data.file_data_build_dependencies, f_false);
     }
 

diff --git a/level_3/fake/data/build/defines b/level_3/fake/data/build/defines
new file mode 100644 (file)
index 0000000..c665317
--- /dev/null
+++ b/level_3/fake/data/build/defines
@@ -0,0 +1,2 @@
+# fss-0000
+

diff --git a/level_3/fake/data/build/dependencies b/level_3/fake/data/build/dependencies
index c3e5a1556c123eb9d3c7c9eae0d7537a5a0a2c1d..f5ad7dfaf076e337ff73c91cf18dcf3b080169f3 100644 (file)
--- a/level_3/fake/data/build/dependencies
+++ b/level_3/fake/data/build/dependencies
@@ -5,6 +5,7 @@ f_string
 f_color
 f_console
 f_conversion
+f_environment
 f_fss
 f_file
 f_path

diff --git a/level_3/fake/data/build/process_post.sh b/level_3/fake/data/build/process_post.sh
index 2f70750565eaf863ae2d2f5ebf4efe8aa35b0654..9c3323ba8c45056fbff15b0f72aca38040b2168d 100755 (executable)
--- a/level_3/fake/data/build/process_post.sh
+++ b/level_3/fake/data/build/process_post.sh
@@ -36,6 +36,7 @@ process_post_main(){
   local path_sources=
   local path_work=
   local verbosity=
+  local build_status=
 
   # generated paths and standard paths.
   local path_directory_separator="/"
@@ -118,6 +119,8 @@ process_post_main(){
           if [[ $do_color == "normal" ]] ; then
             do_color=none
           fi
+        elif [[ $p == "++status" ]] ; then
+          grab_next=build_status
         fi
       else
         if [[ $grab_next == "defines" ]] ; then
@@ -133,9 +136,9 @@ process_post_main(){
             modes="$modes $p"
           fi
         elif [[ $grab_next == "process" ]] ; then
-          process=$p
+          process="$p"
         elif [[ $grab_next == "file_settings" ]] ; then
-          file_settings=$p
+          file_settings="$p"
         elif [[ $grab_next == "path_build" ]] ; then
           path_build=$(process_post_path_fix $p)
         elif [[ $grab_next == "path_source_build" ]] ; then
@@ -154,6 +157,8 @@ process_post_main(){
           path_source_settings=$(process_post_path_fix $p)
         elif [[ $grab_next == "path_work" ]] ; then
           path_work=$(process_post_path_fix $p)
+        elif [[ $grab_next == "build_status" ]] ; then
+          build_status="$p"
         fi
 
         grab_next=
@@ -221,7 +226,7 @@ process_post_main(){
 
   if [[ $verbosity != "quiet" ]] ; then
     echo
-    echo -e "${c_title}Pre Processing Operation: $c_reset$c_notice$operation$c_reset"
+    echo -e "${c_title}Completed Operation: $c_reset$c_notice$operation$c_reset"
 
     if [[ $modes != "" ]] ; then
       echo -e "  Modes: $c_reset$c_notice$modes$c_reset"

diff --git a/level_3/fake/data/build/process_pre.sh b/level_3/fake/data/build/process_pre.sh
index 87e22ec212e9fa31025eac24a5dd612e427843c4..caba0448117b2552a490df1b93e6d30439f92c83 100755 (executable)
--- a/level_3/fake/data/build/process_pre.sh
+++ b/level_3/fake/data/build/process_pre.sh
@@ -36,6 +36,7 @@ process_pre_main(){
   local path_sources=
   local path_work=
   local verbosity=
+  local build_status=
 
   # generated paths and standard paths.
   local path_directory_separator="/"
@@ -118,6 +119,8 @@ process_pre_main(){
           if [[ $do_color == "normal" ]] ; then
             do_color=none
           fi
+        elif [[ $p == "++status" ]] ; then
+          grab_next=build_status
         fi
       else
         if [[ $grab_next == "defines" ]] ; then
@@ -133,9 +136,9 @@ process_pre_main(){
             modes="$modes $p"
           fi
         elif [[ $grab_next == "process" ]] ; then
-          process=$p
+          process="$p"
         elif [[ $grab_next == "file_settings" ]] ; then
-          file_settings=$p
+          file_settings="$p"
         elif [[ $grab_next == "path_build" ]] ; then
           path_build=$(process_pre_path_fix $p)
         elif [[ $grab_next == "path_source_build" ]] ; then
@@ -154,6 +157,8 @@ process_pre_main(){
           path_source_settings=$(process_pre_path_fix $p)
         elif [[ $grab_next == "path_work" ]] ; then
           path_work=$(process_pre_path_fix $p)
+        elif [[ $grab_next == "build_status" ]] ; then
+          build_status="$p"
         fi
 
         grab_next=
@@ -221,7 +226,7 @@ process_pre_main(){
 
   if [[ $verbosity != "quiet" ]] ; then
     echo
-    echo -e "${c_title}Post Processing Operation: $c_reset$c_notice$operation$c_reset"
+    echo -e "${c_title}Processing Operation: $c_reset$c_notice$operation$c_reset"
 
     if [[ $modes != "" ]] ; then
       echo -e "  Modes: $c_reset$c_notice$modes$c_reset"

diff --git a/level_3/fake/data/build/settings b/level_3/fake/data/build/settings
index 1312632485eaf3c391029b03dfdf2dc102b8fe50..7a7f600c30548e09625bd03f2b359ceb7878336f 100644 (file)
--- a/level_3/fake/data/build/settings
+++ b/level_3/fake/data/build/settings
@@ -3,19 +3,25 @@
 project_name fake
 project_level 3
 
-process_pre process_pre.sh
-process_post process_post.sh
-
 version_major 0
 version_minor 5
 version_micro 0
 
+process_pre process_pre.sh
+process_post process_post.sh
+
+modes individual level monolithic
+modes_default individual
+
 build_compiler gcc
 build_linker ar
 build_libraries -lc
-build_libraries_fll -lfll_program -lfll_fss -lfll_execute -lfl_utf -lfl_string -lfl_file -lfl_fss -lfl_directory -lfl_console -lfl_color -lf_utf -lf_print -lf_file -lf_conversion -lf_console -lf_memory
+build_libraries_fll -lfll_program -lfll_fss -lfll_execute -lfl_utf -lfl_string -lfl_file -lfl_fss -lfl_directory -lfl_console -lfl_color -lf_utf -lf_print -lf_environment -lf_file -lf_conversion -lf_console -lf_memory
 build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0
 build_libraries_fll-monolithic -lfll
+build_libraries-individual -lfll_program -lfll_fss -lfll_execute -lfl_utf -lfl_string -lfl_file -lfl_fss -lfl_directory -lfl_console -lfl_color -lf_utf -lf_print -lf_environment -lf_file -lf_conversion -lf_console -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-skeleton.c
 build_sources_program main.c
 build_sources_headers fake.h