Commit 70e9a1e7 authored by Alexander David Hellwig's avatar Alexander David Hellwig
Browse files

Update versions,added option for execution logging

parent 84271562
Pipeline #162121 passed with stages
in 16 minutes and 27 seconds
...@@ -6,6 +6,7 @@ stages: ...@@ -6,6 +6,7 @@ stages:
masterJobWindows: masterJobWindows:
stage: windows stage: windows
allow_failure: true
script: script:
- call mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml -U - call mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml -U
tags: tags:
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<groupId>de.monticore.lang.monticar</groupId> <groupId>de.monticore.lang.monticar</groupId>
<artifactId>embedded-montiarc-math-middleware-generator</artifactId> <artifactId>embedded-montiarc-math-middleware-generator</artifactId>
<version>0.0.24-SNAPSHOT</version> <version>0.0.25-SNAPSHOT</version>
<!-- == PROJECT DEPENDENCIES ============================================= --> <!-- == PROJECT DEPENDENCIES ============================================= -->
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
<se-commons.version>1.7.7</se-commons.version> <se-commons.version>1.7.7</se-commons.version>
<embedded-montiarc.version>0.1.9-SNAPSHOT</embedded-montiarc.version> <embedded-montiarc.version>0.1.9-SNAPSHOT</embedded-montiarc.version>
<Embedded-montiarc-math-generator.version>0.1.8-SNAPSHOT</Embedded-montiarc-math-generator.version> <Embedded-montiarc-math-generator.version>0.1.12-SNAPSHOT</Embedded-montiarc-math-generator.version>
<Embedded-montiarc-math-roscpp-generator.version>0.1.4-SNAPSHOT</Embedded-montiarc-math-roscpp-generator.version> <Embedded-montiarc-math-roscpp-generator.version>0.1.6-SNAPSHOT</Embedded-montiarc-math-roscpp-generator.version>
<EMADL2CPP.version>0.2.8</EMADL2CPP.version> <EMADL2CPP.version>0.2.8</EMADL2CPP.version>
<EMADL.version>0.2.7-SNAPSHOT</EMADL.version> <EMADL.version>0.2.7-SNAPSHOT</EMADL.version>
<embedded-montiarc-component-clustering.version>0.0.2-SNAPSHOT</embedded-montiarc-component-clustering.version> <embedded-montiarc-component-clustering.version>0.0.2-SNAPSHOT</embedded-montiarc-component-clustering.version>
......
...@@ -14,16 +14,22 @@ public class CPPGenImpl implements GeneratorImpl { ...@@ -14,16 +14,22 @@ public class CPPGenImpl implements GeneratorImpl {
private String generationTargetPath; private String generationTargetPath;
private GeneratorCPP generatorCPP; private GeneratorCPP generatorCPP;
private String modelsDir; private String modelsDir;
private boolean executionLoggingActive = false;
public CPPGenImpl(String modelsDir){ public CPPGenImpl(String modelsDir){
this.modelsDir = modelsDir; this.modelsDir = modelsDir;
} }
public void setExecutionLoggingActive(boolean active){
executionLoggingActive = active;
}
private void resetGenerator(){ private void resetGenerator(){
generatorCPP = new GeneratorCPP(); generatorCPP = new GeneratorCPP();
generatorCPP.useArmadilloBackend(); generatorCPP.useArmadilloBackend();
generatorCPP.setGenerateCMake(true); generatorCPP.setGenerateCMake(true);
generatorCPP.setModelsDirPath(Paths.get(modelsDir)); generatorCPP.setModelsDirPath(Paths.get(modelsDir));
generatorCPP.setExecutionLoggingActive(executionLoggingActive);
//generatorCPP.setGenerateTests(true); //generatorCPP.setGenerateTests(true);
} }
......
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