]> Kevux Git Server - fll/commitdiff
Update: implement bash support in generate.sh
authorKevin Day <thekevinday@gmail.com>
Fri, 9 Aug 2019 00:54:00 +0000 (19:54 -0500)
committerKevin Day <thekevinday@gmail.com>
Fri, 9 Aug 2019 00:54:41 +0000 (19:54 -0500)
The generate script now supports handling bash scripts.

38 files changed:
build/scripts/generate.sh
level_0/f_colors/data/build/settings
level_0/f_console/data/build/settings
level_0/f_conversion/data/build/settings
level_0/f_errors/data/build/settings
level_0/f_file/data/build/settings
level_0/f_fss/data/build/settings
level_0/f_memory/data/build/settings
level_0/f_paths/data/build/settings
level_0/f_pipe/data/build/settings
level_0/f_print/data/build/settings
level_0/f_serialized/data/build/settings
level_0/f_socket/data/build/settings
level_0/f_strings/data/build/settings
level_0/f_types/data/build/settings
level_1/fl_colors/data/build/settings
level_1/fl_console/data/build/settings
level_1/fl_directory/data/build/settings
level_1/fl_errors/data/build/settings
level_1/fl_file/data/build/settings
level_1/fl_fss/data/build/settings
level_1/fl_program/data/build/settings
level_1/fl_serialized/data/build/settings
level_1/fl_socket/data/build/settings
level_1/fl_strings/data/build/settings
level_2/fll_colors/data/build/settings
level_2/fll_execute/data/build/settings
level_2/fll_fss/data/build/settings
level_3/firewall/data/build/settings
level_3/fss_basic_list_read/data/build/settings
level_3/fss_basic_list_write/data/build/settings
level_3/fss_basic_read/data/build/settings
level_3/fss_basic_write/data/build/settings
level_3/fss_extended_read/data/build/settings
level_3/fss_extended_write/data/build/settings
level_3/fss_return_code/data/build/settings
level_3/init/data/build/settings
level_3/return_code/data/build/settings

index b5fb77d2b063ea6597edbdd244fbddce83e5b0c6..b95f0ca47a82cffb5f5c6fb707806e04f7919c2d 100644 (file)
@@ -37,7 +37,7 @@ generate_main(){
   local path_build_settings=
   local path_c=sources/c/
   local path_settings=data/settings/
-  local path_bash=sources/bash/
+  local path_bash=
   local project_built=
   local work_directory=
   local defines_override=
@@ -134,12 +134,13 @@ generate_main(){
 
   generate_load_settings
 
-  # TODO: enable when bash support is implemented
-  #if [[ ! -d $path_bash ]] ; then
-  #  echo -e "${c_error}ERROR: the bash path of $c_notice$path_bash$c_error is invalid.$c_reset"
-  #  generate_cleanup
-  #  exit 0
-  #fi
+  if [[ $path_bash == "" ]] ; then
+    path_bash=sources/bash/
+  elif [[ ! -d $path_bash ]] ; then
+    echo -e "${c_error}ERROR: the bash path of $c_notice$path_bash$c_error is not a valid directory.$c_reset"
+    generate_cleanup
+    exit 0
+  fi
 
   if [[ $work_directory != "" && ! -d $work_directory ]] ; then
     echo -e "${c_error}ERROR: the work directory $c_notice$work_directory$c_error is not a valid directory.$c_reset"
@@ -251,17 +252,18 @@ generate_id(){
     "build_sources_library") echo -n 9;;
     "build_sources_program") echo -n 10;;
     "build_sources_headers") echo -n 11;;
-    "build_sources_settings") echo -n 12;;
-    "build_shared") echo -n 13;;
-    "build_static") echo -n 14;;
-    "defines_all") echo -n 15;;
-    "defines_shared") echo -n 16;;
-    "defines_static") echo -n 17;;
-    "flags_all") echo -n 18;;
-    "flags_shared") echo -n 19;;
-    "flags_static") echo -n 20;;
-    "flags_library") echo -n 21;;
-    "flags_program") echo -n 22;;
+    "build_sources_bash") echo -n 12;;
+    "build_sources_settings") echo -n 13;;
+    "build_shared") echo -n 14;;
+    "build_static") echo -n 15;;
+    "defines_all") echo -n 16;;
+    "defines_shared") echo -n 17;;
+    "defines_static") echo -n 18;;
+    "flags_all") echo -n 19;;
+    "flags_shared") echo -n 20;;
+    "flags_static") echo -n 21;;
+    "flags_library") echo -n 22;;
+    "flags_program") echo -n 23;;
   esac
 }
 
