Prepare Templates for Integration

.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
 
 BranchJobDeploy:
   stage: deploy
-  image: registry.git.rwth-aachen.de/monticore/embeddedmontiarc/generators/emam2mqtt
+  image: registry.git.rwth-aachen.de/monticore/embeddedmontiarc/generators/emam2someip
   script:
     - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean deploy --settings settings.xml
     - cat target/site/jacoco/index.html

src/main/resources/de/monticore/lang/monticar/generator/someip/template/Adapter.cpp.ftl

 <#import "SomeIPMacros.ftl" as m>
 #include "<@m.mwIdent/>Adapter_${model.getEscapedCompName()}.h"
 
-<@m.mwIdent/>Adapter_${model.getEscapedCompName()}::<@m.mwIdent/>Adapter_${model.getEscapedCompName()}() {
+<@m.mwIdent/>Adapter_${model.getEscapedCompName()}::<@m.mwIdent/>Adapter_${model.getEscapedCompName()}() : public IAdapter_${model.getEscapedCompName()} {
 	//choose random ids
     in1_service_id = 11;
 	in1_instance_id = 12;

src/main/resources/de/monticore/lang/monticar/generator/someip/template/Adapter.h.ftl

 <#import "SomeIPMacros.ftl" as m>
 #pragma once
 #include "${model.getEscapedCompName()}.h"
+#include "IAdapter_${model.getEscapedCompName()}.h"
+
 #include <iomanip>
 #include <iostream>
 #include <sstream>
@@ -12,7 +14,7 @@
 
 using namespace std;
 
-class <@m.mwIdent/>Adapter_${model.getEscapedCompName()} {
+class <@m.mwIdent/>Adapter_${model.getEscapedCompName()} : public IAdapter_${model.getEscapedCompName()} {
 
 public:
 

src/main/resources/de/monticore/lang/monticar/generator/someip/template/CMakeLists.ftl

@@ -15,6 +15,9 @@ include_directories (
     <#noparse>${VSOMEIP_INCLUDE_DIRS}</#noparse>
 )
 
+list(APPEND LIBRARIES ${model.getEscapedCompName()})
+list(APPEND LIBRARIES IAdapter_${model.getEscapedCompName()})
+
 # Linking libraries to target
 add_library(SomeIPAdapter_${model.getEscapedCompName()} SomeIPAdapter_${model.getEscapedCompName()}.cpp)
 target_link_libraries(SomeIPAdapter_${model.getEscapedCompName()} vsomeip <#noparse>${Boost_LIBRARIES}</#noparse>)

src/test/resources/results/echoAdapter/CMakeLists.txt

@@ -14,6 +14,9 @@ include_directories (
     ${VSOMEIP_INCLUDE_DIRS}
 )
 
+list(APPEND LIBRARIES tests_a_compA)
+list(APPEND LIBRARIES IAdapter_tests_a_compA)
+
 # Linking libraries to target
 add_library(SomeIPAdapter_tests_a_compA SomeIPAdapter_tests_a_compA.cpp)
 target_link_libraries(SomeIPAdapter_tests_a_compA vsomeip ${Boost_LIBRARIES})

src/test/resources/results/echoAdapter/SomeIPAdapter_tests_a_compA.cpp

 #include "SomeIPAdapter_tests_a_compA.h"
 
-SomeIPAdapter_tests_a_compA::SomeIPAdapter_tests_a_compA() {
+SomeIPAdapter_tests_a_compA::SomeIPAdapter_tests_a_compA() : public IAdapter_tests_a_compA {
 	//choose random ids
     in1_service_id = 11;
 	in1_instance_id = 12;

src/test/resources/results/echoAdapter/SomeIPAdapter_tests_a_compA.h

 #pragma once
 #include "tests_a_compA.h"
+#include "IAdapter_tests_a_compA.h"
 #include <iomanip>
 #include <iostream>
 #include <sstream>
@@ -11,7 +12,7 @@
 
 using namespace std;
 
-class SomeIPAdapter_tests_a_compA {
+class SomeIPAdapter_tests_a_compA : public IAdapter_tests_a_compA {
 
 public:
 

src/test/resources/results/echoCMake/CMakeLists.txt

@@ -14,6 +14,9 @@ include_directories (
     ${VSOMEIP_INCLUDE_DIRS}
 )
 
+list(APPEND LIBRARIES tests_a_compA)
+list(APPEND LIBRARIES IAdapter_tests_a_compA)
+
 # Linking libraries to target
 add_library(SomeIPAdapter_tests_a_compA SomeIPAdapter_tests_a_compA.cpp)
 target_link_libraries(SomeIPAdapter_tests_a_compA vsomeip ${Boost_LIBRARIES})