Merge cleanup

parent addae100
Pipeline #115571 failed with stages
in 1 minute and 17 seconds
package de.monticore.lang.monticar.generator.middleware; package de.monticore.lang.monticar.generator.middleware;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstanceSymbol; import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstanceSymbol;
import de.monticore.lang.monticar.clustering.*; import de.monticore.lang.monticar.clustering.AutomaticClusteringHelper;
import de.monticore.lang.monticar.clustering.ClusteringResult;
import de.monticore.lang.monticar.clustering.ClusteringResultList;
import de.monticore.lang.monticar.clustering.FlattenArchitecture;
import de.monticore.lang.monticar.generator.FileContent; import de.monticore.lang.monticar.generator.FileContent;
import de.monticore.lang.monticar.generator.middleware.cli.ClusteringParameters; import de.monticore.lang.monticar.generator.middleware.cli.ClusteringParameters;
import de.monticore.lang.monticar.generator.middleware.cli.ResultChoosingStrategy; import de.monticore.lang.monticar.generator.middleware.cli.ResultChoosingStrategy;
import de.monticore.lang.monticar.generator.middleware.compile.CompilationGenerator; import de.monticore.lang.monticar.generator.middleware.compile.CompilationGenerator;
import de.monticore.lang.monticar.generator.middleware.helpers.*; import de.monticore.lang.monticar.generator.middleware.helpers.ClusterFromTagsHelper;
import de.monticore.lang.monticar.generator.middleware.helpers.FileHelper;
import de.monticore.lang.monticar.generator.middleware.helpers.NameHelper;
import de.monticore.lang.monticar.generator.middleware.helpers.RosHelper;
import de.monticore.lang.monticar.generator.middleware.impls.GeneratorImpl; import de.monticore.lang.monticar.generator.middleware.impls.GeneratorImpl;
import de.monticore.lang.monticar.generator.middleware.impls.MiddlewareTagGenImpl;
import de.monticore.lang.monticar.generator.middleware.impls.RclCppGenImpl; import de.monticore.lang.monticar.generator.middleware.impls.RclCppGenImpl;
import de.monticore.lang.monticar.generator.middleware.impls.RosCppGenImpl; import de.monticore.lang.monticar.generator.middleware.impls.RosCppGenImpl;
import de.monticore.lang.monticar.generator.middleware.impls.MiddlewareTagGenImpl;
import de.monticore.lang.tagging._symboltable.TaggingResolver; import de.monticore.lang.tagging._symboltable.TaggingResolver;
import de.se_rwth.commons.logging.Log; import de.se_rwth.commons.logging.Log;
...@@ -137,12 +143,6 @@ public class DistributedTargetGenerator extends CMakeGenerator { ...@@ -137,12 +143,6 @@ public class DistributedTargetGenerator extends CMakeGenerator {
return componentInstanceSymbol; return componentInstanceSymbol;
} }
private File generateRosMsgGen() throws IOException {
File file = new File(generationTargetPath + "rosMsg/CMakeLists.txt");
FileUtils.write(file, TemplateHelper.getStruct_msgsCmakeTemplate());
return file;
}
private GeneratorImpl createFullGenerator(String subdir) { private GeneratorImpl createFullGenerator(String subdir) {
MiddlewareGenerator res = new MiddlewareGenerator(); MiddlewareGenerator res = new MiddlewareGenerator();
res.setGenerationTargetPath(generationTargetPath + "src/" + (subdir.endsWith("/") ? subdir : subdir + "/")); res.setGenerationTargetPath(generationTargetPath + "src/" + (subdir.endsWith("/") ? subdir : subdir + "/"));
......
...@@ -46,7 +46,7 @@ public class AutomaticClusteringTest extends AbstractSymtabTest{ ...@@ -46,7 +46,7 @@ public class AutomaticClusteringTest extends AbstractSymtabTest{
distributedTargetGenerator.setGenerateMiddlewareTags(true); distributedTargetGenerator.setGenerateMiddlewareTags(true);
distributedTargetGenerator.setGenerationTargetPath("target/generated-sources-clustering/pacman/src/"); distributedTargetGenerator.setGenerationTargetPath("target/generated-sources-clustering/pacman/src/");
distributedTargetGenerator.add(new CPPGenImpl(),"cpp"); distributedTargetGenerator.add(new CPPGenImpl(TEST_PATH_PACMAN), "cpp");
distributedTargetGenerator.add(new RosCppGenImpl(),"roscpp"); distributedTargetGenerator.add(new RosCppGenImpl(),"roscpp");
distributedTargetGenerator.generate(flattendComponent,taggingResolver); distributedTargetGenerator.generate(flattendComponent,taggingResolver);
...@@ -98,7 +98,7 @@ public class AutomaticClusteringTest extends AbstractSymtabTest{ ...@@ -98,7 +98,7 @@ public class AutomaticClusteringTest extends AbstractSymtabTest{
DistributedTargetGenerator distributedTargetGenerator = new DistributedTargetGenerator(); DistributedTargetGenerator distributedTargetGenerator = new DistributedTargetGenerator();
distributedTargetGenerator.setGenerationTargetPath("./target/generated-sources-clustering/ClusterToRosConnections/src/"); distributedTargetGenerator.setGenerationTargetPath("./target/generated-sources-clustering/ClusterToRosConnections/src/");
distributedTargetGenerator.add(new CPPGenImpl(),"cpp"); distributedTargetGenerator.add(new CPPGenImpl(TEST_PATH), "cpp");
distributedTargetGenerator.add(new RosCppGenImpl(),"roscpp"); distributedTargetGenerator.add(new RosCppGenImpl(),"roscpp");
distributedTargetGenerator.generate(componentInstanceSymbol,taggingResolver); distributedTargetGenerator.generate(componentInstanceSymbol,taggingResolver);
......
...@@ -349,7 +349,7 @@ public class GenerationTest extends AbstractSymtabTest { ...@@ -349,7 +349,7 @@ public class GenerationTest extends AbstractSymtabTest {
DistributedTargetGenerator middlewareGenerator = new DistributedTargetGenerator(); DistributedTargetGenerator middlewareGenerator = new DistributedTargetGenerator();
middlewareGenerator.setGenerationTargetPath("./target/generated-sources-cmake/lab/src/"); middlewareGenerator.setGenerationTargetPath("./target/generated-sources-cmake/lab/src/");
//generator for component itself //generator for component itself
middlewareGenerator.add(new CPPGenImpl(), "cpp"); middlewareGenerator.add(new CPPGenImpl(TEST_PATH), "cpp");
//generator for the ros connection //generator for the ros connection
middlewareGenerator.add(new RosCppGenImpl(), "roscpp"); middlewareGenerator.add(new RosCppGenImpl(), "roscpp");
...@@ -371,7 +371,7 @@ public class GenerationTest extends AbstractSymtabTest { ...@@ -371,7 +371,7 @@ public class GenerationTest extends AbstractSymtabTest {
DistributedTargetGenerator middlewareGenerator = new DistributedTargetGenerator(); DistributedTargetGenerator middlewareGenerator = new DistributedTargetGenerator();
middlewareGenerator.setGenerationTargetPath("./target/generated-sources-cmake/labWithTags/src/"); middlewareGenerator.setGenerationTargetPath("./target/generated-sources-cmake/labWithTags/src/");
//generator for component itself //generator for component itself
middlewareGenerator.add(new CPPGenImpl(), "cpp"); middlewareGenerator.add(new CPPGenImpl(TEST_PATH), "cpp");
//generator for the ros connection //generator for the ros connection
middlewareGenerator.add(new RosCppGenImpl(), "roscpp"); middlewareGenerator.add(new RosCppGenImpl(), "roscpp");
middlewareGenerator.setGenerateMiddlewareTags(true); middlewareGenerator.setGenerateMiddlewareTags(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