Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
E
EMAM2Middleware
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
1
Merge Requests
1
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
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
EMAM2Middleware
Commits
43b15dbd
Commit
43b15dbd
authored
Feb 10, 2018
by
Alexander David Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed Wrapper -> Adapter for clarity
parent
b8c100e9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
15 deletions
+14
-15
src/main/java/de/monticore/lang/monticar/generator/master/DummyMiddlewareGenerator.java
...g/monticar/generator/master/DummyMiddlewareGenerator.java
+13
-13
src/main/java/de/monticore/lang/monticar/generator/master/MiddlewareMasterGenerator.java
.../monticar/generator/master/MiddlewareMasterGenerator.java
+1
-1
src/main/java/de/monticore/lang/monticar/generator/master/RosCppImpl.java
.../monticore/lang/monticar/generator/master/RosCppImpl.java
+0
-1
No files found.
src/main/java/de/monticore/lang/monticar/generator/master/DummyMiddlewareGenerator.java
View file @
43b15dbd
...
...
@@ -19,22 +19,22 @@ public class DummyMiddlewareGenerator implements GeneratorImpl {
List
<
File
>
res
=
new
ArrayList
<>();
res
.
add
(
FileHelper
.
generateFile
(
generationTargetPath
,
generateCMake
(
componentInstanceSymbol
)));
res
.
add
(
FileHelper
.
generateFile
(
generationTargetPath
,
generate
Wrapp
er
(
componentInstanceSymbol
)));
res
.
add
(
FileHelper
.
generateFile
(
generationTargetPath
,
generate
Adapt
er
(
componentInstanceSymbol
)));
return
res
;
}
private
String
dummy
Wrapp
erTemplate
=
"#pragma once\n"
+
private
String
dummy
Adapt
erTemplate
=
"#pragma once\n"
+
"#include \"${compName}.h\"\n"
+
"#include <thread>\n"
+
"#include <chrono>\n"
+
"#include \"IAdapter.h\"\n"
+
"\n"
+
"class ${compName}_Dummy
Wrapp
er: public IAdapter{\n"
+
"class ${compName}_Dummy
Adapt
er: public IAdapter{\n"
+
"\t${compName}* component;\n"
+
"\n"
+
"public:\n"
+
"\t${compName}_Dummy
Wrapp
er(){\n"
+
"\t${compName}_Dummy
Adapt
er(){\n"
+
"\n"
+
"\t}\n"
+
"\n"
+
...
...
@@ -53,13 +53,13 @@ public class DummyMiddlewareGenerator implements GeneratorImpl {
"\t\n"
+
"};"
;
private
FileContent
generate
Wrapp
er
(
ExpandedComponentInstanceSymbol
componentInstanceSymbol
)
{
private
FileContent
generate
Adapt
er
(
ExpandedComponentInstanceSymbol
componentInstanceSymbol
)
{
String
name
=
NameHelper
.
getComponentNameTargetLanguage
(
componentInstanceSymbol
.
getFullName
());
String
content
=
dummy
Wrapp
erTemplate
String
content
=
dummy
Adapt
erTemplate
.
replace
(
"${compName}"
,
name
);
FileContent
res
=
new
FileContent
();
res
.
setFileName
(
name
+
"_Dummy
Wrapp
er.h"
);
res
.
setFileName
(
name
+
"_Dummy
Adapt
er.h"
);
res
.
setFileContent
(
content
);
return
res
;
}
...
...
@@ -72,13 +72,13 @@ public class DummyMiddlewareGenerator implements GeneratorImpl {
private
String
cmakeTemplate
=
"cmake_minimum_required(VERSION 3.5)\n"
+
"project (${compName}_Dummy
Wrapp
er)\n"
+
"project (${compName}_Dummy
Adapt
er)\n"
+
"\n"
+
"add_library(${compName}_Dummy
Wrapper ${compName}_DummyWrapp
er.h)\n"
+
"set_target_properties(${compName}_Dummy
Wrapp
er PROPERTIES LINKER_LANGUAGE CXX)\n"
+
"target_link_libraries(${compName}_Dummy
Wrapp
er ${compName})\n"
+
"target_include_directories(${compName}_Dummy
Wrapp
er PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})\n"
+
"export(TARGETS ${compName}_Dummy
Wrapper FILE ${compName}_DummyWrapp
er.cmake)"
;
"add_library(${compName}_Dummy
Adapter ${compName}_DummyAdapt
er.h)\n"
+
"set_target_properties(${compName}_Dummy
Adapt
er PROPERTIES LINKER_LANGUAGE CXX)\n"
+
"target_link_libraries(${compName}_Dummy
Adapt
er ${compName})\n"
+
"target_include_directories(${compName}_Dummy
Adapt
er PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})\n"
+
"export(TARGETS ${compName}_Dummy
Adapter FILE ${compName}_DummyAdapt
er.cmake)"
;
private
FileContent
generateCMake
(
ExpandedComponentInstanceSymbol
componentInstanceSymbol
)
{
FileContent
res
=
new
FileContent
();
...
...
src/main/java/de/monticore/lang/monticar/generator/master/MiddlewareMasterGenerator.java
View file @
43b15dbd
...
...
@@ -122,7 +122,7 @@ public class MiddlewareMasterGenerator extends CMakeMasterGenerator {
//TODO: DIRTY HACK!
String
addAdapters
=
filesNames
.
stream
()
.
filter
(
fn
->
fn
.
matches
(
name
+
"\\w*
Wrapp
er\\.h"
))
.
filter
(
fn
->
fn
.
matches
(
name
+
"\\w*
Adapt
er\\.h"
))
.
map
(
fn
->
fn
.
substring
(
0
,
fn
.
length
()
-
2
))
.
map
(
fn
->
" adapters.push_back(new "
+
fn
+
"());"
)
.
collect
(
Collectors
.
joining
(
"\n"
));
...
...
src/main/java/de/monticore/lang/monticar/generator/master/RosCppImpl.java
View file @
43b15dbd
...
...
@@ -15,7 +15,6 @@ public class RosCppImpl implements GeneratorImpl {
@Override
public
List
<
File
>
generate
(
ExpandedComponentInstanceSymbol
componentInstanceSymbol
,
TaggingResolver
taggingResolver
)
throws
IOException
{
GeneratorRosCpp
generatorRosCpp
=
new
GeneratorRosCpp
();
generatorRosCpp
.
setGenerateCpp
(
false
);
generatorRosCpp
.
setGenerateCMake
(
true
);
generatorRosCpp
.
setGenerationTargetPath
(
generationTargetPath
);
return
TagHelper
.
generate
(
generatorRosCpp
,
taggingResolver
,
componentInstanceSymbol
);
...
...
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