Aufgrund einer Störung des s3 Storage, könnten in nächster Zeit folgende GitLab Funktionen nicht zur Verfügung stehen: LFS, Container Registry, Job Artifacs, Uploads (Wiki, Bilder, Projekt-Exporte). Wir bitten um Verständnis. Es wird mit Hochdruck an der Behebung des Problems gearbeitet. Weitere Informationen zur Störung des Object Storage finden Sie hier: https://maintenance.itc.rwth-aachen.de/ticket/status/messages/59-object-storage-pilot

Commit d07b9b9b authored by Unknown's avatar Unknown
Browse files

Merge

parents bcd6b468 cb072bd2
Pipeline #177975 passed with stages
in 2 minutes and 32 seconds
......@@ -6,7 +6,7 @@ stages:
BranchJobDeploy:
stage: deploy
image: registry.git.rwth-aachen.de/monticore/embeddedmontiarc/generators/emam2mqtt
image: registry.git.rwth-aachen.de/monticore/embeddedmontiarc/generators/emam2mqtt:latest
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
......@@ -23,7 +23,7 @@ BranchJobProject:
BranchJobAdapter:
stage: adapter
image: registry.git.rwth-aachen.de/monticore/embeddedmontiarc/generators/emam2mqtt
image: registry.git.rwth-aachen.de/monticore/embeddedmontiarc/generators/emam2mqtt:latest
script:
- cd mqtt_adapter
- cmake .
......
......@@ -7,7 +7,7 @@
<groupId>de.monticore.lang.monticar</groupId>
<artifactId>embedded-montiarc-math-mqtt-generator</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.2-SNAPSHOT</version>
<name>emam2mqtt</name>
......
......@@ -115,9 +115,12 @@ public class GeneratorMqtt
//Generate files and write to project
String content = MqttTemplates.generateMqttFindMqtt(model);
File file = new File(generationTargetPath+"FindMQTT.cmake");
File directory = new File(generationTargetPath+"modules/");
directory.mkdirs();
File file = new File(generationTargetPath+"modules/FindMQTT.cmake");
createFile(file, content);
return file;
......
......@@ -15,6 +15,8 @@ project(${model.getCompName()})
set(SEARCH_MQTT FALSE)
SET(CMAKE_MODULE_PATH "<#noparse>${CMAKE_CURRENT_LIST_DIR}</#noparse>/modules")
# Check is environment variable was set
IF(DEFINED ENV{MQTT_INCLUDE_DIR} AND DEFINED ENV{MQTT_LIBS})
message("...MQTT environment variables are set" )
......@@ -38,7 +40,7 @@ CallbackN.hpp
CallbackZ.hpp
CallbackB.hpp
MqttAdapter_${model.getEscapedCompName()}.h
${model.getEscapedCompName()}.h
#${model.getEscapedCompName()}.h
)
list(APPEND LIBRARIES ${model.getEscapedCompName()})
......
......@@ -13,6 +13,8 @@ project(tests.a.compA)
set(SEARCH_MQTT FALSE)
SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
# Check is environment variable was set
IF(DEFINED ENV{MQTT_INCLUDE_DIR} AND DEFINED ENV{MQTT_LIBS})
message("...MQTT environment variables are set" )
......@@ -36,7 +38,7 @@ CallbackN.hpp
CallbackZ.hpp
CallbackB.hpp
MqttAdapter_tests_a_compA.h
tests_a_compA.h
#tests_a_compA.h
)
list(APPEND LIBRARIES tests_a_compA)
......
......@@ -13,6 +13,8 @@ project(tests.a.compA)
set(SEARCH_MQTT FALSE)
SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
# Check is environment variable was set
IF(DEFINED ENV{MQTT_INCLUDE_DIR} AND DEFINED ENV{MQTT_LIBS})
message("...MQTT environment variables are set" )
......@@ -36,7 +38,7 @@ CallbackN.hpp
CallbackZ.hpp
CallbackB.hpp
MqttAdapter_tests_a_compA.h
tests_a_compA.h
#tests_a_compA.h
)
list(APPEND LIBRARIES tests_a_compA)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment