]> Kevux Git Server - fll/commitdiff
Feature: Add support for specifying nano version numbers in FLL programs.
authorKevin Day <thekevinday@gmail.com>
Fri, 9 Jul 2021 00:45:20 +0000 (19:45 -0500)
committerKevin Day <thekevinday@gmail.com>
Fri, 9 Jul 2021 00:56:56 +0000 (19:56 -0500)
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"

20 files changed:
level_3/byte_dump/c/byte_dump.h
level_3/control/c/control.h
level_3/controller/c/controller.h
level_3/fake/c/fake.h
level_3/firewall/c/firewall.h
level_3/fss_basic_list_read/c/fss_basic_list_read.h
level_3/fss_basic_list_write/c/fss_basic_list_write.h
level_3/fss_basic_read/c/fss_basic_read.h
level_3/fss_basic_write/c/fss_basic_write.h
level_3/fss_embedded_list_read/c/fss_embedded_list_read.h
level_3/fss_embedded_list_write/c/fss_embedded_list_write.h
level_3/fss_extended_list_read/c/fss_extended_list_read.h
level_3/fss_extended_list_write/c/fss_extended_list_write.h
level_3/fss_extended_read/c/fss_extended_read.h
level_3/fss_extended_write/c/fss_extended_write.h
level_3/fss_identify/c/fss_identify.h
level_3/fss_status_code/c/fss_status_code.h
level_3/iki_read/c/iki_read.h
level_3/iki_write/c/iki_write.h
level_3/status_code/c/status_code.h

index c307d7b36c37ce8f8fe013ad804966045077edd0..316f1caf5594431d2aaf056dfa4c2ed5bb2e442f 100644 (file)
@@ -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_
index d43824d9fcc8c3cc30b055f94ab4002f51f0cbfc..a246628c25e17401321faddcbb7c5400c8c2a650 100644 (file)
@@ -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_
index f5a01af51e604fbf3a9f6acadcf652f76331cf3b..ec93f64fb210051ddf772df2eef07cfe700b034f 100644 (file)
@@ -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_
index 4e2f778c30fc86a62e89a8ae2ffc91eaf01e7418..cc59a832422271d529b6bce93154edfefdb5ce18 100644 (file)
@@ -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_
index 8480c2d6546a5432e526ceb0592d807c7d0f8443..5a37f57500a9797a0565c2209fa8de819c06d679 100644 (file)
@@ -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_
index f9d85a2d78d9b2942ff853f2a132edc32f69a38e..0d882bc281c3150756c97f236f45c9024e3c3957 100644 (file)
@@ -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_
index 67ddb52bbcfb9c9dd103abc7c3c40d4453d16d72..bb792c8f7f7be3e7d3df53fbe3d31b0211e2abf2 100644 (file)
@@ -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_
index 6909b8211ec580ca9aaf17129c07fee5cd7b23d8..48acea52c91913d67a77ac8971e2f69b623e51a2 100644 (file)
@@ -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_
index 619a45440680959791f17642583f53f9a3cb64a7..75b435f906a1ee242ffb5d63337c8ff1007baa8b 100644 (file)
@@ -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_
index 73c785bacedc8a53060aa6859bab81759715f8db..75224dc2147273007aa1292eb7b61ec2b9775254 100644 (file)
@@ -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_
index 184633bddfdbad30856714910e54a1cdc029d52b..1ca489ca9ce8db1ae8ff8a2780ea0b9175d0385d 100644 (file)
@@ -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_
index 414f4a722507ba1169a3a51d6ca7695f488c841f..4ccd94167ab4c189fd240e098cdfa1eabe92c08c 100644 (file)
@@ -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_
index b5737f4928b3fbc0a0c110f0f906f1199c2a1556..a31f6a8e4bda186162f2193103b567559bae8e3e 100644 (file)
@@ -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_
index 87a21a250b35c37a32ac73af2350babce37e087b..5a2f240d5022e7fadf0500d646ea4374e2de1e0e 100644 (file)
@@ -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_
index 13b74c0a49d674176f9ed2bb791e7d78959bd95f..8874271c5d7713488daa30c543abc92bb1a0d4b2 100644 (file)
@@ -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_
index 2fae61d4a5046f4414ab90ed962e9a27a19090f5..586390b29605db7db1f36e02b015f5062f50cee7 100644 (file)
@@ -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_
index 5bb1f6564d006e3b51921c17c084f150cd91d3e4..ddb724c77b2cd51be17cd61119461bea593fe6b7 100644 (file)
@@ -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_
index 74c043be05a9aab0a0918e03f228b4302ad92528..32b2de9dee78ae550ece25b188e7577a3a97eeb1 100644 (file)
@@ -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_
index fc9f67e514e67ecab71ddbedfdd8cf538bc8bf86..edf5a08a98bdbd05ddfabbf9c0f1882ba373686e 100644 (file)
@@ -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_
index 2c5ac482c4ef82a2a2735e54aae8ca7e703af6d9..f9717045f6763778317d4c3428b00971279e1f54 100644 (file)
@@ -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_