From dd0c442873776de2404ecb89d3357601d2c91e2c Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Fri, 11 Feb 2022 18:25:16 -0600 Subject: [PATCH] Refactor: project_name t build_name. Originally the build settings files are meant for projects. I now believe that these should represent "builds". Replace "project_name" with "build_name". --- build/level_0/settings | 2 +- build/level_1/settings | 2 +- build/level_2/settings | 2 +- build/monolithic/settings | 2 +- build/scripts/bootstrap.sh | 48 +++++++++++----------- level_0/f_account/data/build/settings | 2 +- level_0/f_account/data/build/settings-mocks | 2 +- level_0/f_account/data/build/settings-tests | 2 +- level_0/f_capability/data/build/settings | 2 +- level_0/f_capability/data/build/settings-mocks | 2 +- level_0/f_capability/data/build/settings-tests | 2 +- level_0/f_color/data/build/settings | 2 +- level_0/f_color/data/build/settings-mocks | 2 +- level_0/f_color/data/build/settings-tests | 2 +- level_0/f_console/data/build/settings | 2 +- level_0/f_console/data/build/settings-tests | 2 +- level_0/f_control_group/data/build/settings | 2 +- level_0/f_control_group/data/build/settings-tests | 2 +- level_0/f_conversion/data/build/settings | 2 +- level_0/f_conversion/data/build/settings-mocks | 2 +- level_0/f_conversion/data/build/settings-tests | 2 +- level_0/f_directory/data/build/settings | 2 +- level_0/f_environment/data/build/settings | 2 +- level_0/f_execute/data/build/settings | 2 +- level_0/f_file/data/build/settings | 2 +- level_0/f_fss/data/build/settings | 2 +- level_0/f_iki/data/build/settings | 2 +- level_0/f_limit/data/build/settings | 2 +- level_0/f_memory/data/build/settings | 2 +- level_0/f_memory/data/build/settings-tests | 2 +- level_0/f_path/data/build/settings | 2 +- level_0/f_pipe/data/build/settings | 2 +- level_0/f_print/data/build/settings | 2 +- level_0/f_serialize/data/build/settings | 2 +- level_0/f_signal/data/build/settings | 2 +- level_0/f_socket/data/build/settings | 2 +- level_0/f_status/data/build/settings | 2 +- level_0/f_status_string/data/build/settings | 2 +- level_0/f_string/data/build/settings | 2 +- level_0/f_thread/data/build/settings | 2 +- level_0/f_type/data/build/settings | 2 +- level_0/f_type_array/data/build/settings | 2 +- level_0/f_type_array/data/build/settings-tests | 2 +- level_0/f_utf/data/build/settings | 2 +- level_1/fl_control_group/data/build/settings | 2 +- level_1/fl_conversion/data/build/settings | 2 +- level_1/fl_directory/data/build/settings | 2 +- level_1/fl_environment/data/build/settings | 2 +- level_1/fl_execute/data/build/settings | 2 +- level_1/fl_fss/data/build/settings | 2 +- level_1/fl_iki/data/build/settings | 2 +- level_1/fl_print/data/build/settings | 2 +- level_1/fl_signal/data/build/settings | 2 +- level_1/fl_string/data/build/settings | 2 +- level_1/fl_utf/data/build/settings | 2 +- level_1/fl_utf_file/data/build/settings | 2 +- level_2/fll_control_group/data/build/settings | 2 +- level_2/fll_error/data/build/settings | 2 +- level_2/fll_execute/data/build/settings | 2 +- level_2/fll_file/data/build/settings | 2 +- level_2/fll_fss/data/build/settings | 2 +- level_2/fll_fss_status_string/data/build/settings | 2 +- level_2/fll_iki/data/build/settings | 2 +- level_2/fll_path/data/build/settings | 2 +- level_2/fll_print/data/build/settings | 2 +- level_2/fll_program/data/build/settings | 2 +- level_2/fll_status_string/data/build/settings | 2 +- level_3/byte_dump/data/build/settings | 2 +- level_3/control/data/build/settings | 2 +- level_3/controller/data/build/settings | 2 +- level_3/fake/c/private-build-library.c | 12 +++--- level_3/fake/c/private-build-load.c | 28 ++++++------- level_3/fake/c/private-build-program.c | 20 ++++----- level_3/fake/c/private-build.c | 4 +- level_3/fake/c/private-common.c | 6 +-- level_3/fake/c/private-common.h | 22 +++++----- level_3/fake/c/private-make-operate.c | 6 +-- level_3/fake/data/build/settings | 2 +- .../fake/data/projects/bzip2/1.0.8/settings-bzip2 | 2 +- .../projects/bzip2/1.0.8/settings-bzip2recover | 2 +- level_3/fake/data/projects/cmocka/1.1.5/settings | 2 +- level_3/fake/documents/settings.txt | 26 ++++++------ level_3/fake/specifications/settings.txt | 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_embedded_list_read/data/build/settings | 2 +- .../fss_embedded_list_write/data/build/settings | 2 +- level_3/fss_extended_list_read/data/build/settings | 2 +- .../fss_extended_list_write/data/build/settings | 2 +- level_3/fss_extended_read/data/build/settings | 2 +- level_3/fss_extended_write/data/build/settings | 2 +- level_3/fss_identify/data/build/settings | 2 +- level_3/fss_payload_read/data/build/settings | 2 +- level_3/fss_payload_write/data/build/settings | 2 +- level_3/fss_status_code/data/build/settings | 2 +- level_3/iki_read/data/build/settings | 2 +- level_3/iki_write/data/build/settings | 2 +- level_3/status_code/data/build/settings | 2 +- level_3/utf8/data/build/settings | 2 +- 102 files changed, 179 insertions(+), 179 deletions(-) diff --git a/build/level_0/settings b/build/level_0/settings index e76b43f..1fc1e56 100644 --- a/build/level_0/settings +++ b/build/level_0/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fll_0 +build_name fll_0 version_major 0 version_minor 5 diff --git a/build/level_1/settings b/build/level_1/settings index 54e1995..33900fd 100644 --- a/build/level_1/settings +++ b/build/level_1/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fll_1 +build_name fll_1 version_major 0 version_minor 5 diff --git a/build/level_2/settings b/build/level_2/settings index 049f06e..a08aaea 100644 --- a/build/level_2/settings +++ b/build/level_2/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fll_2 +build_name fll_2 version_major 0 version_minor 5 diff --git a/build/monolithic/settings b/build/monolithic/settings index 4b57483..26488dd 100644 --- a/build/monolithic/settings +++ b/build/monolithic/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fll +build_name fll version_major 0 version_minor 5 diff --git a/build/scripts/bootstrap.sh b/build/scripts/bootstrap.sh index 68ff7da..a58862e 100644 --- a/build/scripts/bootstrap.sh +++ b/build/scripts/bootstrap.sh @@ -192,7 +192,7 @@ bootstrap_main() { return 1 fi - project_built="${path_build_stage}${variables[$(bootstrap_id project_name)]}" + project_built="${path_build_stage}${variables[$(bootstrap_id build_name)]}" if [[ $process != "" ]] ; then project_built="${project_built}-$process" fi @@ -228,9 +228,9 @@ bootstrap_main() { fi fi - if [[ ${variables[$(bootstrap_id project_name)]} == "" ]] ; then + if [[ ${variables[$(bootstrap_id build_name)]} == "" ]] ; then if [[ $verbosity != "quiet" ]] ; then - echo -e "${c_error}ERROR: the required setting '${c_notice}project_name$c_error' is not specified in the build settings file '$c_notice$settings_file$c_error'.$c_reset" + echo -e "${c_error}ERROR: the required setting '${c_notice}build_name$c_error' is not specified in the build settings file '$c_notice$settings_file$c_error'.$c_reset" fi bootstrap_cleanup @@ -300,7 +300,7 @@ bootstrap_main() { return 1 fi - project_label="${variables[$(bootstrap_id project_name)]}" + project_label="${variables[$(bootstrap_id build_name)]}" if [[ "${variables[$(bootstrap_id version_major)]}" != "" ]] ; then project_label="${project_label}-${variables[$(bootstrap_id version_major)]}" @@ -324,7 +324,7 @@ bootstrap_main() { elif [[ $operation == "build" ]] ; then if [[ $verbosity != "quiet" ]] ; then echo - echo -e "${c_highlight}Building Project:${c_reset} $c_notice$project_label${c_highlight}.$c_reset" + echo -e "${c_highlight}Building:${c_reset} $c_notice$project_label${c_highlight}.$c_reset" fi if [[ ! -f ${project_built}.prepared ]] ; then @@ -485,7 +485,7 @@ bootstrap_id() { "path_standard") echo -n 52;; "process_post") echo -n 53;; "process_pre") echo -n 54;; - "project_name") echo -n 55;; + "build_name") echo -n 55;; "search_exclusive") echo -n 56;; "search_shared") echo -n 57;; "search_static") echo -n 58;; @@ -569,7 +569,7 @@ bootstrap_load_settings() { return 1 fi - for i in build_compiler build_indexer build_indexer_arguments build_language build_libraries build_libraries_shared build_libraries_static build_script build_shared build_sources_headers build_sources_headers_shared build_sources_headers_static build_sources_library build_sources_library_shared build_sources_library_static build_sources_program build_sources_program_shared build_sources_program_static build_sources_script build_sources_setting build_static defines defines_library defines_library_shared defines_library_static defines_program defines_shared defines_program_shared defines_program_static defines_static environment flags flags_library flags_program flags_shared flags_static modes modes_default path_headers path_headers_preserve path_language path_library_script path_library_shared path_library_static path_program_script path_program_shared path_program_static path_sources path_standard process_post process_pre project_name search_exclusive search_shared search_static version_major version_major_prefix version_micro version_micro_prefix version_minor version_minor_prefix version_nano version_nano_prefix version_target ; do + for i in build_compiler build_indexer build_indexer_arguments build_language build_libraries build_libraries_shared build_libraries_static build_script build_shared build_sources_headers build_sources_headers_shared build_sources_headers_static build_sources_library build_sources_library_shared build_sources_library_static build_sources_program build_sources_program_shared build_sources_program_static build_sources_script build_sources_setting build_static defines defines_library defines_library_shared defines_library_static defines_program defines_shared defines_program_shared defines_program_static defines_static environment flags flags_library flags_program flags_shared flags_static modes modes_default path_headers path_headers_preserve path_language path_library_script path_library_shared path_library_static path_program_script path_program_shared path_program_static path_sources path_standard process_post process_pre build_name search_exclusive search_shared search_static version_major version_major_prefix version_micro version_micro_prefix version_minor version_minor_prefix version_nano version_nano_prefix version_target ; do variables[$(bootstrap_id $i)]=$(grep -s -o "^[[:space:]]*$i[[:space:]].*\$" $settings_file | sed -e "s|^[[:space:]]*$i\>||" -e 's|^[[:space:]]*||') done } @@ -624,7 +624,7 @@ bootstrap_prepare_build() { bootstrap_operation_build() { local failure= - local name=${variables[$(bootstrap_id project_name)]} + local build_name=${variables[$(bootstrap_id build_name)]} local major=${variables[$(bootstrap_id version_major)]} local major_prefix=${variables[$(bootstrap_id version_major_prefix)]} local minor=${variables[$(bootstrap_id version_minor)]} @@ -1118,26 +1118,26 @@ bootstrap_operation_build() { done if [[ $verbosity == "verbose" ]] ; then - echo $compiler $sources -shared -Wl,-soname,lib$name.so.$version_target -o ${path_build}libraries/shared/lib$name.so.$version_file $arguments_shared $arguments_include $libraries $libraries_shared $flags $flags_shared $flags_library $flags_library_shared $defines $defines_shared $defines_library $defines_library_shared + echo $compiler $sources -shared -Wl,-soname,lib$build_name.so.$version_target -o ${path_build}libraries/shared/lib$build_name.so.$version_file $arguments_shared $arguments_include $libraries $libraries_shared $flags $flags_shared $flags_library $flags_library_shared $defines $defines_shared $defines_library $defines_library_shared fi - $compiler $sources -shared -Wl,-soname,lib$name.so.$version_target -o ${path_build}libraries/shared/lib$name.so.$version_file $arguments_shared $arguments_include $libraries $libraries_shared $flags $flags_shared $flags_library $flags_library_shared $defines $defines_shared $defines_library $defines_library_shared || failure=1 + $compiler $sources -shared -Wl,-soname,lib$build_name.so.$version_target -o ${path_build}libraries/shared/lib$build_name.so.$version_file $arguments_shared $arguments_include $libraries $libraries_shared $flags $flags_shared $flags_library $flags_library_shared $defines $defines_shared $defines_library $defines_library_shared || failure=1 if [[ $failure == "" ]] ; then if [[ $file != "major" ]] ; then if [[ $file == "minor" ]] ; then - ln $verbose -sf lib$name.so.$version_file ${path_build}libraries/shared/lib$name.so.$major_prefix$major || failure=1 + ln $verbose -sf lib$build_name.so.$version_file ${path_build}libraries/shared/lib$build_name.so.$major_prefix$major || failure=1 else - ln $verbose -sf lib$name.so.$major_prefix$major$minor_prefix$minor ${path_build}libraries/shared/lib$name.so.$major_prefix$major || failure=1 + ln $verbose -sf lib$build_name.so.$major_prefix$major$minor_prefix$minor ${path_build}libraries/shared/lib$build_name.so.$major_prefix$major || failure=1 if [[ $failure == "" ]] ; then if [[ $file == "micro" ]] ; then - ln $verbose -sf lib$name.so.$version_file ${path_build}libraries/shared/lib$name.so.$major_prefix$major$minor_prefix$minor || failure=1 + ln $verbose -sf lib$build_name.so.$version_file ${path_build}libraries/shared/lib$build_name.so.$major_prefix$major$minor_prefix$minor || failure=1 else - ln $verbose -sf lib$name.so.$major_prefix$major$minor_prefix$minor$micro_prefix$micro ${path_build}libraries/shared/lib$name.so.$major_prefix$major$minor_prefix$minor || failure=1 + ln $verbose -sf lib$build_name.so.$major_prefix$major$minor_prefix$minor$micro_prefix$micro ${path_build}libraries/shared/lib$build_name.so.$major_prefix$major$minor_prefix$minor || failure=1 if [[ $failure == "" ]] ; then - ln $verbose -sf lib$name.so.$version_file ${path_build}libraries/shared/lib$name.so.$major_prefix$major$minor_prefix$minor_prefix$minor$micro_prefix$micro || failure=1 + ln $verbose -sf lib$build_name.so.$version_file ${path_build}libraries/shared/lib$build_name.so.$major_prefix$major$minor_prefix$minor_prefix$minor$micro_prefix$micro || failure=1 fi fi fi @@ -1145,7 +1145,7 @@ bootstrap_operation_build() { fi if [[ $failure == "" ]] ; then - ln $verbose -sf lib$name.so.$major_prefix$major ${path_build}libraries/shared/lib$name.so || failure=1 + ln $verbose -sf lib$build_name.so.$major_prefix$major ${path_build}libraries/shared/lib$build_name.so || failure=1 fi fi fi @@ -1155,7 +1155,7 @@ bootstrap_operation_build() { links= if [[ $sources_library != "" || $sources_library_shared != "" ]] ; then - links="-l$name " + links="-l$build_name " fi for i in $sources_program $sources_program_shared ; do @@ -1163,10 +1163,10 @@ bootstrap_operation_build() { done if [[ $verbosity == "verbose" ]] ; then - echo $compiler $sources -o ${path_build}programs/shared/$name $arguments_shared $arguments_include $links $libraries $libraries_shared $flags $flags_shared $flags_program $flags_program_shared $defines $defines_shared $defines_program $defines_program_shared + echo $compiler $sources -o ${path_build}programs/shared/$build_name $arguments_shared $arguments_include $links $libraries $libraries_shared $flags $flags_shared $flags_program $flags_program_shared $defines $defines_shared $defines_program $defines_program_shared fi - $compiler $sources -o ${path_build}programs/shared/$name $arguments_shared $arguments_include $links $libraries $libraries_shared $flags $flags_shared $flags_program $flags_program_shared $defines $defines_shared $defines_program $defines_program_shared || failure=1 + $compiler $sources -o ${path_build}programs/shared/$build_name $arguments_shared $arguments_include $links $libraries $libraries_shared $flags $flags_shared $flags_program $flags_program_shared $defines $defines_shared $defines_program $defines_program_shared || failure=1 fi if [[ $failure == "" ]] ; then @@ -1206,10 +1206,10 @@ bootstrap_operation_build() { if [[ $failure == "" && ( $sources_library != "" || $sources_library_static != "" ) ]] ; then if [[ $verbosity == "verbose" ]] ; then - echo $indexer $indexer_arguments ${path_build}libraries/static/lib$name.a $sources + echo $indexer $indexer_arguments ${path_build}libraries/static/lib$build_name.a $sources fi - $indexer $indexer_arguments ${path_build}libraries/static/lib$name.a $sources || failure=1 + $indexer $indexer_arguments ${path_build}libraries/static/lib$build_name.a $sources || failure=1 fi fi @@ -1218,7 +1218,7 @@ bootstrap_operation_build() { links= if [[ $sources_library != "" || $sources_library_static != "" ]] ; then - links="-l$name " + links="-l$build_name " fi for i in $sources_program $sources_program_static ; do @@ -1226,10 +1226,10 @@ bootstrap_operation_build() { done if [[ $verbosity == "verbose" ]] ; then - echo $compiler $sources -static -o ${path_build}programs/static/$name $arguments_static $arguments_include $links $libraries $libraries_static $flags $flags_static $flags_program $flags_program_static $defines $defines_static $defines_program $defines_program_static + echo $compiler $sources -static -o ${path_build}programs/static/$build_name $arguments_static $arguments_include $links $libraries $libraries_static $flags $flags_static $flags_program $flags_program_static $defines $defines_static $defines_program $defines_program_static fi - $compiler $sources -static -o ${path_build}programs/static/$name $arguments_static $arguments_include $links $libraries $libraries_static $flags $flags_static $flags_program $flags_program_static $defines $defines_static $defines_program $defines_program_static || failure=1 + $compiler $sources -static -o ${path_build}programs/static/$build_name $arguments_static $arguments_include $links $libraries $libraries_static $flags $flags_static $flags_program $flags_program_static $defines $defines_static $defines_program $defines_program_static || failure=1 fi if [[ $failure == "" ]] ; then diff --git a/level_0/f_account/data/build/settings b/level_0/f_account/data/build/settings index c599552..0c334d9 100644 --- a/level_0/f_account/data/build/settings +++ b/level_0/f_account/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_account +build_name f_account version_major 0 version_minor 5 diff --git a/level_0/f_account/data/build/settings-mocks b/level_0/f_account/data/build/settings-mocks index 9c99965..7679420 100644 --- a/level_0/f_account/data/build/settings-mocks +++ b/level_0/f_account/data/build/settings-mocks @@ -1,6 +1,6 @@ # fss-0001 -project_name f_account +build_name f_account version_major 0 version_minor 5 diff --git a/level_0/f_account/data/build/settings-tests b/level_0/f_account/data/build/settings-tests index ae40e56..bd6fa20 100644 --- a/level_0/f_account/data/build/settings-tests +++ b/level_0/f_account/data/build/settings-tests @@ -1,6 +1,6 @@ # fss-0001 -project_name test-f_account +build_name test-f_account version_major 0 version_minor 5 diff --git a/level_0/f_capability/data/build/settings b/level_0/f_capability/data/build/settings index 4dc1a81..cff3888 100644 --- a/level_0/f_capability/data/build/settings +++ b/level_0/f_capability/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_capability +build_name f_capability version_major 0 version_minor 5 diff --git a/level_0/f_capability/data/build/settings-mocks b/level_0/f_capability/data/build/settings-mocks index 46fce22..5c9ac99 100644 --- a/level_0/f_capability/data/build/settings-mocks +++ b/level_0/f_capability/data/build/settings-mocks @@ -5,7 +5,7 @@ # This should exaclty match the "settings" file, except for the additional "-Wl,--wrap" parts and the additional mock source file. # -project_name f_capability +build_name f_capability version_major 0 version_minor 5 diff --git a/level_0/f_capability/data/build/settings-tests b/level_0/f_capability/data/build/settings-tests index 66aeea9..497189e 100644 --- a/level_0/f_capability/data/build/settings-tests +++ b/level_0/f_capability/data/build/settings-tests @@ -1,6 +1,6 @@ # fss-0001 -project_name test-f_capability +build_name test-f_capability version_major 0 version_minor 5 diff --git a/level_0/f_color/data/build/settings b/level_0/f_color/data/build/settings index 045efad..83ffde8 100644 --- a/level_0/f_color/data/build/settings +++ b/level_0/f_color/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_color +build_name f_color version_major 0 version_minor 5 diff --git a/level_0/f_color/data/build/settings-mocks b/level_0/f_color/data/build/settings-mocks index bdee9e3..068a5ce 100644 --- a/level_0/f_color/data/build/settings-mocks +++ b/level_0/f_color/data/build/settings-mocks @@ -1,6 +1,6 @@ # fss-0001 -project_name f_color +build_name f_color version_major 0 version_minor 5 diff --git a/level_0/f_color/data/build/settings-tests b/level_0/f_color/data/build/settings-tests index 1af6d60..93dfe55 100644 --- a/level_0/f_color/data/build/settings-tests +++ b/level_0/f_color/data/build/settings-tests @@ -1,6 +1,6 @@ # fss-0001 -project_name test-f_color +build_name test-f_color version_major 0 version_minor 5 diff --git a/level_0/f_console/data/build/settings b/level_0/f_console/data/build/settings index 5bd40df..b809082 100644 --- a/level_0/f_console/data/build/settings +++ b/level_0/f_console/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_console +build_name f_console version_major 0 version_minor 5 diff --git a/level_0/f_console/data/build/settings-tests b/level_0/f_console/data/build/settings-tests index bef7d88..210211a 100644 --- a/level_0/f_console/data/build/settings-tests +++ b/level_0/f_console/data/build/settings-tests @@ -1,6 +1,6 @@ # fss-0001 -project_name test-f_console +build_name test-f_console version_major 0 version_minor 5 diff --git a/level_0/f_control_group/data/build/settings b/level_0/f_control_group/data/build/settings index 3aaf732..51f0973 100644 --- a/level_0/f_control_group/data/build/settings +++ b/level_0/f_control_group/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_control_group +build_name f_control_group version_major 0 version_minor 5 diff --git a/level_0/f_control_group/data/build/settings-tests b/level_0/f_control_group/data/build/settings-tests index d5a1f9e..43d26d7 100644 --- a/level_0/f_control_group/data/build/settings-tests +++ b/level_0/f_control_group/data/build/settings-tests @@ -1,6 +1,6 @@ # fss-0001 -project_name test-f_control_group +build_name test-f_control_group version_major 0 version_minor 5 diff --git a/level_0/f_conversion/data/build/settings b/level_0/f_conversion/data/build/settings index 9961835..0923e71 100644 --- a/level_0/f_conversion/data/build/settings +++ b/level_0/f_conversion/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_conversion +build_name f_conversion version_major 0 version_minor 5 diff --git a/level_0/f_conversion/data/build/settings-mocks b/level_0/f_conversion/data/build/settings-mocks index 8db6480..f5661d7 100644 --- a/level_0/f_conversion/data/build/settings-mocks +++ b/level_0/f_conversion/data/build/settings-mocks @@ -1,6 +1,6 @@ # fss-0001 -project_name f_conversion +build_name f_conversion version_major 0 version_minor 5 diff --git a/level_0/f_conversion/data/build/settings-tests b/level_0/f_conversion/data/build/settings-tests index cafa5ed..40951cc 100644 --- a/level_0/f_conversion/data/build/settings-tests +++ b/level_0/f_conversion/data/build/settings-tests @@ -1,6 +1,6 @@ # fss-0001 -project_name test-f_conversion +build_name test-f_conversion version_major 0 version_minor 5 diff --git a/level_0/f_directory/data/build/settings b/level_0/f_directory/data/build/settings index f4e528a..91f14da 100644 --- a/level_0/f_directory/data/build/settings +++ b/level_0/f_directory/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_directory +build_name f_directory version_major 0 version_minor 5 diff --git a/level_0/f_environment/data/build/settings b/level_0/f_environment/data/build/settings index e7f907d..40796dc 100644 --- a/level_0/f_environment/data/build/settings +++ b/level_0/f_environment/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_environment +build_name f_environment version_major 0 version_minor 5 diff --git a/level_0/f_execute/data/build/settings b/level_0/f_execute/data/build/settings index 5a7281f..81d9959 100644 --- a/level_0/f_execute/data/build/settings +++ b/level_0/f_execute/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_execute +build_name f_execute version_major 0 version_minor 5 diff --git a/level_0/f_file/data/build/settings b/level_0/f_file/data/build/settings index 8985b7a..e1c10c1 100644 --- a/level_0/f_file/data/build/settings +++ b/level_0/f_file/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_file +build_name f_file version_major 0 version_minor 5 diff --git a/level_0/f_fss/data/build/settings b/level_0/f_fss/data/build/settings index ac8f597..28f0a01 100644 --- a/level_0/f_fss/data/build/settings +++ b/level_0/f_fss/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_fss +build_name f_fss version_major 0 version_minor 5 diff --git a/level_0/f_iki/data/build/settings b/level_0/f_iki/data/build/settings index 70e4951..abc0ee3 100644 --- a/level_0/f_iki/data/build/settings +++ b/level_0/f_iki/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_iki +build_name f_iki version_major 0 version_minor 5 diff --git a/level_0/f_limit/data/build/settings b/level_0/f_limit/data/build/settings index 2d8f4e4..591e151 100644 --- a/level_0/f_limit/data/build/settings +++ b/level_0/f_limit/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_limit +build_name f_limit version_major 0 version_minor 5 diff --git a/level_0/f_memory/data/build/settings b/level_0/f_memory/data/build/settings index a3b235e..a5e9ffe 100644 --- a/level_0/f_memory/data/build/settings +++ b/level_0/f_memory/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_memory +build_name f_memory version_major 0 version_minor 5 diff --git a/level_0/f_memory/data/build/settings-tests b/level_0/f_memory/data/build/settings-tests index 7d10910..6c8723e 100644 --- a/level_0/f_memory/data/build/settings-tests +++ b/level_0/f_memory/data/build/settings-tests @@ -1,6 +1,6 @@ # fss-0001 -project_name test-f_memory +build_name test-f_memory version_major 0 version_file major diff --git a/level_0/f_path/data/build/settings b/level_0/f_path/data/build/settings index 85980ac..4c7ce68 100644 --- a/level_0/f_path/data/build/settings +++ b/level_0/f_path/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_path +build_name f_path version_major 0 version_minor 5 diff --git a/level_0/f_pipe/data/build/settings b/level_0/f_pipe/data/build/settings index b58d734..b4ff9e0 100644 --- a/level_0/f_pipe/data/build/settings +++ b/level_0/f_pipe/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_pipe +build_name f_pipe version_major 0 version_minor 5 diff --git a/level_0/f_print/data/build/settings b/level_0/f_print/data/build/settings index c8690b6..7ebb4c1 100644 --- a/level_0/f_print/data/build/settings +++ b/level_0/f_print/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_print +build_name f_print version_major 0 version_minor 5 diff --git a/level_0/f_serialize/data/build/settings b/level_0/f_serialize/data/build/settings index 828bf7d..81d95fa 100644 --- a/level_0/f_serialize/data/build/settings +++ b/level_0/f_serialize/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_serialize +build_name f_serialize version_major 0 version_minor 5 diff --git a/level_0/f_signal/data/build/settings b/level_0/f_signal/data/build/settings index f849fe0..a9a9de2 100644 --- a/level_0/f_signal/data/build/settings +++ b/level_0/f_signal/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_signal +build_name f_signal version_major 0 version_minor 5 diff --git a/level_0/f_socket/data/build/settings b/level_0/f_socket/data/build/settings index bb8b924..65f944f 100644 --- a/level_0/f_socket/data/build/settings +++ b/level_0/f_socket/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_socket +build_name f_socket version_major 0 version_minor 5 diff --git a/level_0/f_status/data/build/settings b/level_0/f_status/data/build/settings index 9fdf26d..f8df027 100644 --- a/level_0/f_status/data/build/settings +++ b/level_0/f_status/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_status +build_name f_status version_major 0 version_minor 5 diff --git a/level_0/f_status_string/data/build/settings b/level_0/f_status_string/data/build/settings index 601d9ed..a516d53 100644 --- a/level_0/f_status_string/data/build/settings +++ b/level_0/f_status_string/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_status_string +build_name f_status_string version_major 0 version_minor 5 diff --git a/level_0/f_string/data/build/settings b/level_0/f_string/data/build/settings index 77e425e..f2c7e90 100644 --- a/level_0/f_string/data/build/settings +++ b/level_0/f_string/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_string +build_name f_string version_major 0 version_minor 5 diff --git a/level_0/f_thread/data/build/settings b/level_0/f_thread/data/build/settings index 6941c2b..c4492b0 100644 --- a/level_0/f_thread/data/build/settings +++ b/level_0/f_thread/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_thread +build_name f_thread version_major 0 version_minor 5 diff --git a/level_0/f_type/data/build/settings b/level_0/f_type/data/build/settings index 03cd39b..074c8f8 100644 --- a/level_0/f_type/data/build/settings +++ b/level_0/f_type/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_type +build_name f_type version_major 0 version_minor 5 diff --git a/level_0/f_type_array/data/build/settings b/level_0/f_type_array/data/build/settings index 95a8428..3e3d6b6 100644 --- a/level_0/f_type_array/data/build/settings +++ b/level_0/f_type_array/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_type_array +build_name f_type_array version_major 0 version_minor 5 diff --git a/level_0/f_type_array/data/build/settings-tests b/level_0/f_type_array/data/build/settings-tests index b8b0ecc..9e8777e 100644 --- a/level_0/f_type_array/data/build/settings-tests +++ b/level_0/f_type_array/data/build/settings-tests @@ -1,6 +1,6 @@ # fss-0001 -project_name test-f_type_array +build_name test-f_type_array version_major 0 version_file major diff --git a/level_0/f_utf/data/build/settings b/level_0/f_utf/data/build/settings index 1671b84..8f9f0f8 100644 --- a/level_0/f_utf/data/build/settings +++ b/level_0/f_utf/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name f_utf +build_name f_utf version_major 0 version_minor 5 diff --git a/level_1/fl_control_group/data/build/settings b/level_1/fl_control_group/data/build/settings index 6f27a2a..5b2b797 100644 --- a/level_1/fl_control_group/data/build/settings +++ b/level_1/fl_control_group/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fl_control_group +build_name fl_control_group version_major 0 version_minor 5 diff --git a/level_1/fl_conversion/data/build/settings b/level_1/fl_conversion/data/build/settings index 89fada7..bbf8c89 100644 --- a/level_1/fl_conversion/data/build/settings +++ b/level_1/fl_conversion/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fl_conversion +build_name fl_conversion version_major 0 version_minor 5 diff --git a/level_1/fl_directory/data/build/settings b/level_1/fl_directory/data/build/settings index 9b05218..90886f4 100644 --- a/level_1/fl_directory/data/build/settings +++ b/level_1/fl_directory/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fl_directory +build_name fl_directory version_major 0 version_minor 5 diff --git a/level_1/fl_environment/data/build/settings b/level_1/fl_environment/data/build/settings index 906f5ee..79de7e2 100644 --- a/level_1/fl_environment/data/build/settings +++ b/level_1/fl_environment/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fl_environment +build_name fl_environment version_major 0 version_minor 5 diff --git a/level_1/fl_execute/data/build/settings b/level_1/fl_execute/data/build/settings index 1633f2f..5d8f187 100644 --- a/level_1/fl_execute/data/build/settings +++ b/level_1/fl_execute/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fl_execute +build_name fl_execute version_major 0 version_minor 5 diff --git a/level_1/fl_fss/data/build/settings b/level_1/fl_fss/data/build/settings index 0cacf70..d51fdf9 100644 --- a/level_1/fl_fss/data/build/settings +++ b/level_1/fl_fss/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fl_fss +build_name fl_fss version_major 0 version_minor 5 diff --git a/level_1/fl_iki/data/build/settings b/level_1/fl_iki/data/build/settings index 99f3d1c..c5a694b 100644 --- a/level_1/fl_iki/data/build/settings +++ b/level_1/fl_iki/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fl_iki +build_name fl_iki version_major 0 version_minor 5 diff --git a/level_1/fl_print/data/build/settings b/level_1/fl_print/data/build/settings index e735df7..7def772 100644 --- a/level_1/fl_print/data/build/settings +++ b/level_1/fl_print/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fl_print +build_name fl_print version_major 0 version_minor 5 diff --git a/level_1/fl_signal/data/build/settings b/level_1/fl_signal/data/build/settings index 2156b31..0f39de9 100644 --- a/level_1/fl_signal/data/build/settings +++ b/level_1/fl_signal/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fl_signal +build_name fl_signal version_major 0 version_minor 5 diff --git a/level_1/fl_string/data/build/settings b/level_1/fl_string/data/build/settings index 846622b..6ac92ca 100644 --- a/level_1/fl_string/data/build/settings +++ b/level_1/fl_string/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fl_string +build_name fl_string version_major 0 version_minor 5 diff --git a/level_1/fl_utf/data/build/settings b/level_1/fl_utf/data/build/settings index 62ba221..b517f59 100644 --- a/level_1/fl_utf/data/build/settings +++ b/level_1/fl_utf/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fl_utf +build_name fl_utf version_major 0 version_minor 5 diff --git a/level_1/fl_utf_file/data/build/settings b/level_1/fl_utf_file/data/build/settings index 23250f9..24620a2 100644 --- a/level_1/fl_utf_file/data/build/settings +++ b/level_1/fl_utf_file/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fl_utf_file +build_name fl_utf_file version_major 0 version_minor 5 diff --git a/level_2/fll_control_group/data/build/settings b/level_2/fll_control_group/data/build/settings index eac8f32..d172acd 100644 --- a/level_2/fll_control_group/data/build/settings +++ b/level_2/fll_control_group/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fll_control_group +build_name fll_control_group version_major 0 version_minor 5 diff --git a/level_2/fll_error/data/build/settings b/level_2/fll_error/data/build/settings index 78fbdee..e074b4f 100644 --- a/level_2/fll_error/data/build/settings +++ b/level_2/fll_error/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fll_error +build_name fll_error version_major 0 version_minor 5 diff --git a/level_2/fll_execute/data/build/settings b/level_2/fll_execute/data/build/settings index 8d0c749..5d44187 100644 --- a/level_2/fll_execute/data/build/settings +++ b/level_2/fll_execute/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fll_execute +build_name fll_execute version_major 0 version_minor 5 diff --git a/level_2/fll_file/data/build/settings b/level_2/fll_file/data/build/settings index 6ae9942..07c6e1e 100644 --- a/level_2/fll_file/data/build/settings +++ b/level_2/fll_file/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fll_file +build_name fll_file version_major 0 version_minor 5 diff --git a/level_2/fll_fss/data/build/settings b/level_2/fll_fss/data/build/settings index 3cc7a93..8e05237 100644 --- a/level_2/fll_fss/data/build/settings +++ b/level_2/fll_fss/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fll_fss +build_name fll_fss version_major 0 version_minor 5 diff --git a/level_2/fll_fss_status_string/data/build/settings b/level_2/fll_fss_status_string/data/build/settings index 2ae0daf..b4fc687 100644 --- a/level_2/fll_fss_status_string/data/build/settings +++ b/level_2/fll_fss_status_string/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fll_fss_status_string +build_name fll_fss_status_string version_major 0 version_minor 5 diff --git a/level_2/fll_iki/data/build/settings b/level_2/fll_iki/data/build/settings index 0a52b5f..712aa59 100644 --- a/level_2/fll_iki/data/build/settings +++ b/level_2/fll_iki/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fll_iki +build_name fll_iki version_major 0 version_minor 5 diff --git a/level_2/fll_path/data/build/settings b/level_2/fll_path/data/build/settings index 084834c..1b0c135 100644 --- a/level_2/fll_path/data/build/settings +++ b/level_2/fll_path/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fll_path +build_name fll_path version_major 0 version_minor 5 diff --git a/level_2/fll_print/data/build/settings b/level_2/fll_print/data/build/settings index 1bb8c9d..ae7e999 100644 --- a/level_2/fll_print/data/build/settings +++ b/level_2/fll_print/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fll_print +build_name fll_print version_major 0 version_minor 5 diff --git a/level_2/fll_program/data/build/settings b/level_2/fll_program/data/build/settings index b005f03..1ad23b6 100644 --- a/level_2/fll_program/data/build/settings +++ b/level_2/fll_program/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fll_program +build_name fll_program version_major 0 version_minor 5 diff --git a/level_2/fll_status_string/data/build/settings b/level_2/fll_status_string/data/build/settings index 04f4cff..769a59b 100644 --- a/level_2/fll_status_string/data/build/settings +++ b/level_2/fll_status_string/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fll_status_string +build_name fll_status_string version_major 0 version_minor 5 diff --git a/level_3/byte_dump/data/build/settings b/level_3/byte_dump/data/build/settings index 8181531..d62b208 100644 --- a/level_3/byte_dump/data/build/settings +++ b/level_3/byte_dump/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name byte_dump +build_name byte_dump version_major 0 version_minor 5 diff --git a/level_3/control/data/build/settings b/level_3/control/data/build/settings index d1d6ca7..58a698a 100644 --- a/level_3/control/data/build/settings +++ b/level_3/control/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name control +build_name control version_major 0 version_minor 5 diff --git a/level_3/controller/data/build/settings b/level_3/controller/data/build/settings index 8c472e5..7717b84 100644 --- a/level_3/controller/data/build/settings +++ b/level_3/controller/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name controller +build_name controller version_major 0 version_minor 5 diff --git a/level_3/fake/c/private-build-library.c b/level_3/fake/c/private-build-library.c index f2c65b3..bf48b59 100644 --- a/level_3/fake/c/private-build-library.c +++ b/level_3/fake/c/private-build-library.c @@ -95,7 +95,7 @@ extern "C" { f_array_length_t strings_length = 1; - parameter_file_name.used = fake_build_parameter_library_name_prefix_s.used + data_build.setting.project_name.used + fake_build_parameter_library_name_suffix_shared_s.used; + parameter_file_name.used = fake_build_parameter_library_name_prefix_s.used + data_build.setting.build_name.used + fake_build_parameter_library_name_suffix_shared_s.used; if (data_build.setting.version_major.used) { parameter_file_name_major.used = parameter_file_name.used + data_build.setting.version_major_prefix.used + data_build.setting.version_major.used; @@ -155,10 +155,10 @@ extern "C" { offset = fake_build_parameter_library_name_prefix_s.used; for (i = 0; i < strings_length; ++i) { - memcpy(strings[i] + offset, data_build.setting.project_name.string, data_build.setting.project_name.used); + memcpy(strings[i] + offset, data_build.setting.build_name.string, data_build.setting.build_name.used); } // for - offset += data_build.setting.project_name.used; + offset += data_build.setting.build_name.used; for (i = 0; i < strings_length; ++i) { memcpy(strings[i] + offset, fake_build_parameter_library_name_suffix_shared_s.string, fake_build_parameter_library_name_suffix_shared_s.used); @@ -489,7 +489,7 @@ extern "C" { if (F_status_is_error_not(*status)) { f_string_static_t destination = f_string_static_t_initialize; destination.used = main->path_build_libraries_static.used + fake_build_parameter_library_name_prefix_s.used; - destination.used += data_build.setting.project_name.used + fake_build_parameter_library_name_suffix_static_s.used; + destination.used += data_build.setting.build_name.used + fake_build_parameter_library_name_suffix_static_s.used; char destination_string[destination.used + 1]; destination.string = destination_string; @@ -503,8 +503,8 @@ extern "C" { memcpy(destination_string + destination.used, fake_build_parameter_library_name_prefix_s.string, fake_build_parameter_library_name_prefix_s.used); destination.used += fake_build_parameter_library_name_prefix_s.used; - memcpy(destination_string + destination.used, data_build.setting.project_name.string, data_build.setting.project_name.used); - destination.used += data_build.setting.project_name.used; + memcpy(destination_string + destination.used, data_build.setting.build_name.string, data_build.setting.build_name.used); + destination.used += data_build.setting.build_name.used; memcpy(destination_string + destination.used, fake_build_parameter_library_name_suffix_static_s.string, fake_build_parameter_library_name_suffix_static_s.used); destination.used += fake_build_parameter_library_name_suffix_static_s.used; diff --git a/level_3/fake/c/private-build-load.c b/level_3/fake/c/private-build-load.c index 202a532..51aaa7e 100644 --- a/level_3/fake/c/private-build-load.c +++ b/level_3/fake/c/private-build-load.c @@ -142,11 +142,11 @@ extern "C" { bool failed = F_false; f_string_static_t * const settings[] = { - &setting->project_name, + &setting->build_name, }; f_string_static_t names[] = { - fake_build_setting_name_project_name_s, + fake_build_setting_name_build_name_s, }; for (uint8_t i = 0; i < 1; ++i) { @@ -193,6 +193,7 @@ extern "C" { f_string_dynamics_t build_compiler = f_string_dynamics_t_initialize; f_string_dynamics_t build_indexer = f_string_dynamics_t_initialize; f_string_dynamics_t build_language = f_string_dynamics_t_initialize; + f_string_dynamics_t build_name = f_string_dynamics_t_initialize; f_string_dynamics_t build_script = f_string_dynamics_t_initialize; f_string_dynamics_t build_shared = f_string_dynamics_t_initialize; f_string_dynamics_t build_static = f_string_dynamics_t_initialize; @@ -209,7 +210,6 @@ extern "C" { f_string_dynamics_t path_standard = f_string_dynamics_t_initialize; f_string_dynamics_t process_post = f_string_dynamics_t_initialize; f_string_dynamics_t process_pre = f_string_dynamics_t_initialize; - f_string_dynamics_t project_name = f_string_dynamics_t_initialize; f_string_dynamics_t search_exclusive = f_string_dynamics_t_initialize; f_string_dynamics_t search_shared = f_string_dynamics_t_initialize; f_string_dynamics_t search_static = f_string_dynamics_t_initialize; @@ -232,6 +232,7 @@ extern "C" { fake_build_setting_name_build_libraries_s, fake_build_setting_name_build_libraries_shared_s, fake_build_setting_name_build_libraries_static_s, + fake_build_setting_name_build_name_s, fake_build_setting_name_build_script_s, fake_build_setting_name_build_shared_s, fake_build_setting_name_build_sources_headers_s, @@ -280,7 +281,6 @@ extern "C" { fake_build_setting_name_path_standard_s, fake_build_setting_name_process_post_s, fake_build_setting_name_process_pre_s, - fake_build_setting_name_project_name_s, fake_build_setting_name_search_exclusive_s, fake_build_setting_name_search_shared_s, fake_build_setting_name_search_static_s, @@ -304,6 +304,7 @@ extern "C" { &setting->build_libraries, &setting->build_libraries_shared, &setting->build_libraries_static, + &build_name, &build_script, &build_shared, &setting->build_sources_headers, @@ -352,7 +353,6 @@ extern "C" { &path_standard, &process_post, &process_pre, - &project_name, &search_exclusive, &search_shared, &search_static, @@ -589,6 +589,7 @@ extern "C" { fake_build_setting_name_build_compiler_s, fake_build_setting_name_build_indexer_s, fake_build_setting_name_build_language_s, + fake_build_setting_name_build_name_s, fake_build_setting_name_build_script_s, fake_build_setting_name_build_shared_s, fake_build_setting_name_build_static_s, @@ -605,7 +606,6 @@ extern "C" { fake_build_setting_name_path_standard_s, fake_build_setting_name_process_post_s, fake_build_setting_name_process_pre_s, - fake_build_setting_name_project_name_s, fake_build_setting_name_search_exclusive_s, fake_build_setting_name_search_shared_s, fake_build_setting_name_search_static_s, @@ -625,6 +625,7 @@ extern "C" { &build_compiler, &build_indexer, &build_language, + &build_name, &build_script, &build_shared, &build_static, @@ -641,7 +642,6 @@ extern "C" { &path_standard, &process_post, &process_pre, - &project_name, &search_exclusive, &search_shared, &search_static, @@ -661,6 +661,7 @@ extern "C" { 0, // build_compiler 0, // build_indexer 0, // build_language + 0, // build_name &setting->build_script, // build_script &setting->build_shared, // build_shared &setting->build_static, // build_static @@ -677,7 +678,6 @@ extern "C" { &setting->path_standard, // path_standard 0, // process_post 0, // process_pre - 0, // project_name &setting->search_exclusive, // search_exclusive &setting->search_shared, // search_shared &setting->search_static, // search_static @@ -687,6 +687,7 @@ extern "C" { &setting->build_compiler, // build_compiler &setting->build_indexer, // build_indexer 0, // build_language + &setting->build_name, // build_name 0, // build_script 0, // build_shared 0, // build_static @@ -703,7 +704,6 @@ extern "C" { 0, // path_standard &setting->process_post, // process_post &setting->process_pre, // process_pre - &setting->project_name, // project_name 0, // search_exclusive 0, // search_shared 0, // search_static @@ -728,6 +728,7 @@ extern "C" { 0, // build_compiler 0, // build_indexer 0, // build_language + 0, // build_name 0, // build_script 0, // build_shared 0, // build_static @@ -744,7 +745,6 @@ extern "C" { 0, // path_standard 0, // process_post 0, // process_pre - 0, // project_name 0, // search_exclusive 0, // search_shared 0, // search_static @@ -764,6 +764,7 @@ extern "C" { 0, // build_compiler 0, // build_indexer 0, // build_language + 0, // build_name 0, // build_script 0, // build_shared 0, // build_static @@ -780,7 +781,6 @@ extern "C" { 0, // path_standard 0, // process_post 0, // process_pre - 0, // project_name 0, // search_exclusive 0, // search_shared 0, // search_static @@ -800,6 +800,7 @@ extern "C" { f_string_empty_s, // build_compiler f_string_empty_s, // build_indexer f_string_empty_s, // build_language + f_string_empty_s, // build_name f_string_empty_s, // build_script f_string_empty_s, // build_shared f_string_empty_s, // build_static @@ -816,7 +817,6 @@ extern "C" { f_string_empty_s, // path_standard f_string_empty_s, // process_post f_string_empty_s, // process_pre - f_string_empty_s, // project_name f_string_empty_s, // search_exclusive f_string_empty_s, // search_shared f_string_empty_s, // search_static @@ -837,6 +837,7 @@ extern "C" { 3, // build_compiler 3, // build_indexer 4, // build_language + 3, // build_name 1, // build_script 1, // build_shared 1, // build_static @@ -853,7 +854,6 @@ extern "C" { 1, // path_standard 3, // process_post 3, // process_pre - 3, // project_name 1, // search_exclusive 1, // search_shared 1, // search_static @@ -1162,6 +1162,7 @@ extern "C" { f_string_dynamics_resize(0, &build_compiler); f_string_dynamics_resize(0, &build_indexer); f_string_dynamics_resize(0, &build_language); + f_string_dynamics_resize(0, &build_name); f_string_dynamics_resize(0, &build_script); f_string_dynamics_resize(0, &build_shared); f_string_dynamics_resize(0, &build_static); @@ -1178,7 +1179,6 @@ extern "C" { f_string_dynamics_resize(0, &path_standard); f_string_dynamics_resize(0, &process_post); f_string_dynamics_resize(0, &process_pre); - f_string_dynamics_resize(0, &project_name); f_string_dynamics_resize(0, &search_exclusive); f_string_dynamics_resize(0, &search_shared); f_string_dynamics_resize(0, &search_static); diff --git a/level_3/fake/c/private-build-program.c b/level_3/fake/c/private-build-program.c index 00d9ecd..77c176d 100644 --- a/level_3/fake/c/private-build-program.c +++ b/level_3/fake/c/private-build-program.c @@ -80,14 +80,14 @@ extern "C" { if (F_status_is_error_not(*status)) { f_string_static_t parameter_file_name_path = f_string_static_t_initialize; - parameter_file_name_path.used = main->path_build_programs_shared.used + data_build.setting.project_name.used; + parameter_file_name_path.used = main->path_build_programs_shared.used + data_build.setting.build_name.used; char parameter_file_name_path_string[parameter_file_name_path.used + 1]; parameter_file_name_path.string = parameter_file_name_path_string; parameter_file_name_path_string[parameter_file_name_path.used] = 0; memcpy(parameter_file_name_path_string, main->path_build_programs_shared.string, main->path_build_programs_shared.used); - memcpy(parameter_file_name_path_string + main->path_build_programs_shared.used, data_build.setting.project_name.string, data_build.setting.project_name.used); + memcpy(parameter_file_name_path_string + main->path_build_programs_shared.used, data_build.setting.build_name.string, data_build.setting.build_name.used); const f_string_static_t values[] = { fake_build_parameter_library_output_s, @@ -103,17 +103,17 @@ extern "C" { } // for } - // If project-specific library sources exist, then the -lproject_name needs to be added to the arguments. + // If project-specific library sources exist, then the -lbuild_name needs to be added to the arguments. if (F_status_is_error_not(*status) && data_build.setting.build_sources_library.used) { f_string_static_t link_project_library = f_string_static_t_initialize; - link_project_library.used = fake_build_parameter_library_link_file_s.used + data_build.setting.project_name.used; + link_project_library.used = fake_build_parameter_library_link_file_s.used + data_build.setting.build_name.used; char link_project_library_string[link_project_library.used + 1]; link_project_library.string = link_project_library_string; link_project_library_string[link_project_library.used] = 0; memcpy(link_project_library_string, fake_build_parameter_library_link_file_s.string, fake_build_parameter_library_link_file_s.used); - memcpy(link_project_library_string + fake_build_parameter_library_link_file_s.used, data_build.setting.project_name.string, data_build.setting.project_name.used); + memcpy(link_project_library_string + fake_build_parameter_library_link_file_s.used, data_build.setting.build_name.string, data_build.setting.build_name.used); *status = fll_execute_arguments_add(link_project_library, &arguments); } @@ -201,7 +201,7 @@ extern "C" { if (F_status_is_error_not(*status)) { f_string_static_t source_library = f_string_static_t_initialize; - source_library.used = main->path_build_libraries_static.used + fake_build_parameter_library_name_prefix_s.used + data_build.setting.project_name.used + fake_build_parameter_library_name_suffix_static_s.used; + source_library.used = main->path_build_libraries_static.used + fake_build_parameter_library_name_prefix_s.used + data_build.setting.build_name.used + fake_build_parameter_library_name_suffix_static_s.used; char source_library_string[source_library.used + 1]; source_library.string = source_library_string; @@ -216,22 +216,22 @@ extern "C" { memcpy(source_library_string + source_library.used, fake_build_parameter_library_name_prefix_s.string, fake_build_parameter_library_name_prefix_s.used); source_library.used += fake_build_parameter_library_name_prefix_s.used; - memcpy(source_library_string + source_library.used, data_build.setting.project_name.string, data_build.setting.project_name.used); - source_library.used += data_build.setting.project_name.used; + memcpy(source_library_string + source_library.used, data_build.setting.build_name.string, data_build.setting.build_name.used); + source_library.used += data_build.setting.build_name.used; memcpy(source_library_string + source_library.used, fake_build_parameter_library_name_suffix_static_s.string, fake_build_parameter_library_name_suffix_static_s.used); source_library.used += fake_build_parameter_library_name_suffix_static_s.used; } f_string_static_t parameter_file_name_path = f_string_static_t_initialize; - parameter_file_name_path.used = main->path_build_programs_static.used + data_build.setting.project_name.used; + parameter_file_name_path.used = main->path_build_programs_static.used + data_build.setting.build_name.used; char parameter_file_name_path_string[parameter_file_name_path.used + 1]; parameter_file_name_path.string = parameter_file_name_path_string; parameter_file_name_path_string[parameter_file_name_path.used] = 0; memcpy(parameter_file_name_path_string, main->path_build_programs_static.string, main->path_build_programs_static.used); - memcpy(parameter_file_name_path_string + main->path_build_programs_static.used, data_build.setting.project_name.string, data_build.setting.project_name.used); + memcpy(parameter_file_name_path_string + main->path_build_programs_static.used, data_build.setting.build_name.string, data_build.setting.build_name.used); const f_string_static_t values[] = { source_library, diff --git a/level_3/fake/c/private-build.c b/level_3/fake/c/private-build.c index b578399..39db92f 100644 --- a/level_3/fake/c/private-build.c +++ b/level_3/fake/c/private-build.c @@ -793,8 +793,8 @@ extern "C" { if (main->output.verbosity != f_console_verbosity_quiet_e) { flockfile(main->output.to.stream); - fl_print_format("%r%[Building project%] ", main->output.to.stream, f_string_eol_s, main->context.set.important, main->context.set.important); - fl_print_format("%[%Q%]", main->output.to.stream, main->context.set.notable, data_build.setting.project_name, main->context.set.notable); + fl_print_format("%r%[Building%] ", main->output.to.stream, f_string_eol_s, main->context.set.important, main->context.set.important); + fl_print_format("%[%Q%]", main->output.to.stream, main->context.set.notable, data_build.setting.build_name, main->context.set.notable); fl_print_format("%[.%]%r", main->output.to.stream, main->context.set.important, main->context.set.important, f_string_eol_s); funlockfile(main->output.to.stream); diff --git a/level_3/fake/c/private-common.c b/level_3/fake/c/private-common.c index d261a6d..a6b0ae0 100644 --- a/level_3/fake/c/private-common.c +++ b/level_3/fake/c/private-common.c @@ -8,12 +8,13 @@ extern "C" { #ifndef _di_fake_build_setting_t_ const f_string_static_t fake_build_setting_name_build_compiler_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_compiler_s, 0, FAKE_build_setting_name_build_compiler_s_length); + const f_string_static_t fake_build_setting_name_build_indexer_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_indexer_s, 0, FAKE_build_setting_name_build_indexer_s_length); + const f_string_static_t fake_build_setting_name_build_indexer_arguments_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_indexer_arguments_s, 0, FAKE_build_setting_name_build_indexer_arguments_s_length); const f_string_static_t fake_build_setting_name_build_language_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_language_s, 0, FAKE_build_setting_name_build_language_s_length); const f_string_static_t fake_build_setting_name_build_libraries_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_libraries_s, 0, FAKE_build_setting_name_build_libraries_s_length); const f_string_static_t fake_build_setting_name_build_libraries_shared_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_libraries_shared_s, 0, FAKE_build_setting_name_build_libraries_shared_s_length); const f_string_static_t fake_build_setting_name_build_libraries_static_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_libraries_static_s, 0, FAKE_build_setting_name_build_libraries_static_s_length); - const f_string_static_t fake_build_setting_name_build_indexer_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_indexer_s, 0, FAKE_build_setting_name_build_indexer_s_length); - const f_string_static_t fake_build_setting_name_build_indexer_arguments_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_indexer_arguments_s, 0, FAKE_build_setting_name_build_indexer_arguments_s_length); + const f_string_static_t fake_build_setting_name_build_name_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_name_s, 0, FAKE_build_setting_name_build_name_s_length); const f_string_static_t fake_build_setting_name_build_script_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_script_s, 0, FAKE_build_setting_name_build_script_s_length); const f_string_static_t fake_build_setting_name_build_shared_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_shared_s, 0, FAKE_build_setting_name_build_shared_s_length); const f_string_static_t fake_build_setting_name_build_sources_headers_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_sources_headers_s, 0, FAKE_build_setting_name_build_sources_headers_s_length); @@ -62,7 +63,6 @@ extern "C" { const f_string_static_t fake_build_setting_name_path_standard_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_path_standard_s, 0, FAKE_build_setting_name_path_standard_s_length); const f_string_static_t fake_build_setting_name_process_post_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_process_post_s, 0, FAKE_build_setting_name_process_post_s_length); const f_string_static_t fake_build_setting_name_process_pre_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_process_pre_s, 0, FAKE_build_setting_name_process_pre_s_length); - const f_string_static_t fake_build_setting_name_project_name_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_project_name_s, 0, FAKE_build_setting_name_project_name_s_length); const f_string_static_t fake_build_setting_name_search_exclusive_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_search_exclusive_s, 0, FAKE_build_setting_name_search_exclusive_s_length); const f_string_static_t fake_build_setting_name_search_shared_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_search_shared_s, 0, FAKE_build_setting_name_search_shared_s_length); const f_string_static_t fake_build_setting_name_search_static_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_search_static_s, 0, FAKE_build_setting_name_search_static_s_length); diff --git a/level_3/fake/c/private-common.h b/level_3/fake/c/private-common.h index a93870a..f6c7ee3 100644 --- a/level_3/fake/c/private-common.h +++ b/level_3/fake/c/private-common.h @@ -32,6 +32,7 @@ extern "C" { f_string_dynamic_t build_compiler; f_string_dynamic_t build_indexer; + f_string_dynamic_t build_name; f_string_dynamic_t path_headers; f_string_dynamic_t path_language; f_string_dynamic_t path_library_script; @@ -43,7 +44,6 @@ extern "C" { f_string_dynamic_t path_sources; f_string_dynamic_t process_post; f_string_dynamic_t process_pre; - f_string_dynamic_t project_name; f_string_dynamic_t version_major; f_string_dynamic_t version_major_prefix; f_string_dynamic_t version_micro; @@ -166,6 +166,7 @@ extern "C" { #define macro_fake_build_setting_t_delete_simple(setting) \ macro_f_string_dynamic_t_delete_simple(setting.build_compiler) \ macro_f_string_dynamic_t_delete_simple(setting.build_indexer) \ + macro_f_string_dynamic_t_delete_simple(setting.build_name) \ macro_f_string_dynamic_t_delete_simple(setting.path_headers) \ macro_f_string_dynamic_t_delete_simple(setting.path_language) \ macro_f_string_dynamic_t_delete_simple(setting.path_library_script) \ @@ -177,7 +178,6 @@ extern "C" { macro_f_string_dynamic_t_delete_simple(setting.path_sources) \ macro_f_string_dynamic_t_delete_simple(setting.process_post) \ macro_f_string_dynamic_t_delete_simple(setting.process_pre) \ - macro_f_string_dynamic_t_delete_simple(setting.project_name) \ macro_f_string_dynamic_t_delete_simple(setting.version_major) \ macro_f_string_dynamic_t_delete_simple(setting.version_major_prefix) \ macro_f_string_dynamic_t_delete_simple(setting.version_micro) \ @@ -224,12 +224,13 @@ extern "C" { macro_f_string_dynamics_t_delete_simple(setting.modes_default) #define FAKE_build_setting_name_build_compiler_s "build_compiler" + #define FAKE_build_setting_name_build_indexer_s "build_indexer" + #define FAKE_build_setting_name_build_indexer_arguments_s "build_indexer_arguments" #define FAKE_build_setting_name_build_language_s "build_language" #define FAKE_build_setting_name_build_libraries_s "build_libraries" #define FAKE_build_setting_name_build_libraries_shared_s "build_libraries_shared" #define FAKE_build_setting_name_build_libraries_static_s "build_libraries_static" - #define FAKE_build_setting_name_build_indexer_s "build_indexer" - #define FAKE_build_setting_name_build_indexer_arguments_s "build_indexer_arguments" + #define FAKE_build_setting_name_build_name_s "build_name" #define FAKE_build_setting_name_build_script_s "build_script" #define FAKE_build_setting_name_build_shared_s "build_shared" #define FAKE_build_setting_name_build_sources_headers_s "build_sources_headers" @@ -278,7 +279,6 @@ extern "C" { #define FAKE_build_setting_name_path_standard_s "path_standard" #define FAKE_build_setting_name_process_post_s "process_post" #define FAKE_build_setting_name_process_pre_s "process_pre" - #define FAKE_build_setting_name_project_name_s "project_name" #define FAKE_build_setting_name_search_exclusive_s "search_exclusive" #define FAKE_build_setting_name_search_shared_s "search_shared" #define FAKE_build_setting_name_search_static_s "search_static" @@ -294,12 +294,13 @@ extern "C" { #define FAKE_build_setting_name_version_target_s "version_target" #define FAKE_build_setting_name_build_compiler_s_length 14 + #define FAKE_build_setting_name_build_indexer_s_length 13 + #define FAKE_build_setting_name_build_indexer_arguments_s_length 23 #define FAKE_build_setting_name_build_language_s_length 14 #define FAKE_build_setting_name_build_libraries_s_length 15 #define FAKE_build_setting_name_build_libraries_shared_s_length 22 #define FAKE_build_setting_name_build_libraries_static_s_length 22 - #define FAKE_build_setting_name_build_indexer_s_length 13 - #define FAKE_build_setting_name_build_indexer_arguments_s_length 23 + #define FAKE_build_setting_name_build_name_s_length 10 #define FAKE_build_setting_name_build_script_s_length 12 #define FAKE_build_setting_name_build_shared_s_length 12 #define FAKE_build_setting_name_build_sources_headers_s_length 21 @@ -348,7 +349,6 @@ extern "C" { #define FAKE_build_setting_name_path_standard_s_length 13 #define FAKE_build_setting_name_process_post_s_length 12 #define FAKE_build_setting_name_process_pre_s_length 11 - #define FAKE_build_setting_name_project_name_s_length 12 #define FAKE_build_setting_name_search_exclusive_s_length 16 #define FAKE_build_setting_name_search_shared_s_length 13 #define FAKE_build_setting_name_search_static_s_length 13 @@ -364,12 +364,13 @@ extern "C" { #define FAKE_build_setting_name_version_target_s_length 14 extern const f_string_static_t fake_build_setting_name_build_compiler_s; + extern const f_string_static_t fake_build_setting_name_build_indexer_s; + extern const f_string_static_t fake_build_setting_name_build_indexer_arguments_s; extern const f_string_static_t fake_build_setting_name_build_language_s; extern const f_string_static_t fake_build_setting_name_build_libraries_s; extern const f_string_static_t fake_build_setting_name_build_libraries_shared_s; extern const f_string_static_t fake_build_setting_name_build_libraries_static_s; - extern const f_string_static_t fake_build_setting_name_build_indexer_s; - extern const f_string_static_t fake_build_setting_name_build_indexer_arguments_s; + extern const f_string_static_t fake_build_setting_name_build_name_s; extern const f_string_static_t fake_build_setting_name_build_script_s; extern const f_string_static_t fake_build_setting_name_build_shared_s; extern const f_string_static_t fake_build_setting_name_build_sources_headers_s; @@ -418,7 +419,6 @@ extern "C" { extern const f_string_static_t fake_build_setting_name_path_standard_s; extern const f_string_static_t fake_build_setting_name_process_post_s; extern const f_string_static_t fake_build_setting_name_process_pre_s; - extern const f_string_static_t fake_build_setting_name_project_name_s; extern const f_string_static_t fake_build_setting_name_search_exclusive_s; extern const f_string_static_t fake_build_setting_name_search_shared_s; extern const f_string_static_t fake_build_setting_name_search_static_s; diff --git a/level_3/fake/c/private-make-operate.c b/level_3/fake/c/private-make-operate.c index 8f9a0c8..5abbe13 100644 --- a/level_3/fake/c/private-make-operate.c +++ b/level_3/fake/c/private-make-operate.c @@ -25,7 +25,7 @@ extern "C" { } if (main->output.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%r%[Making project.%]%r", main->output.to.stream, f_string_eol_s, main->context.set.important, main->context.set.important, f_string_eol_s); + fll_print_format("%r%[Making.%]%r", main->output.to.stream, f_string_eol_s, main->context.set.important, main->context.set.important, f_string_eol_s); } f_status_t status = F_none; @@ -647,6 +647,7 @@ extern "C" { const f_string_static_t dynamic_name[] = { fake_build_setting_name_build_compiler_s, fake_build_setting_name_build_indexer_s, + fake_build_setting_name_build_name_s, fake_build_setting_name_path_headers_s, fake_build_setting_name_path_language_s, fake_build_setting_name_path_library_script_s, @@ -658,7 +659,6 @@ extern "C" { fake_build_setting_name_path_sources_s, fake_build_setting_name_process_post_s, fake_build_setting_name_process_pre_s, - fake_build_setting_name_project_name_s, fake_build_setting_name_version_major_s, fake_build_setting_name_version_micro_s, fake_build_setting_name_version_minor_s, @@ -667,6 +667,7 @@ extern "C" { const f_string_dynamic_t dynamic_value[] = { data_make->setting_build.build_compiler, data_make->setting_build.build_indexer, + data_make->setting_build.build_name, data_make->setting_build.path_headers, data_make->setting_build.path_language, data_make->setting_build.path_library_script, @@ -678,7 +679,6 @@ extern "C" { data_make->setting_build.path_sources, data_make->setting_build.process_post, data_make->setting_build.process_pre, - data_make->setting_build.project_name, data_make->setting_build.version_major, data_make->setting_build.version_micro, data_make->setting_build.version_minor, diff --git a/level_3/fake/data/build/settings b/level_3/fake/data/build/settings index c7e1ab9..2cbe90d 100644 --- a/level_3/fake/data/build/settings +++ b/level_3/fake/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fake +build_name fake version_major 0 version_minor 5 diff --git a/level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2 b/level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2 index 6373619..de100a1 100644 --- a/level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2 +++ b/level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2 @@ -9,7 +9,7 @@ # 4) Copy this file (settings-bzip2) into the created directory path "data/build/". # 5) Use the featureless make build operation to build, such as: "fake build -s settings-bzip2". -project_name bzip2 +build_name bzip2 version_major 1 version_minor 0 diff --git a/level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2recover b/level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2recover index 515c373..d0b8389 100644 --- a/level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2recover +++ b/level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2recover @@ -9,7 +9,7 @@ # 4) copy this file (settings-bzip2recover) into the created directory path "data/build/". # 5) use the featureless make build operation to build, such as: "fake build -s settings-bzip2recover". -project_name bzip2recover +build_name bzip2recover version_major 1 version_minor 0 diff --git a/level_3/fake/data/projects/cmocka/1.1.5/settings b/level_3/fake/data/projects/cmocka/1.1.5/settings index 6a82626..e0b847a 100644 --- a/level_3/fake/data/projects/cmocka/1.1.5/settings +++ b/level_3/fake/data/projects/cmocka/1.1.5/settings @@ -11,7 +11,7 @@ # # This depends on a c-library with realtime and pthread support. -project_name cmocka +build_name cmocka version_major 1 version_minor 1 diff --git a/level_3/fake/documents/settings.txt b/level_3/fake/documents/settings.txt index 5a24645..5deb215 100644 --- a/level_3/fake/documents/settings.txt +++ b/level_3/fake/documents/settings.txt @@ -45,6 +45,11 @@ Settings Documentation: The order of these may matter if the compiler (such as GCC or a linker via GCC) is order sensitive. These are applied to only static builds. + - build_name\: + The name of the build, which often represent the project name. + If program sources are specified, then this will be used as the program name. + If library sources are specified, then this will be used in the library name, such as "libX.so" where "X" would be the "build_name" value. + - build_script\: When "yes", the build process will build any scripts, such as a Bash script. This is currently not implemented. @@ -309,11 +314,6 @@ Settings Documentation: Sources Path parameter, such as "-S X', whereas "X" is any valid argument associated with "-S". Work Path parameter, such as "-w X', whereas "X" is any valid argument associated with "-w". - - project_name\: - The name of the project. - If program sources are specified, then this will be used as the program name. - If library sources are specified, then this will be used in the library name, such as "libX.so" where "X" would be the "project_name" value. - - search_exclusive\: When "yes", the search path during compile for shared libraries will only include shared library paths. When "no", the search path during compile time for shared libraries will include shared library paths followed by static library paths. @@ -336,10 +336,10 @@ Settings Documentation: A Symbolic link is created against this created file such that "libX.so" is a link to "libX.so.A". For all files other than when file is "major", another symbolic link is created against this such that "libX.so.A" is a link to "libX.so.A.X" such that X is the respective "B", "B.C', or "B.C.D" as described below. The default file is "major". - When "major" is used, the file created is "libX.so.A", whereas "X" is the "project_name" and "A" is the major version. - When "minor" is used, the file created is "libX.so.A.B", whereas "X" is the "project_name" and "A.B" is the major and minor versions, respectively. - When "micro" is used, the file created is "libX.so.A.B.C", whereas "X" is the "project_name" and "A.B.C" is the major, minor, and micro versions, respectively. - When "nano" is used, the file created is "libX.so.A.B.C.D", whereas "X" is the "project_name" and "A.B.C.D" is the major, minor, micro, and nano versions, respectively. + When "major" is used, the file created is "libX.so.A", whereas "X" is the "build_name" and "A" is the major version. + When "minor" is used, the file created is "libX.so.A.B", whereas "X" is the "build_name" and "A.B" is the major and minor versions, respectively. + When "micro" is used, the file created is "libX.so.A.B.C", whereas "X" is the "build_name" and "A.B.C" is the major, minor, and micro versions, respectively. + When "nano" is used, the file created is "libX.so.A.B.C.D", whereas "X" is the "build_name" and "A.B.C.D" is the major, minor, micro, and nano versions, respectively. - version_major\: The major version number (or in theory any characters allowed in a filename). @@ -397,7 +397,7 @@ Settings Documentation: Designates which version should be used when linking the shared library. Any version prefixes are used as defined. The default target is "micro". - When "major" is used, a shared library is generated with "-Wl,-soname,libX.so.A", whereas "X" is the "project_name" and "A" is the major version. - When "minor" is used, a shared library is generated with "-Wl,-soname,libX.so.A.B", whereas "X" is the "project_name" and "A.B" is the major and minor versions, respectively. - When "micro" is used, a shared library is generated with "-Wl,-soname,libX.so.A.B.C", whereas "X" is the "project_name" and "A.B.C" is the major, minor, and micro versions, respectively. - When "nano" is used, a shared library is generated with "-Wl,-soname,libX.so.A.B.C.D", whereas "X" is the "project_name" and "A.B.C.D" is the major, minor, micro, and nano versions, respectively. + When "major" is used, a shared library is generated with "-Wl,-soname,libX.so.A", whereas "X" is the "build_name" and "A" is the major version. + When "minor" is used, a shared library is generated with "-Wl,-soname,libX.so.A.B", whereas "X" is the "build_name" and "A.B" is the major and minor versions, respectively. + When "micro" is used, a shared library is generated with "-Wl,-soname,libX.so.A.B.C", whereas "X" is the "build_name" and "A.B.C" is the major, minor, and micro versions, respectively. + When "nano" is used, a shared library is generated with "-Wl,-soname,libX.so.A.B.C.D", whereas "X" is the "build_name" and "A.B.C.D" is the major, minor, micro, and nano versions, respectively. diff --git a/level_3/fake/specifications/settings.txt b/level_3/fake/specifications/settings.txt index 6e4fbde..26ee4f5 100644 --- a/level_3/fake/specifications/settings.txt +++ b/level_3/fake/specifications/settings.txt @@ -17,6 +17,7 @@ Settings Specification: - build_libraries: Must only contain any number of valid library include arguments that are valid for the compiler defined in "build_compiler" Object. - build_libraries_shared: Must only contain any number of valid library include arguments that are valid for the compiler defined in "build_compiler" Object. - build_libraries_static: Must only contain any number of valid library include arguments that are valid for the compiler defined in "build_compiler" Object. + - build_name: Must only contain characters allowed in a filename. - build_script: Must only one of: "yes" or "no". - build_shared: Must only one of: "yes" or "no". - build_sources_headers: Must only contain any number of valid filenames. @@ -65,7 +66,6 @@ Settings Specification: - path_standard: Must only one of: "yes" or "no". - process_post: Must contain only a single valid filename. - process_pre: Must contain only a single valid filename. - - project_name: Must only contain characters allowed in a filename. - search_exclusive: Must only one of: "yes" or "no". - search_shared: Must only one of: "yes" or "no". - search_static: Must only one of: "yes" or "no". diff --git a/level_3/firewall/data/build/settings b/level_3/firewall/data/build/settings index 5cfb416..ae58ce9 100644 --- a/level_3/firewall/data/build/settings +++ b/level_3/firewall/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name firewall +build_name firewall version_major 0 version_minor 5 diff --git a/level_3/fss_basic_list_read/data/build/settings b/level_3/fss_basic_list_read/data/build/settings index 7d9639e..8611317 100644 --- a/level_3/fss_basic_list_read/data/build/settings +++ b/level_3/fss_basic_list_read/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fss_basic_list_read +build_name fss_basic_list_read version_major 0 version_minor 5 diff --git a/level_3/fss_basic_list_write/data/build/settings b/level_3/fss_basic_list_write/data/build/settings index 80e8fc4..8d8de08 100644 --- a/level_3/fss_basic_list_write/data/build/settings +++ b/level_3/fss_basic_list_write/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fss_basic_list_write +build_name fss_basic_list_write version_major 0 version_minor 5 diff --git a/level_3/fss_basic_read/data/build/settings b/level_3/fss_basic_read/data/build/settings index 87bee0c..1dbb788 100644 --- a/level_3/fss_basic_read/data/build/settings +++ b/level_3/fss_basic_read/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fss_basic_read +build_name fss_basic_read version_major 0 version_minor 5 diff --git a/level_3/fss_basic_write/data/build/settings b/level_3/fss_basic_write/data/build/settings index 41e83f2..af0c0d7 100644 --- a/level_3/fss_basic_write/data/build/settings +++ b/level_3/fss_basic_write/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fss_basic_write +build_name fss_basic_write version_major 0 version_minor 5 diff --git a/level_3/fss_embedded_list_read/data/build/settings b/level_3/fss_embedded_list_read/data/build/settings index 9d2b162..0b6a782 100644 --- a/level_3/fss_embedded_list_read/data/build/settings +++ b/level_3/fss_embedded_list_read/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fss_embedded_list_read +build_name fss_embedded_list_read version_major 0 version_minor 5 diff --git a/level_3/fss_embedded_list_write/data/build/settings b/level_3/fss_embedded_list_write/data/build/settings index ddfefbe..8d227b7 100644 --- a/level_3/fss_embedded_list_write/data/build/settings +++ b/level_3/fss_embedded_list_write/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fss_embedded_list_write +build_name fss_embedded_list_write version_major 0 version_minor 5 diff --git a/level_3/fss_extended_list_read/data/build/settings b/level_3/fss_extended_list_read/data/build/settings index 7c0b22a..287480f 100644 --- a/level_3/fss_extended_list_read/data/build/settings +++ b/level_3/fss_extended_list_read/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fss_extended_list_read +build_name fss_extended_list_read version_major 0 version_minor 5 diff --git a/level_3/fss_extended_list_write/data/build/settings b/level_3/fss_extended_list_write/data/build/settings index 3049dce..5f4022a 100644 --- a/level_3/fss_extended_list_write/data/build/settings +++ b/level_3/fss_extended_list_write/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fss_extended_list_write +build_name fss_extended_list_write version_major 0 version_minor 5 diff --git a/level_3/fss_extended_read/data/build/settings b/level_3/fss_extended_read/data/build/settings index fb78ae1..bcaebf0 100644 --- a/level_3/fss_extended_read/data/build/settings +++ b/level_3/fss_extended_read/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fss_extended_read +build_name fss_extended_read version_major 0 version_minor 5 diff --git a/level_3/fss_extended_write/data/build/settings b/level_3/fss_extended_write/data/build/settings index 80c4c3e..dc5323b 100644 --- a/level_3/fss_extended_write/data/build/settings +++ b/level_3/fss_extended_write/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fss_extended_write +build_name fss_extended_write version_major 0 version_minor 5 diff --git a/level_3/fss_identify/data/build/settings b/level_3/fss_identify/data/build/settings index 70e9066..43310b3 100644 --- a/level_3/fss_identify/data/build/settings +++ b/level_3/fss_identify/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fss_identify +build_name fss_identify version_major 0 version_minor 5 diff --git a/level_3/fss_payload_read/data/build/settings b/level_3/fss_payload_read/data/build/settings index e246083..b5a1ca6 100644 --- a/level_3/fss_payload_read/data/build/settings +++ b/level_3/fss_payload_read/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fss_payload_read +build_name fss_payload_read version_major 0 version_minor 5 diff --git a/level_3/fss_payload_write/data/build/settings b/level_3/fss_payload_write/data/build/settings index 22089e9..00055e7 100644 --- a/level_3/fss_payload_write/data/build/settings +++ b/level_3/fss_payload_write/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fss_payload_write +build_name fss_payload_write version_major 0 version_minor 5 diff --git a/level_3/fss_status_code/data/build/settings b/level_3/fss_status_code/data/build/settings index 8b3195c..d7c66f6 100644 --- a/level_3/fss_status_code/data/build/settings +++ b/level_3/fss_status_code/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fss_status_code +build_name fss_status_code version_major 0 version_minor 5 diff --git a/level_3/iki_read/data/build/settings b/level_3/iki_read/data/build/settings index 1d4c72e..3b3fabe 100644 --- a/level_3/iki_read/data/build/settings +++ b/level_3/iki_read/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name iki_read +build_name iki_read version_major 0 version_minor 5 diff --git a/level_3/iki_write/data/build/settings b/level_3/iki_write/data/build/settings index 6f0d784..91a0eb6 100644 --- a/level_3/iki_write/data/build/settings +++ b/level_3/iki_write/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name iki_write +build_name iki_write version_major 0 version_minor 5 diff --git a/level_3/status_code/data/build/settings b/level_3/status_code/data/build/settings index b044239..0f8033c 100644 --- a/level_3/status_code/data/build/settings +++ b/level_3/status_code/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name status_code +build_name status_code version_major 0 version_minor 5 diff --git a/level_3/utf8/data/build/settings b/level_3/utf8/data/build/settings index 8262cf1..8c36dfd 100644 --- a/level_3/utf8/data/build/settings +++ b/level_3/utf8/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name utf8 +build_name utf8 version_major 0 version_minor 5 -- 1.8.3.1