@@ -300,7 +302,7 @@ generate_prepare_build(){
   local level=${variables[$(generate_id project_level)]}
   local alt=$1
 
-  mkdir -vp ${path_build}{includes,programs/{shared,static},libraries/{shared,static},objects,settings} || failure=1
+  mkdir -vp ${path_build}{includes,programs/{shared,static},libraries/{shared,static},objects,bash,settings} || failure=1
 
   if [[ $failure == "" && $level != "" ]] ; then
     mkdir -vp ${path_build}includes/level_$level || failure=1
@@ -343,6 +345,7 @@ generate_operation_build(){
   local sources_library=${variables[$(generate_id build_sources_library)]}
   local sources_program=${variables[$(generate_id build_sources_program)]}
   local sources_headers=${variables[$(generate_id build_sources_headers)]}
+  local sources_bash=${variables[$(generate_id build_sources_bash)]}
   local sources_settings=${variables[$(generate_id build_sources_settings)]}
   local sources=
   local defines=${variables[$(generate_id defines_all)]}
@@ -489,6 +492,12 @@ generate_operation_build(){
     fi
   fi
 
+  if [[ $failure == "" && $sources_bash != "" ]] ; then
+    for i in $sources_bash ; do
+      cp -vf $path_bash$i ${path_build}bash/ || failure=1
+    done
+  fi
+
   if [[ $failure != "" ]] ; then
     echo -e "${c_error}ERROR: failed to build.$c_reset"
     generate_cleanup
@@ -501,7 +510,7 @@ generate_operation_build(){
 generate_operation_clean(){
   local i=
 
-  for i in ${path_build}{includes,programs,libraries,settings} ; do
+  for i in ${path_build}{includes,programs,libraries,bash,settings} ; do
     if [[ -e $i ]] ; then
       rm -vRf $i
     fi
index a69cb35f46b0d25f7fa995260efd47e7614a7353..9d7c64ca20d10efeb7447e9c130eaaeb542915c1 100644 (file)
@@ -11,9 +11,10 @@ build_compiler gcc
 build_linker ar
 build_libraries -lc 
 build_libraries_fll
-build_sources_library 
-build_sources_program 
-build_sources_headers colors.h 
+build_sources_library
+build_sources_program
+build_sources_headers colors.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 2ff0b4af86ee073d8ca1434ffab6229b825c3306..8211f3ca4b396e75fcff52d54b38e5d4b3aa3010 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll
 build_sources_library console.c
 build_sources_program 
 build_sources_headers console.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index a0d654f77a49501c45e18a0c08fa9b51a8c7b20d..9fcdfe6792784988172554aca2b71e0f0b958e5c 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll
 build_sources_library conversion.c
 build_sources_program 
 build_sources_headers conversion.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 2d0ac9b36ae6db114afd9ae75d7a69ad5ab4aa76..c66f7b9b26d1852c5e0c0949f2f8fd433fac7013 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll
 build_sources_library 
 build_sources_program 
 build_sources_headers errors.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index e6624eb0eff4ffc98456c6716dd2bb1c7bf0b53a..983e4d536c923e665c5126a1e29a479515cb3738 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll
 build_sources_library file.c
 build_sources_program 
 build_sources_headers file.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 63b0d3664e80351a0b34e6ffc8ebb004065fac42..6f98b2c604e54f3ee28806456316d1de061e245e 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll
 build_sources_library 
 build_sources_program 
 build_sources_headers fss.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 57f9d6b6af93444dd2178f211c5e1a62c2adbccc..b8352611efe071367d69558680951604373e6ec0 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll
 build_sources_library memory.c
 build_sources_program 
 build_sources_headers memory.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 82756c481647ba9c785d1ff6baf50bb171980a98..bb60e332c964f145455b16a55e6fe39d41be8638 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll
 build_sources_library 
 build_sources_program 
 build_sources_headers fll_paths.h filesystem_paths.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 61ad148dc981033bcf8e1fe01b5fc6662e656481..3feb9e9bf043409ba64f2924d60b0ad48a26e1c9 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll
 build_sources_library pipe.c
 build_sources_program 
 build_sources_headers pipe.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 28f40e5968182b01192edf3377a229b939886229..3678d75ab3f75b14f38dbf6022dcd7b302deb7c5 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll
 build_sources_library print.c
 build_sources_program
 build_sources_headers print.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index e6760837a7d6012765500e78070e81df670cb05e..1a7733b7102ed8497fe28ec94b46fc97dcb9ffc1 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll
 build_sources_library
 build_sources_program 
 build_sources_headers serialized.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index b444eb7c95fe93fb3738f2b45c4fef4e62887b4b..85d5bff9f2d9df362059ee1eabb64152fe9a4e66 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll
 build_sources_library
 build_sources_program 
 build_sources_headers socket.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 07b1a10f48024de3e18517de770484145cdad028..e6349eced6a71d1ac2c84e01048d7adb930926c9 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll
 build_sources_library 
 build_sources_program 
 build_sources_headers strings.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 20875579d966eb13ee3db23029246bdb408733ff..c098f6f5b715fafa5f0fc74020228fa7345da8fc 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll
 build_sources_library
 build_sources_program
 build_sources_headers types.h types_array.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 2d763b31f963a1bf99de9e6fdc2db60ed1991d16..16e057f7cea04cde80b936fa7520cb4f42ed7933 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll -lf_memory -lf_file
 build_sources_library colors.c
 build_sources_program 
 build_sources_headers colors.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index c357b3651ac3c3e2fc6b23bcc6237a10d441c3bb..dc8eafad028f25a5e23c9c208e294de864c567d1 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll -lf_memory -lf_console
 build_sources_library console.c
 build_sources_program 
 build_sources_headers console.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index c79360ab6ce01e28ae37ab8f26703e5cbb726880..f838be9ee17d75eebab91a3916450b3c6d67f77a 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll -lf_memory
 build_sources_library directory.c
 build_sources_program 
 build_sources_headers directory.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 14aa39bf85b89d0a46d59a190c2cf28c84b45e38..4b093b26cd686004a1f969c19150445b50ef2960 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll
 build_sources_library errors.c
 build_sources_program 
 build_sources_headers errors.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index cebaa8ceb1456cfc94bdf1f8f2c3209e182ee4ab..758bbf9b46eaec96098aea4fd2149a8ea42711a4 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll -lf_memory -lf_file
 build_sources_library file.c
 build_sources_program 
 build_sources_headers file.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 3a7080f1940a871c3d9799e1f40e071c1e5418ab..14c6ad63102ef14698e1e9d69ae4f9374a5850b4 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll -lf_conversion -lf_file -lf_memory
 build_sources_library fss.c fss_basic.c fss_basic_list.c fss_extended.c
 build_sources_program 
 build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_errors.h fss_extended.h fss_macro.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 58a41568e7903e6db2031ccba174865916392bd6..ac5d81d9abd4eb44f121d52cbad88e5e482200da 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll
 build_sources_library program.c
 build_sources_program
 build_sources_headers program.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 84ba2211b066d9f3ee2fe5b17b5398f650cb86de..6a9ce93e27467517b39e892f294f975be8ef63d3 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll -lf_memory
 build_sources_library serialized.c
 build_sources_program 
 build_sources_headers serialized.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 8c5256e916ffbf600885b6425b79d0cf88a01f8d..c1e47ab6b768f271d07b2dadeafa0fc508c8b999 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll
 build_sources_library socket.c
 build_sources_program 
 build_sources_headers socket.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index fe014d4e5c8278d7f373b7e4caaf1b951fb000e3..192f1d8f1e09743cd8894f7e6fa486f606e73e41 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll -lf_memory
 build_sources_library strings.c
 build_sources_program 
 build_sources_headers strings.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 32b8d689c04451de05b82d79fb6818679c4422f5..86d4c1c81ccaaa5a62cdd1115e74a0cbdd947d0f 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll -lfl_colors -lf_memory
 build_sources_library colors.c
 build_sources_program 
 build_sources_headers colors.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 77ec1ee6f6a0d5c273e8e9876493c8c814cbf7c4..900de458703ae069419b011759dcaf078806dad8 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll -lf_memory
 build_sources_library execute.c
 build_sources_program 
 build_sources_headers execute.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 8631e901f690c73161724719f39a6c238b45ab27..2a9702aca591829a61f0e2a00a90e6003b1726cd 100644 (file)
@@ -14,6 +14,7 @@ build_libraries_fll -lfl_errors -lfl_fss -lf_conversion -lf_file -lf_memory
 build_sources_library fss_basic.c fss_basic_list.c fss_extended.c fss_errors.c
 build_sources_program
 build_sources_headers fss_basic.h fss_basic_list.h fss_extended.h fss_errors.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index eab9f8aa6c708097027755c0ff5532aee163e835..2acfc5d13a2f40d73d635be1166d66676237b76b 100644 (file)
@@ -16,6 +16,7 @@ build_libraries_fll -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_col
 build_sources_library firewall.c private-firewall.c
 build_sources_program main.c
 build_sources_headers firewall.h
+build_sources_bash
 build_sources_settings default-blacklist default-whitelist example-device-firewall firewall-first firewall-last firewall-other
 build_shared yes
 build_static yes
index 72b076a6542739c0207add63955322859e93cd38..7803f14b59ddfb2c3956bad8331909d3bf3ba633 100644 (file)
@@ -16,6 +16,7 @@ build_libraries_fll -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_col
 build_sources_library fss_basic_list_read.c
 build_sources_program main.c
 build_sources_headers fss_basic_list_read.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index b643900dddfd162bfac5f8521954760dd9b42d54..598dd19b9195cf703fd0d8c85bb35b73dc633fb0 100644 (file)
@@ -16,6 +16,7 @@ build_libraries_fll -lfll_colors -lfll_fss  -lfl_fss -lfl_file -lfl_errors -lfl_
 build_sources_library fss_basic_list_write.c
 build_sources_program main.c
 build_sources_headers fss_basic_list_write.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 64653e9fd3e76e9c6f004a3040de77d2dcc35846..6c516fe000df1edd6ce3da2bf8053da1c673f8cd 100644 (file)
@@ -16,6 +16,7 @@ build_libraries_fll -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_col
 build_sources_library fss_basic_read.c
 build_sources_program main.c
 build_sources_headers fss_basic_read.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 6b420252835f0cf6fbe4b3f6d03d746f77489c7d..9856458586a6489767a787407ec3ae2bf5735adb 100644 (file)
@@ -16,6 +16,7 @@ build_libraries_fll -lfll_colors -lfll_fss -lfl_fss -lfl_file -lfl_errors -lfl_c
 build_sources_library fss_basic_write.c
 build_sources_program main.c
 build_sources_headers fss_basic_write.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index b917fc3bb6b7f7cf8d6582d677937573886f5416..b48e0c80c139be3db507b2549421ae16353f8a0b 100644 (file)
@@ -16,6 +16,7 @@ build_libraries_fll -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_col
 build_sources_library fss_extended_read.c
 build_sources_program main.c
 build_sources_headers fss_extended_read.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 3413a6ff07a076f6941d30e1baaa433175be4aea..c495c3ab40357aad4f1cccd31df305f35d25834a 100644 (file)
@@ -16,6 +16,7 @@ build_libraries_fll -lfll_colors -lfll_fss -lfl_fss -lfl_file -lfl_errors -lfl_c
 build_sources_library fss_extended_write.c
 build_sources_program main.c
 build_sources_headers fss_extended_write.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index 28c927b0ae42ab9d679b174d7aa926ec7c93f608..43d87e3afc364adb45696682c47e672ed0f08100 100644 (file)
@@ -16,6 +16,7 @@ build_libraries_fll -lfll_colors -lfll_fss -lfl_fss -lfl_errors -lfl_colors -lfl
 build_sources_library fss_return_code.c
 build_sources_program main.c
 build_sources_headers fss_return_code.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index b22148620b48c6e76938f089428472cbde4551f6..74e58e2352014f3641d88fef18b782f854874f3b 100644 (file)
@@ -16,6 +16,7 @@ build_libraries_fll -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_col
 build_sources_library init.c private-init.c
 build_sources_program main.c
 build_sources_headers init.h
+build_sources_bash
 build_shared yes
 build_static yes
 
index c0967a15a999d9a0d86bf9373d01c9abf595d611..9094f862d370604ca917c1223e53a9cc6d0b7c47 100644 (file)
@@ -17,6 +17,7 @@ build_sources_library return_code.c
 build_sources_library return_code.c
 build_sources_program main.c
 build_sources_headers return_code.h
+build_sources_bash
 build_shared yes
 build_static yes