Refs #19760. Coexist fastcdr v1 and v2

Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · Nov 7, 2023 · c77ec46 · c77ec46
1 parent 9f4a8f9
commit c77ec46
Show file tree

Hide file tree

Showing 19 changed files with 3,876 additions and 106 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -33,6 +33,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
+        fastcdr_version: ['v1.1.x', ${{ github.event.inputs.fastcdr_branch }} ]
         java_version: ['openjdk-11-jdk', 'openjdk-17-jdk', 'openjdk-18-jdk', 'openjdk-19-jdk']
 
     steps:
@@ -57,9 +58,9 @@ jobs:
       - uses: ./src/fastddsgen/.github/actions/fetch-fastddsgen-repos
         with:
           foonathan-memory-vendor-branch: ${{ github.event.inputs.foonathan_memory_vendor_branch || 'master' }}
-          fastcdr-branch: ${{ github.event.inputs.fastcdr_branch || 'master' }}
-          fastdds-branch: ${{ github.event.inputs.fastdds_branch || 'master' }}
-          fastdds-python-branch: ${{ github.event.inputs.fastdds_python_branch || 'main' }}
+          fastcdr-branch: ${{ matrix.fastcdr_version }}
+          fastdds-branch: ${{ github.event.inputs.fastdds_branch || 'future/v2.12.1' }}
+          fastdds-python-branch: ${{ github.event.inputs.fastdds_python_branch || 'future/v2.12.1' }}
 
       - name: Get minimum supported version of CMake
         uses: eProsima/eProsima-CI/external/get-cmake@v0
@@ -77,21 +78,29 @@ jobs:
 
       - name: Regenerate IDL files for Fast-DDS and Fast-DDS-python
         run: |
-          cd src/Fast-DDS/utils/scripts
-          ./update_generated_code_from_idl.sh
+          cd src/Fast-DDS
+          ./utils/scripts/update_generated_code_from_idl.sh
           cd -
           cd src/Fast-DDS-python/fastdds_python/test/types
           ./generate.sh
           cd -
           cd src/Fast-DDS-python/fastdds_python_examples/HelloWorldExample
-          fastddsgen -python -replace HelloWorld.idl
+          fastddsgen -cdr both -python -replace HelloWorld.idl
 
       - name: Build workspace
         run: |
           cmake --version
           colcon build --event-handlers=console_direct+ --mixin rel-with-deb-info ccache
 
-      - name: Test fastddsgen
+      - name: Test fastddsgen with fastcdr v1
+        if: startsWith(matrix.fastcdr_version, 'v1')
+        run: |
+          source install/local_setup.bash
+          cd src/fastddsgen
+          ./gradlew test -Dcdr_version=v1 -Dblacklist_tests=external,maps,optional
+
+      - name: Test fastddsgen with fastcdr v2
+        if: ${{ ! startsWith(matrix.fastcdr_version, 'v1') }}
         run: |
           source install/local_setup.bash
           cd src/fastddsgen

diff --git a/src/main/java/com/eprosima/fastcdr/idl/context/Context.java b/src/main/java/com/eprosima/fastcdr/idl/context/Context.java
@@ -49,5 +49,17 @@ public interface Context
 
     public boolean isFastcdr();
 
+    public boolean isCdr_v1();
+
+    public boolean isCdr_v2();
+
+    public boolean isCdr_both();
+
+    public void isSetCdrv1Templates();
+
+    public void isUnsetCdrv1Templates();
+
+    public boolean isCdrv1TemplatesEnabled();
+
     /*** End ***/
 }
diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg
@@ -20,6 +20,13 @@ import "FastCdrCommon.stg"
 main(ctx, definitions) ::= <<
 $fileHeader(ctx=ctx, file=[ctx.filename, ".h"], description=["This header file contains the declaration of the described types in the IDL file."])$
 
+$if(ctx.cdr_both)$
+#include <fastcdr/config.h>
+#include "$ctx.filename$v1.h"
+
+#if FASTCDR_VERSION_MAJOR > 1
+$endif$
+
 #ifndef _FAST_DDS_GENERATED_$ctx.headerGuardName$_H_
 #define _FAST_DDS_GENERATED_$ctx.headerGuardName$_H_
 
@@ -97,6 +104,10 @@ $definitions; separator="\n"$
 
 #endif // _FAST_DDS_GENERATED_$ctx.headerGuardName$_H_
 $"\n"$
+
+$if(ctx.cdr_both)$
+#endif // FASTCDR_VERSION_MAJOR > 1
+$endif$
 >>
 
 module(ctx, parent, module, definition_list) ::= <<