From: Kevin Day Date: Fri, 9 Jul 2021 00:45:20 +0000 (-0500) Subject: Feature: Add support for specifying nano version numbers in FLL programs. X-Git-Tag: 0.5.4~1 X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=2b298629aaec6e95a42fee374331ac7c4297a73b;p=fll Feature: Add support for specifying nano version numbers in FLL programs. The programs display the version number and so it may be helpful for certain situations to specify nano version numbers for this project. One such use case is if I were to release a development package for my own testing, I would like it to communicate the development status. With this change I can now do this in one of two ways (to achieve something like "0.5.4-dev"): 1) Specify the custom nano on the command line like: # fake clean build -d "-Dbyte_dump_nano_version_prefix=\"-\"" -d "-Dbyte_dump_nano_version=\"dev\"" 2) Specify the custom nano verson in the data/buildsettings file, prepending the defines_all Object's Content like: defines_all -Dbyte_dump_nano_version_prefix="-" -Dbyte_dump_nano_version="dev" --- diff --git a/level_3/byte_dump/c/byte_dump.h b/level_3/byte_dump/c/byte_dump.h index c307d7b..316f1ca 100644 --- a/level_3/byte_dump/c/byte_dump.h +++ b/level_3/byte_dump/c/byte_dump.h @@ -51,7 +51,16 @@ extern "C" { #define byte_dump_major_version f_string_ascii_0 #define byte_dump_minor_version f_string_ascii_5 #define byte_dump_micro_version f_string_ascii_4 - #define byte_dump_version byte_dump_major_version f_string_ascii_period byte_dump_minor_version f_string_ascii_period byte_dump_micro_version + + #ifndef byte_dump_nano_version_prefix + #define byte_dump_nano_version_prefix + #endif + + #ifndef byte_dump_nano_version + #define byte_dump_nano_version + #endif + + #define byte_dump_version byte_dump_major_version f_string_ascii_period byte_dump_minor_version f_string_ascii_period byte_dump_micro_version byte_dump_nano_version_prefix byte_dump_nano_version #endif // _di_byte_dump_version_ #ifndef _di_byte_dump_name_ diff --git a/level_3/control/c/control.h b/level_3/control/c/control.h index d43824d..a246628 100644 --- a/level_3/control/c/control.h +++ b/level_3/control/c/control.h @@ -44,7 +44,16 @@ extern "C" { #define control_major_version f_string_ascii_0 #define control_minor_version f_string_ascii_5 #define control_micro_version f_string_ascii_4 - #define control_version control_major_version f_string_ascii_period control_minor_version f_string_ascii_period control_micro_version + + #ifndef control_nano_version_prefix + #define control_nano_version_prefix + #endif + + #ifndef control_nano_version + #define control_nano_version + #endif + + #define control_version control_major_version f_string_ascii_period control_minor_version f_string_ascii_period control_micro_version control_nano_version_prefix control_nano_version #endif // _di_control_version_ #ifndef _di_control_name_ diff --git a/level_3/controller/c/controller.h b/level_3/controller/c/controller.h index f5a01af..ec93f64 100644 --- a/level_3/controller/c/controller.h +++ b/level_3/controller/c/controller.h @@ -86,7 +86,16 @@ extern "C" { #define controller_major_version f_string_ascii_0 #define controller_minor_version f_string_ascii_5 #define controller_micro_version f_string_ascii_4 - #define controller_version controller_major_version f_string_ascii_period controller_minor_version f_string_ascii_period controller_micro_version + + #ifndef controller_nano_version_prefix + #define controller_nano_version_prefix + #endif + + #ifndef controller_nano_version + #define controller_nano_version + #endif + + #define controller_version controller_major_version f_string_ascii_period controller_minor_version f_string_ascii_period controller_micro_version controller_nano_version_prefix controller_nano_version #endif // _di_controller_version_ #ifndef _di_controller_name_ diff --git a/level_3/fake/c/fake.h b/level_3/fake/c/fake.h index 4e2f778..cc59a83 100644 --- a/level_3/fake/c/fake.h +++ b/level_3/fake/c/fake.h @@ -94,7 +94,16 @@ extern "C" { #define fake_major_version f_string_ascii_0 #define fake_minor_version f_string_ascii_5 #define fake_micro_version f_string_ascii_4 - #define fake_version fake_major_version f_string_ascii_period fake_minor_version f_string_ascii_period fake_micro_version + + #ifndef fake_nano_version_prefix + #define fake_nano_version_prefix + #endif + + #ifndef fake_nano_version + #define fake_nano_version + #endif + + #define fake_version fake_major_version f_string_ascii_period fake_minor_version f_string_ascii_period fake_micro_version fake_nano_version_prefix fake_nano_version #endif // _di_fake_version_ #ifndef _di_fake_name_ diff --git a/level_3/firewall/c/firewall.h b/level_3/firewall/c/firewall.h index 8480c2d..5a37f57 100644 --- a/level_3/firewall/c/firewall.h +++ b/level_3/firewall/c/firewall.h @@ -52,7 +52,16 @@ extern "C" { #define firewall_major_version f_string_ascii_0 #define firewall_minor_version f_string_ascii_5 #define firewall_micro_version f_string_ascii_4 - #define firewall_version firewall_major_version f_string_ascii_period firewall_minor_version f_string_ascii_period firewall_micro_version + + #ifndef firewall_nano_version_prefix + #define firewall_nano_version_prefix + #endif + + #ifndef firewall_nano_version + #define firewall_nano_version + #endif + + #define firewall_version firewall_major_version f_string_ascii_period firewall_minor_version f_string_ascii_period firewall_micro_version firewall_nano_version_prefix firewall_nano_version #endif // _di_firewall_version_ #ifndef _di_firewall_name_ diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.h b/level_3/fss_basic_list_read/c/fss_basic_list_read.h index f9d85a2..0d882bc 100644 --- a/level_3/fss_basic_list_read/c/fss_basic_list_read.h +++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.h @@ -53,7 +53,16 @@ extern "C" { #define fss_basic_list_read_major_version f_string_ascii_0 #define fss_basic_list_read_minor_version f_string_ascii_5 #define fss_basic_list_read_micro_version f_string_ascii_4 - #define fss_basic_list_read_version fss_basic_list_read_major_version f_string_ascii_period fss_basic_list_read_minor_version f_string_ascii_period fss_basic_list_read_micro_version + + #ifndef fss_basic_list_read_nano_version_prefix + #define fss_basic_list_read_nano_version_prefix + #endif + + #ifndef fss_basic_list_read_nano_version + #define fss_basic_list_read_nano_version + #endif + + #define fss_basic_list_read_version fss_basic_list_read_major_version f_string_ascii_period fss_basic_list_read_minor_version f_string_ascii_period fss_basic_list_read_micro_version fss_basic_list_read_nano_version_prefix fss_basic_list_read_nano_version #endif // _di_fss_basic_list_read_version_ #ifndef _di_fss_basic_list_read_name_ diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.h b/level_3/fss_basic_list_write/c/fss_basic_list_write.h index 67ddb52..bb792c8 100644 --- a/level_3/fss_basic_list_write/c/fss_basic_list_write.h +++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.h @@ -46,7 +46,16 @@ extern "C" { #define fss_basic_list_write_major_version f_string_ascii_0 #define fss_basic_list_write_minor_version f_string_ascii_5 #define fss_basic_list_write_micro_version f_string_ascii_4 - #define fss_basic_list_write_version fss_basic_list_write_major_version f_string_ascii_period fss_basic_list_write_minor_version f_string_ascii_period fss_basic_list_write_micro_version + + #ifndef fss_basic_list_write_nano_version_prefix + #define fss_basic_list_write_nano_version_prefix + #endif + + #ifndef fss_basic_list_write_nano_version + #define fss_basic_list_write_nano_version + #endif + + #define fss_basic_list_write_version fss_basic_list_write_major_version f_string_ascii_period fss_basic_list_write_minor_version f_string_ascii_period fss_basic_list_write_micro_version fss_basic_list_write_nano_version_prefix fss_basic_list_write_nano_version #endif // _di_fss_basic_list_write_version_ #ifndef _di_fss_basic_list_write_name_ diff --git a/level_3/fss_basic_read/c/fss_basic_read.h b/level_3/fss_basic_read/c/fss_basic_read.h index 6909b82..48acea5 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.h +++ b/level_3/fss_basic_read/c/fss_basic_read.h @@ -53,7 +53,16 @@ extern "C" { #define fss_basic_read_major_version f_string_ascii_0 #define fss_basic_read_minor_version f_string_ascii_5 #define fss_basic_read_micro_version f_string_ascii_4 - #define fss_basic_read_version fss_basic_read_major_version f_string_ascii_period fss_basic_read_minor_version f_string_ascii_period fss_basic_read_micro_version + + #ifndef fss_basic_read_nano_version_prefix + #define fss_basic_read_nano_version_prefix + #endif + + #ifndef fss_basic_read_nano_version + #define fss_basic_read_nano_version + #endif + + #define fss_basic_read_version fss_basic_read_major_version f_string_ascii_period fss_basic_read_minor_version f_string_ascii_period fss_basic_read_micro_version fss_basic_read_nano_version_prefix fss_basic_read_nano_version #endif // _di_fss_basic_read_version_ #ifndef _di_fss_basic_read_name_ diff --git a/level_3/fss_basic_write/c/fss_basic_write.h b/level_3/fss_basic_write/c/fss_basic_write.h index 619a454..75b435f 100644 --- a/level_3/fss_basic_write/c/fss_basic_write.h +++ b/level_3/fss_basic_write/c/fss_basic_write.h @@ -47,7 +47,16 @@ extern "C" { #define fss_basic_write_major_version f_string_ascii_0 #define fss_basic_write_minor_version f_string_ascii_5 #define fss_basic_write_micro_version f_string_ascii_4 - #define fss_basic_write_version fss_basic_write_major_version f_string_ascii_period fss_basic_write_minor_version f_string_ascii_period fss_basic_write_micro_version + + #ifndef fss_basic_write_nano_version_prefix + #define fss_basic_write_nano_version_prefix + #endif + + #ifndef fss_basic_write_nano_version + #define fss_basic_write_nano_version + #endif + + #define fss_basic_write_version fss_basic_write_major_version f_string_ascii_period fss_basic_write_minor_version f_string_ascii_period fss_basic_write_micro_version fss_basic_write_nano_version_prefix fss_basic_write_nano_version #endif // _di_fss_basic_write_version_ #ifndef _di_fss_basic_write_name_ diff --git a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h index 73c785b..75224dc 100644 --- a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h +++ b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h @@ -53,7 +53,16 @@ extern "C" { #define fss_embedded_list_read_major_version f_string_ascii_0 #define fss_embedded_list_read_minor_version f_string_ascii_5 #define fss_embedded_list_read_micro_version f_string_ascii_4 - #define fss_embedded_list_read_version fss_embedded_list_read_major_version f_string_ascii_period fss_embedded_list_read_minor_version f_string_ascii_period fss_embedded_list_read_micro_version + + #ifndef fss_embedded_list_read_nano_version_prefix + #define fss_embedded_list_read_nano_version_prefix + #endif + + #ifndef fss_embedded_list_read_nano_version + #define fss_embedded_list_read_nano_version + #endif + + #define fss_embedded_list_read_version fss_embedded_list_read_major_version f_string_ascii_period fss_embedded_list_read_minor_version f_string_ascii_period fss_embedded_list_read_micro_version fss_embedded_list_read_nano_version_prefix fss_embedded_list_read_nano_version #endif // _di_fss_embedded_list_read_version_ #ifndef _di_fss_embedded_list_read_name_ diff --git a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h index 184633b..1ca489c 100644 --- a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h +++ b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h @@ -47,7 +47,16 @@ extern "C" { #define fss_embedded_list_write_major_version f_string_ascii_0 #define fss_embedded_list_write_minor_version f_string_ascii_5 #define fss_embedded_list_write_micro_version f_string_ascii_4 - #define fss_embedded_list_write_version fss_embedded_list_write_major_version f_string_ascii_period fss_embedded_list_write_minor_version f_string_ascii_period fss_embedded_list_write_micro_version + + #ifndef fss_embedded_list_write_nano_version_prefix + #define fss_embedded_list_write_nano_version_prefix + #endif + + #ifndef fss_embedded_list_write_nano_version + #define fss_embedded_list_write_nano_version + #endif + + #define fss_embedded_list_write_version fss_embedded_list_write_major_version f_string_ascii_period fss_embedded_list_write_minor_version f_string_ascii_period fss_embedded_list_write_micro_version fss_embedded_list_write_nano_version_prefix fss_embedded_list_write_nano_version #endif // _di_fss_embedded_list_write_version_ #ifndef _di_fss_embedded_list_write_name_ diff --git a/level_3/fss_extended_list_read/c/fss_extended_list_read.h b/level_3/fss_extended_list_read/c/fss_extended_list_read.h index 414f4a7..4ccd941 100644 --- a/level_3/fss_extended_list_read/c/fss_extended_list_read.h +++ b/level_3/fss_extended_list_read/c/fss_extended_list_read.h @@ -53,7 +53,16 @@ extern "C" { #define fss_extended_list_read_major_version f_string_ascii_0 #define fss_extended_list_read_minor_version f_string_ascii_5 #define fss_extended_list_read_micro_version f_string_ascii_4 - #define fss_extended_list_read_version fss_extended_list_read_major_version f_string_ascii_period fss_extended_list_read_minor_version f_string_ascii_period fss_extended_list_read_micro_version + + #ifndef fss_extended_list_read_nano_version_prefix + #define fss_extended_list_read_nano_version_prefix + #endif + + #ifndef fss_extended_list_read_nano_version + #define fss_extended_list_read_nano_version + #endif + + #define fss_extended_list_read_version fss_extended_list_read_major_version f_string_ascii_period fss_extended_list_read_minor_version f_string_ascii_period fss_extended_list_read_micro_version fss_extended_list_read_nano_version_prefix fss_extended_list_read_nano_version #endif // _di_fss_extended_list_read_version_ #ifndef _di_fss_extended_list_read_name_ diff --git a/level_3/fss_extended_list_write/c/fss_extended_list_write.h b/level_3/fss_extended_list_write/c/fss_extended_list_write.h index b5737f4..a31f6a8 100644 --- a/level_3/fss_extended_list_write/c/fss_extended_list_write.h +++ b/level_3/fss_extended_list_write/c/fss_extended_list_write.h @@ -47,7 +47,16 @@ extern "C" { #define fss_extended_list_write_major_version f_string_ascii_0 #define fss_extended_list_write_minor_version f_string_ascii_5 #define fss_extended_list_write_micro_version f_string_ascii_4 - #define fss_extended_list_write_version fss_extended_list_write_major_version f_string_ascii_period fss_extended_list_write_minor_version f_string_ascii_period fss_extended_list_write_micro_version + + #ifndef fss_extended_list_write_nano_version_prefix + #define fss_extended_list_write_nano_version_prefix + #endif + + #ifndef fss_extended_list_write_nano_version + #define fss_extended_list_write_nano_version + #endif + + #define fss_extended_list_write_version fss_extended_list_write_major_version f_string_ascii_period fss_extended_list_write_minor_version f_string_ascii_period fss_extended_list_write_micro_version fss_extended_list_write_nano_version_prefix fss_extended_list_write_nano_version #endif // _di_fss_extended_list_write_version_ #ifndef _di_fss_extended_list_write_name_ diff --git a/level_3/fss_extended_read/c/fss_extended_read.h b/level_3/fss_extended_read/c/fss_extended_read.h index 87a21a2..5a2f240 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.h +++ b/level_3/fss_extended_read/c/fss_extended_read.h @@ -53,7 +53,16 @@ extern "C" { #define fss_extended_read_major_version f_string_ascii_0 #define fss_extended_read_minor_version f_string_ascii_5 #define fss_extended_read_micro_version f_string_ascii_4 - #define fss_extended_read_version fss_extended_read_major_version f_string_ascii_period fss_extended_read_minor_version f_string_ascii_period fss_extended_read_micro_version + + #ifndef fss_extended_read_nano_version_prefix + #define fss_extended_read_nano_version_prefix + #endif + + #ifndef fss_extended_read_nano_version + #define fss_extended_read_nano_version + #endif + + #define fss_extended_read_version fss_extended_read_major_version f_string_ascii_period fss_extended_read_minor_version f_string_ascii_period fss_extended_read_micro_version fss_extended_read_nano_version_prefix fss_extended_read_nano_version #endif // _di_fss_extended_read_version_ #ifndef _di_fss_extended_read_name_ diff --git a/level_3/fss_extended_write/c/fss_extended_write.h b/level_3/fss_extended_write/c/fss_extended_write.h index 13b74c0..8874271 100644 --- a/level_3/fss_extended_write/c/fss_extended_write.h +++ b/level_3/fss_extended_write/c/fss_extended_write.h @@ -46,7 +46,16 @@ extern "C" { #define fss_extended_write_major_version f_string_ascii_0 #define fss_extended_write_minor_version f_string_ascii_5 #define fss_extended_write_micro_version f_string_ascii_4 - #define fss_extended_write_version fss_extended_write_major_version f_string_ascii_period fss_extended_write_minor_version f_string_ascii_period fss_extended_write_micro_version + + #ifndef fss_extended_write_nano_version_prefix + #define fss_extended_write_nano_version_prefix + #endif + + #ifndef fss_extended_write_nano_version + #define fss_extended_write_nano_version + #endif + + #define fss_extended_write_version fss_extended_write_major_version f_string_ascii_period fss_extended_write_minor_version f_string_ascii_period fss_extended_write_micro_version fss_extended_write_nano_version_prefix fss_extended_write_nano_version #endif // _di_fss_extended_write_version_ #ifndef _di_fss_extended_write_name_ diff --git a/level_3/fss_identify/c/fss_identify.h b/level_3/fss_identify/c/fss_identify.h index 2fae61d..586390b 100644 --- a/level_3/fss_identify/c/fss_identify.h +++ b/level_3/fss_identify/c/fss_identify.h @@ -50,7 +50,16 @@ extern "C" { #define fss_identify_major_version f_string_ascii_0 #define fss_identify_minor_version f_string_ascii_5 #define fss_identify_micro_version f_string_ascii_4 - #define fss_identify_version fss_identify_major_version f_string_ascii_period fss_identify_minor_version f_string_ascii_period fss_identify_micro_version + + #ifndef fss_identify_nano_version_prefix + #define fss_identify_nano_version_prefix + #endif + + #ifndef fss_identify_nano_version + #define fss_identify_nano_version + #endif + + #define fss_identify_version fss_identify_major_version f_string_ascii_period fss_identify_minor_version f_string_ascii_period fss_identify_micro_version fss_identify_nano_version_prefix fss_identify_nano_version #endif // _di_fss_identify_version_ #ifndef _di_fss_identify_name_ diff --git a/level_3/fss_status_code/c/fss_status_code.h b/level_3/fss_status_code/c/fss_status_code.h index 5bb1f65..ddb724c 100644 --- a/level_3/fss_status_code/c/fss_status_code.h +++ b/level_3/fss_status_code/c/fss_status_code.h @@ -47,7 +47,16 @@ extern "C" { #define fss_status_code_major_version f_string_ascii_0 #define fss_status_code_minor_version f_string_ascii_5 #define fss_status_code_micro_version f_string_ascii_4 - #define fss_status_code_version fss_status_code_major_version f_string_ascii_period fss_status_code_minor_version f_string_ascii_period fss_status_code_micro_version + + #ifndef fss_status_code_nano_version_prefix + #define fss_status_code_nano_version_prefix + #endif + + #ifndef fss_status_code_nano_version + #define fss_status_code_nano_version + #endif + + #define fss_status_code_version fss_status_code_major_version f_string_ascii_period fss_status_code_minor_version f_string_ascii_period fss_status_code_micro_version fss_status_code_nano_version_prefix fss_status_code_nano_version #endif // _di_fss_status_code_version_ #ifndef _di_fss_status_code_name_ diff --git a/level_3/iki_read/c/iki_read.h b/level_3/iki_read/c/iki_read.h index 74c043b..32b2de9 100644 --- a/level_3/iki_read/c/iki_read.h +++ b/level_3/iki_read/c/iki_read.h @@ -56,7 +56,16 @@ extern "C" { #define iki_read_major_version f_string_ascii_0 #define iki_read_minor_version f_string_ascii_5 #define iki_read_micro_version f_string_ascii_4 - #define iki_read_version iki_read_major_version f_string_ascii_period iki_read_minor_version f_string_ascii_period iki_read_micro_version + + #ifndef iki_read_nano_version_prefix + #define iki_read_nano_version_prefix + #endif + + #ifndef iki_read_nano_version + #define iki_read_nano_version + #endif + + #define iki_read_version iki_read_major_version f_string_ascii_period iki_read_minor_version f_string_ascii_period iki_read_micro_version iki_read_nano_version_prefix iki_read_nano_version #endif // _di_iki_read_version_ #ifndef _di_iki_read_name_ diff --git a/level_3/iki_write/c/iki_write.h b/level_3/iki_write/c/iki_write.h index fc9f67e..edf5a08 100644 --- a/level_3/iki_write/c/iki_write.h +++ b/level_3/iki_write/c/iki_write.h @@ -56,7 +56,16 @@ extern "C" { #define iki_write_major_version f_string_ascii_0 #define iki_write_minor_version f_string_ascii_5 #define iki_write_micro_version f_string_ascii_4 - #define iki_write_version iki_write_major_version f_string_ascii_period iki_write_minor_version f_string_ascii_period iki_write_micro_version + + #ifndef iki_write_nano_version_prefix + #define iki_write_nano_version_prefix + #endif + + #ifndef iki_write_nano_version + #define iki_write_nano_version + #endif + + #define iki_write_version iki_write_major_version f_string_ascii_period iki_write_minor_version f_string_ascii_period iki_write_micro_version iki_write_nano_version_prefix iki_write_nano_version #endif // _di_iki_write_version_ #ifndef _di_iki_write_name_ diff --git a/level_3/status_code/c/status_code.h b/level_3/status_code/c/status_code.h index 2c5ac48..f971704 100644 --- a/level_3/status_code/c/status_code.h +++ b/level_3/status_code/c/status_code.h @@ -46,7 +46,16 @@ extern "C" { #define status_code_major_version f_string_ascii_0 #define status_code_minor_version f_string_ascii_5 #define status_code_micro_version f_string_ascii_4 - #define status_code_version status_code_major_version f_string_ascii_period status_code_minor_version f_string_ascii_period status_code_micro_version + + #ifndef status_code_nano_version_prefix + #define status_code_nano_version_prefix + #endif + + #ifndef status_code_nano_version + #define status_code_nano_version + #endif + + #define status_code_version status_code_major_version f_string_ascii_period status_code_minor_version f_string_ascii_period status_code_micro_version status_code_nano_version_prefix status_code_nano_version #endif // _di_status_code_version_ #ifndef _di_status_code_name_