Merged in develop (pull request #187)

Release 3.5.4

Author: BartHertog

README.md

@@ -92,7 +92,7 @@ You can request more information about a commercial license on our [website](htt
 What is required to be able to generate source files based on .proto files:
 1. Python 3.8 and up
 2. Pip
-3. Protobuf v21.5 and up (tested with v26.1)
+3. Protobuf v21.5 and up (tested with v27.1)
 4. Git
 
 After installing the requirements, continue by cloning the Embedded Proto repo. We advised using Embedded Proto as a submodule in your project. This way, you can track the version of Embedded Proto with the version of your project.

generator/EmbeddedProto/templates/TypeDefMsg.h

@@ -246,6 +246,8 @@ class {{ typedef.get_name() }} final: public ::EmbeddedProto::MessageInterface
 
     }
 
+#ifndef DISABLE_FIELD_NUMBER_TO_NAME 
+
     static char const* field_number_to_name(const FieldNumber fieldNumber)
     {
       char const* name = nullptr;
@@ -270,6 +272,8 @@ class {{ typedef.get_name() }} final: public ::EmbeddedProto::MessageInterface
       return name;
     }
 
+#endif
+
 #ifdef MSG_TO_STRING
 
     ::EmbeddedProto::string_view to_string(::EmbeddedProto::string_view& str) const

release_to_github.sh

@@ -32,27 +32,41 @@
 
 
 if [ $# -eq 0 ]; then
-  echo "Please provice version number: \"./release_to_github.sh X.Y.Z\""
+  echo "Please provide a version number: \"./release_to_github.sh X.Y.Z\""
 else
-  git fetch --prune
-  
-  git checkout develop
-  git pull
-  git push github develop
-
-  git checkout master
-  git pull
-  git push github master
-
-  git tag -d latest
-  git push --delete origin latest
-  git push --delete github latest
-
-  git tag latest
-  git push origin latest
-  git push github latest
-
-  git tag "$1"
-  git push origin "$1"
-  git push github "$1"
+
+  echo 'When updating the protobuf version did you: '
+  echo '  1. Update the pyproject.toml file?'
+  echo '  2. Update the version in the README installation section?'
+  echo '  3. Update the release notes?'
+  read answer
+
+  if [ "$answer" != "${answer#[Yy]}" ] ;then   
+
+    git fetch --prune
+    
+    git checkout develop
+    git pull
+    git push github develop
+
+    git checkout master
+    git pull
+    git push github master
+
+    git tag -d latest
+    git push --delete origin latest
+    git push --delete github latest
+
+    git tag latest
+    git push origin latest
+    git push github latest
+
+    git tag "$1"
+    git push origin "$1"
+    git push github "$1"
+
+  else
+    echo "Aborting"
+  fi
+
 fi

setup.py

@@ -112,26 +112,26 @@ def check_protoc_version(arguments):
         text = "\n"
         text += "The version of Protoc (v{0}.{1})".format(installed_version_minor,
                                                           installed_version_patch)
-        text += " you have installed is not the same as the version of\nthe protobuf python package " \
-                "(v{0}.{1}).".format(required_version.group('minor'), required_version.group('patch'))
+        text += " you installed is different from the Protobuf Python\npackage version" \
+                "(v{0}.{1}). ".format(required_version.group('minor'), required_version.group('patch'))
         text += "These are your options:\n" \
-                "\t1. Install a matching version of Protoc.\n" \
-                "\t2. Change the version of Embedded Proto.\n"
+                "\t1. Manually install a matching version of Protoc.\n" \
+                "\t2. Manually change the version of Embedded Proto.\n"
 
         # Check if all versions are above v21.0
         if ((21 <= int(installed_version_minor)) and (21 <= int(required_version.group('minor')))) or \
                 ((21 > int(installed_version_minor)) and (21 > int(required_version.group('minor')))):
 
             print(" [" + CYELLOW + "Caution" + CEND + "]")
-            text += ("\t3. Ignore the difference and try if it works for you (please let us know if it does not stating"
-                     " the versions you used).\n")
+            text += "\t3. Ignore the difference and try if it works for you (please let us know\n" \
+                    "\t   if it does not stating the versions you used).\n"
             print(text)
             if arguments.ignore_version_diff:
                 # Continue the setup
                 print("Automatically ignoring the difference.")
             else:
                 while True:
-                    user_input = input("Ignore the difference [Y/n]: ")
+                    user_input = input("Would you like to try option 3? [Y/n]: ")
                     if ('Y' == user_input) or ('y' == user_input):
                         # Continue the setup
                         print("Ignoring the difference.")

test/test_SimpleTypes.cpp

@@ -542,6 +542,8 @@ TEST(SimpleTypes, deserialize_fault_overlong_varint)
   EXPECT_EQ(::EmbeddedProto::Error::OVERLONG_VARINT, msg.deserialize(buffer));
 }
 
+#ifndef DISABLE_FIELD_NUMBER_TO_NAME 
+
 TEST(SimpleTypes, field_number_to_name)
 {
   EXPECT_TRUE(0 == strcmp(::Test_Simple_Types::field_number_to_name(::Test_Simple_Types::FieldNumber::A_INT32),
@@ -557,6 +559,8 @@ TEST(SimpleTypes, field_number_to_name)
                           "Invalid FieldNumber"));
 }
 
+#endif
+
 #ifdef MSG_TO_STRING
 
 TEST(SimpleTypes, to_string)

test/test_oneof_fields.cpp

@@ -441,6 +441,9 @@ TEST(OneofField, sb_oneof_serialize_empty)
 
 }
 
+
+#ifndef DISABLE_FIELD_NUMBER_TO_NAME 
+
 TEST(OneofField, field_number_to_name)
 {
   EXPECT_TRUE(0 == strcmp(::message_oneof::field_number_to_name(::message_oneof::FieldNumber::X),
@@ -453,6 +456,8 @@ TEST(OneofField, field_number_to_name)
                           "msg_ABC"));
 }
 
+#endif
+
 
 #ifdef MSG_TO_STRING
 

test/test_string_bytes.cpp

@@ -785,6 +785,8 @@ TEST(RepeatedStringBytes, deserialize)
   EXPECT_STREQ(msg.array_of_txt(2).get_const(), "Foo bar 3"); 
 }
 
+#ifndef DISABLE_FIELD_NUMBER_TO_NAME 
+
 TEST(RepeatedStringBytes, field_number_to_name)
 {
   using RSB = repeated_string_bytes<3, 15, 3, 15, 3, 3>;
@@ -797,6 +799,8 @@ TEST(RepeatedStringBytes, field_number_to_name)
                           "nested_bytes"));
 }
 
+#endif
+
 #ifdef MSG_TO_STRING
 
 TEST(RepeatedStringBytes, to_string)