User types header-only (#263)

* Refs #19960. Implementation Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19960. New argument -no-typesupport Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19960. Remove old template Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19960. New configuration to set explicitly using modules in stg Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19960. Update submodule Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19960. Update submodule Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
eProsima · Jan 25, 2024 · 058ab0c · 058ab0c
1 parent 3f5901a
commit 058ab0c
Show file tree

Hide file tree

Showing 12 changed files with 649 additions and 1,695 deletions.
diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg
diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesSource.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesSource.stg
diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesSwigInterface.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesSwigInterface.stg
@@ -38,7 +38,7 @@ $fast_macro_declarations()$
 $ctx.directIncludeDependencies : {include | %include "$include$.i"}; separator="\n"$
 
 %{
-#include "$ctx.filename$.h"
+#include "$ctx.filename$.hpp"
 
 #include <fastdds/dds/core/LoanableSequence.hpp>
 %}
@@ -66,7 +66,7 @@ namespace swig {
 $definitions; separator="\n"$
 
 // Include the class interfaces
-%include "$ctx.filename$.h"
+%include "$ctx.filename$.hpp"
 
 // Include the corresponding TopicDataType
 %include "$ctx.filename$PubSubTypes.i"

diff --git a/src/main/java/com/eprosima/fastdds/fastddsgen.java b/src/main/java/com/eprosima/fastdds/fastddsgen.java
diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/CMakeLists.stg b/src/main/java/com/eprosima/fastdds/idl/templates/CMakeLists.stg
@@ -48,13 +48,16 @@ $solution.projects : { project | $pub_sub_execs(project=project, libraries=solut
 pub_sub_execs(project, libraries, test) ::= <<
 
 message(STATUS "Configuring $project.name$...")
+$if(!project.commonSrcFiles.empty)$
 add_library($project.name$_lib $project.commonSrcFiles : { file | $file$}; separator=" "$)
 target_link_libraries($project.name$_lib $solution.libraries : { library | $library$}; separator=" "$)
+$endif$
 
 $if(!project.projectSrcFiles.empty)$
 add_executable($project.name$ $project.projectSrcFiles : { file | $file$}; separator=" "$)
 target_link_libraries($project.name$ $solution.libraries : { library | $library$}; separator=" "$
-        $project.name$_lib $project.dependencies : { dep | $dep$_lib}; separator=" "$)
+        $project.name$_lib $project.dependencies : { dep | $dep$_lib}; separator=" "$
+        )
 $endif$
 
 $if(test)$
@@ -75,7 +78,8 @@ add_executable($project.name$SerializationTest
 target_link_libraries($project.name$SerializationTest
         GTest::gtest_main
         $solution.libraries : { library | $library$}; separator=" "$
-        $project.name$_lib $project.dependencies : { dep | $dep$_lib}; separator=" "$)
+        $project.name$_lib $project.dependencies : { dep | $dep$_lib}; separator=" "$
+        )
 gtest_discover_tests($project.name$SerializationTest)
 
 $endif$

diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeHeader.stg b/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeHeader.stg
@@ -29,7 +29,7 @@ $fileHeader(ctx=ctx,  file=[ctx.filename, "PubSubTypes.h"], description=["This h
 #include <fastdds/rtps/common/SerializedPayload.h>
 #include <fastrtps/utils/md5.h>
 
-#include "$ctx.filename$.h"
+#include "$ctx.filename$.hpp"
 
 $ctx.directIncludeDependencies : {include | #include "$include$PubSubTypes.h"}; separator="\n"$
 

diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeSource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeSource.stg
@@ -31,6 +31,11 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t;
 
 $definitions; separator="\n"$
 
+$if(ctx.thereIsStructOrUnion)$
+// Include auxiliary functions like for serializing/deserializing.
+#include "$ctx.filename$CdrAux.ipp"
+$endif$
+
 >>
 
 module(ctx, parent, module, definition_list) ::= <<

diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/JNIHeader.stg b/src/main/java/com/eprosima/fastdds/idl/templates/JNIHeader.stg
@@ -19,7 +19,7 @@ import "eprosima.stg"
 main(ctx, definitions) ::= <<
 $fileHeader(ctx=ctx,  file=[ctx.filename, "JNII.cxx"], description=[""])$
 
-#include "$ctx.filename$.h"
+#include "$ctx.filename$.hpp"
 #include <jni.h>
 
 #if defined(_WIN32)

diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/SerializationHeader.stg b/src/main/java/com/eprosima/fastdds/idl/templates/SerializationHeader.stg
@@ -22,7 +22,7 @@ $fileHeader(ctx=ctx,  file=[ctx.filename, "Serialization.h"], description=["This
 #ifndef _FAST_DDS_GENERATED_$ctx.headerGuardName$_SERIALIZATION_H_
 #define _FAST_DDS_GENERATED_$ctx.headerGuardName$_SERIALIZATION_H_
 
-#include "$ctx.filename$.h"
+#include "$ctx.filename$.hpp"
 
 $definitions; separator="\n"$
 

diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/TypeObjectSource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/TypeObjectSource.stg
@@ -24,7 +24,7 @@ $fileHeader(ctx=ctx, file=[ctx.filename, "TypeObject.cpp"], description=["This s
 namespace { char dummy; }
 #endif
 
-#include "$ctx.filename$.h"
+#include "$ctx.filename$.hpp"
 #include "$ctx.filename$TypeObject.h"
 #include <mutex>
 #include <utility>

diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeader.stg b/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeader.stg
@@ -22,7 +22,7 @@ $fileHeader(ctx=ctx, file=[ctx.filename, "CdrAux.hpp"], description=["This sourc
 #ifndef _FAST_DDS_GENERATED_$ctx.headerGuardName$CDRAUX_HPP_
 #define _FAST_DDS_GENERATED_$ctx.headerGuardName$CDRAUX_HPP_
 
-#include "$ctx.filename$.h"
+#include "$ctx.filename$.hpp"
 
 $if(ctx.anyCdr)$
 $ctx.types:{ type | $if(type.inScope)$$if(type.typeCode.isStructType)$

diff --git a/src/main/java/com/eprosima/fastdds/util/Utils.java b/src/main/java/com/eprosima/fastdds/util/Utils.java
@@ -16,6 +16,8 @@
 
 import org.stringtemplate.v4.ST;
 
+import com.eprosima.idl.generator.manager.TemplateST;
+
 import java.io.*;
 
 public class Utils
@@ -74,6 +76,11 @@ public static String addFileSeparator(String directory)
         return returnedValue;
     }
 
+    public static boolean writeFile(String file, TemplateST template, boolean replace)
+    {
+        return writeFile(file, template.get_st(), replace);
+    }
+
     public static boolean writeFile(String file, ST template, boolean replace)
     {
         boolean returnedValue = false;