Refs #19595: -typeobject argument is deprecated. TypeObject files wil…

…l always be generated

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

src/main/java/com/eprosima/fastdds/fastddsgen.java

@@ -107,7 +107,7 @@ public class fastddsgen
     // Generates type naming compatible with ROS 2
     private boolean m_type_ros2 = false;
 
-    // Generate TypeObject files?
+    // Generate deprecated TypeObject files
     private boolean m_type_object_files = false;
 
     // Generate string and sequence types compatible with C?
@@ -690,12 +690,12 @@ private Project parseIDL(
 
             if (m_test)
             {
-                // Load Serialization test template
+                // Load test template
                 tmanager.addGroup("com/eprosima/fastdds/idl/templates/SerializationTestSource.stg");
                 tmanager.addGroup("com/eprosima/fastdds/idl/templates/SerializationHeader.stg");
                 tmanager.addGroup("com/eprosima/fastdds/idl/templates/SerializationSource.stg");
 
-                if(m_type_object_files)
+                if(!m_type_object_files)
                 {
                     // Load TypeObject test template
                     tmanager.addGroup("com/eprosima/fastdds/idl/templates/TypeObjectTestingTestSource.stg");
@@ -748,7 +748,7 @@ private Project parseIDL(
                 lexer.setContext(ctx);
                 CommonTokenStream tokens = new CommonTokenStream(lexer);
                 IDLParser parser = new IDLParser(tokens);
-                // Pass the finelame without the extension
+                // Pass the filename without the extension
                 Specification specification = parser.specification(ctx, tmanager, maintemplates).spec;
                 returnedValue = specification != null && !tmanager.get_st_error();;
 
@@ -811,7 +811,6 @@ private Project parseIDL(
                         project.addCommonIncludeFile(relative_dir + ctx.getFilename() + ".h");
                         project.addCommonSrcFile(relative_dir + ctx.getFilename() + ".cxx");
 
-
                         if (m_type_object_files)
                         {
                             System.out.println("Generating TypeObject files...");
@@ -865,7 +864,7 @@ private Project parseIDL(
                         project.addCommonTestingFile(trimmedElement + "Serialization.cpp");
                     }
 
-                    if(m_type_object_files)
+                    if(!m_type_object_files)
                     {
                         System.out.println("Generating TypeObjects Test file...");
                         String fileNameTO = output_dir + ctx.getFilename() + "TypeObjectTestingTest.cpp";
@@ -1229,7 +1228,7 @@ private boolean genCMakeLists(
 
             cmake.add("solution", solution);
             cmake.add("test", m_test);
-            cmake.add("type_object_files", m_type_object_files);
+            cmake.add("type_object_files", !m_type_object_files);
 
             returnedValue = Utils.writeFile(m_outputDir + "CMakeLists.txt", cmake, m_replace);
         }

src/main/java/com/eprosima/fastdds/idl/templates/CMakeLists.stg

@@ -41,11 +41,11 @@ $endif$
 find_package(fastcdr 2 REQUIRED)
 find_package(fastrtps 2.12 REQUIRED)
 
-$solution.projects : { project | $pub_sub_execs(project=project, libraries=solution.libraries, test=test)$}; separator="\n"$
+$solution.projects : { project | $pub_sub_execs(project=project, libraries=solution.libraries, test=test, typeobject=type_object_files)$}; separator="\n"$
 
 >>
 
-pub_sub_execs(project, libraries, test) ::= <<
+pub_sub_execs(project, libraries, test, typeobject) ::= <<
 
 message(STATUS "Configuring $project.name$...")
 add_library($project.name$_lib $project.commonSrcFiles : { file | $file$}; separator=" "$)
@@ -78,7 +78,7 @@ target_link_libraries($project.name$SerializationTest
         $project.name$_lib $project.dependencies : { dep | $dep$_lib}; separator=" "$)
 gtest_discover_tests($project.name$SerializationTest)
 
-$if(type_object_files)$
+$if(typeobject)$
 
 # $project.name$ TypeObject Test
 add_executable($project.name$TypeObjectTestingTest

src/main/java/com/eprosima/fastdds/idl/templates/TypeObjectSource.stg

@@ -260,7 +260,7 @@ $annotation.typeDefs : { it |$typedef_decl(ctx=ctx, parent=annotation, typedefs=
 
 minimal_annotation_member(ctx, object) ::= <<
 MinimalAnnotationParameter mam_$object.name$;
-const TypeIdentifier* mam_$object.name$_typeId = $get_type_identifier(ctx=ctx, type=object.typecode, ek="false")$;
+TypeIdentifier* mam_$object.name$_typeId = $get_type_identifier(ctx=ctx, type=object.typecode, ek="false")$;
 if (mam_$object.name$_typeId != nullptr)
 {
     mam_$object.name$.common().member_type_id(*mam_$object.name$_typeId);
@@ -280,8 +280,8 @@ type_object->minimal().annotation_type().member_seq().emplace_back(mam_$object.n
 
 complete_annotation_member(ctx, object) ::= <<
 CompleteAnnotationParameter cam_$object.name$;
-const TypeIdentifier* cam_$object.name$_typeId = $get_type_identifier(ctx=ctx, type=object.typecode, ek="true")$;
-if (cam_$object.name$_typeId != nullptr)
+TypeIdentifier* cam_$object.name$_typeId = $get_type_identifier(ctx=ctx, type=object.typecode, ek="true")$;
+if (mam_$object.name$_typeId != nullptr)
 {
     cam_$object.name$.common().member_type_id(*cam_$object.name$_typeId);
 }

src/test/java/com/eprosima/fastdds/FastDDSGenTest.java

@@ -18,7 +18,6 @@ public class FastDDSGenTest
 
     private static final String INPUT_PATH = "thirdparty/dds-types-test/IDL";
     private static final String OUTPUT_PATH = "build/test/integration/idls";
-    private static final boolean TYPEOBJECTS_FLAG = true;
 
     private static boolean isUnix()
     {
@@ -119,7 +118,7 @@ public void runTests()
 
         //Configure idl tests
         TestManager tests = new TestManager(TestLevel.RUN, "share/fastddsgen/java/fastddsgen", INPUT_PATH,
-                        OUTPUT_PATH, "CMake", TYPEOBJECTS_FLAG, list_tests);
+                        OUTPUT_PATH, "CMake", list_tests);
         tests.addCMakeArguments("-DCMAKE_BUILD_TYPE=Debug");
         tests.removeTests("basic_inner_types");