Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
E
EMAM2SomeIP
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
monticore
EmbeddedMontiArc
generators
EMAM2SomeIP
Commits
accc6f1f
Commit
accc6f1f
authored
Jul 30, 2019
by
Markus Georg Bendel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prepare Templates for Integration
parent
7466103a
Pipeline
#166077
passed with stages
in 2 minutes and 27 seconds
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
17 additions
and
5 deletions
+17
-5
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
src/main/resources/de/monticore/lang/monticar/generator/someip/template/Adapter.cpp.ftl
...e/lang/monticar/generator/someip/template/Adapter.cpp.ftl
+1
-1
src/main/resources/de/monticore/lang/monticar/generator/someip/template/Adapter.h.ftl
...ore/lang/monticar/generator/someip/template/Adapter.h.ftl
+3
-1
src/main/resources/de/monticore/lang/monticar/generator/someip/template/CMakeLists.ftl
...re/lang/monticar/generator/someip/template/CMakeLists.ftl
+3
-0
src/test/resources/results/echoAdapter/CMakeLists.txt
src/test/resources/results/echoAdapter/CMakeLists.txt
+3
-0
src/test/resources/results/echoAdapter/SomeIPAdapter_tests_a_compA.cpp
...urces/results/echoAdapter/SomeIPAdapter_tests_a_compA.cpp
+1
-1
src/test/resources/results/echoAdapter/SomeIPAdapter_tests_a_compA.h
...sources/results/echoAdapter/SomeIPAdapter_tests_a_compA.h
+2
-1
src/test/resources/results/echoCMake/CMakeLists.txt
src/test/resources/results/echoCMake/CMakeLists.txt
+3
-0
No files found.
.gitlab-ci.yml
View file @
accc6f1f
...
...
@@ -5,7 +5,7 @@ stages:
BranchJobDeploy
:
stage
:
deploy
image
:
registry.git.rwth-aachen.de/monticore/embeddedmontiarc/generators/emam2
mqtt
image
:
registry.git.rwth-aachen.de/monticore/embeddedmontiarc/generators/emam2
someip
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
View file @
accc6f1f
<#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
View file @
accc6f1f
<#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
View file @
accc6f1f
...
...
@@ -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
View file @
accc6f1f
...
...
@@ -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
View file @
accc6f1f
#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
View file @
accc6f1f
#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
View file @
accc6f1f
...
...
@@ -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
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment