Commit db473e8e authored by vonWenckstern's avatar vonWenckstern
Browse files

Merge branch 'fixGitlabCI' into 'master'

Fix gitlab ci

See merge request !1
parents b5ec28b9 bc253cea
Pipeline #53503 failed with stage
in 59 seconds
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
<properties> <properties>
<!-- .. SE-Libraries .................................................. --> <!-- .. SE-Libraries .................................................. -->
<monticore.version>4.5.3.1</monticore.version> <monticore.version>4.5.4.08.11.2017</monticore.version>
<se-commons.version>1.7.7</se-commons.version> <se-commons.version>1.7.7</se-commons.version>
<mc.grammars.assembly.version>0.0.6</mc.grammars.assembly.version> <mc.grammars.assembly.version>0.0.6-SNAPSHOT</mc.grammars.assembly.version>
<!-- .. Libraries .................................................. --> <!-- .. Libraries .................................................. -->
<guava.version>18.0</guava.version> <guava.version>18.0</guava.version>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<jscience.version>4.3.1</jscience.version> <jscience.version>4.3.1</jscience.version>
<!-- .. Plugins ....................................................... --> <!-- .. Plugins ....................................................... -->
<monticore.plugin>4.5.3.1</monticore.plugin> <monticore.plugin>4.5.3-SNAPSHOT</monticore.plugin>
<assembly.plugin>2.5.4</assembly.plugin> <assembly.plugin>2.5.4</assembly.plugin>
<compiler.plugin>3.3</compiler.plugin> <compiler.plugin>3.3</compiler.plugin>
<source.plugin>2.4</source.plugin> <source.plugin>2.4</source.plugin>
...@@ -64,6 +64,12 @@ ...@@ -64,6 +64,12 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
<version>4.7.1</version>
</dependency>
<dependency> <dependency>
<groupId>de.se_rwth.commons</groupId> <groupId>de.se_rwth.commons</groupId>
<artifactId>se-commons-logging</artifactId> <artifactId>se-commons-logging</artifactId>
......
...@@ -31,8 +31,6 @@ import java.util.Map; ...@@ -31,8 +31,6 @@ import java.util.Map;
import de.monticore.generating.GeneratorEngine; import de.monticore.generating.GeneratorEngine;
import de.monticore.generating.GeneratorSetup; import de.monticore.generating.GeneratorSetup;
import de.monticore.generating.templateengine.ITemplateControllerFactory;
import de.monticore.io.FileReaderWriter;
import de.monticore.lang.tagging.helper.UnitKinds; import de.monticore.lang.tagging.helper.UnitKinds;
import de.monticore.lang.tagschema._ast.ASTSimpleTagType; import de.monticore.lang.tagschema._ast.ASTSimpleTagType;
import de.monticore.lang.tagschema._ast.ASTTagSchemaUnit; import de.monticore.lang.tagschema._ast.ASTTagSchemaUnit;
...@@ -48,10 +46,6 @@ import de.se_rwth.commons.logging.Log; ...@@ -48,10 +46,6 @@ import de.se_rwth.commons.logging.Log;
*/ */
public class TagSchemaGenerator extends GeneratorEngine { public class TagSchemaGenerator extends GeneratorEngine {
public TagSchemaGenerator(GeneratorSetup generatorSetup, ITemplateControllerFactory templateControllerFactory, FileReaderWriter fileHandler) {
super(generatorSetup, templateControllerFactory, fileHandler);
}
public TagSchemaGenerator(GeneratorSetup generatorSetup) { public TagSchemaGenerator(GeneratorSetup generatorSetup) {
super(generatorSetup); super(generatorSetup);
} }
...@@ -64,8 +58,8 @@ public class TagSchemaGenerator extends GeneratorEngine { ...@@ -64,8 +58,8 @@ public class TagSchemaGenerator extends GeneratorEngine {
try { try {
GeneratorSetup setup = new GeneratorSetup( GeneratorSetup setup = new GeneratorSetup();
getPathFromRelativePath(Paths.get(outputFolder)).toFile()); setup.setOutputDirectory(getPathFromRelativePath(Paths.get(outputFolder)).toFile());
setup.setTracing(true); setup.setTracing(true);
TagSchemaGenerator generator = new TagSchemaGenerator(setup); TagSchemaGenerator generator = new TagSchemaGenerator(setup);
......
...@@ -42,8 +42,8 @@ public class GeneratorTest { ...@@ -42,8 +42,8 @@ public class GeneratorTest {
@Test @Test
public void testSimpleTagType() throws Exception { public void testSimpleTagType() throws Exception {
GeneratorSetup setup = new GeneratorSetup( GeneratorSetup setup = new GeneratorSetup();
getPathFromRelativePath("src/test/resources").toFile()); setup.setOutputDirectory(getPathFromRelativePath("src/test/resources").toFile());
//getPathFromRelativePath("target/generated-sources/monticore/sourcecode").toFile()); //getPathFromRelativePath("target/generated-sources/monticore/sourcecode").toFile());
setup.setTracing(true); setup.setTracing(true);
TagSchemaGenerator generator = new TagSchemaGenerator(setup); TagSchemaGenerator generator = new TagSchemaGenerator(setup);
...@@ -71,8 +71,8 @@ public class GeneratorTest { ...@@ -71,8 +71,8 @@ public class GeneratorTest {
b = Unit.valueOf("s").isCompatible(Power.UNIT); b = Unit.valueOf("s").isCompatible(Power.UNIT);
Measure<? extends Number, Power> milliWatt = Measure.valueOf(7, (Unit<Power>)Unit.valueOf("mW")); Measure<? extends Number, Power> milliWatt = Measure.valueOf(7, (Unit<Power>)Unit.valueOf("mW"));
System.out.println();*/ System.out.println();*/
GeneratorSetup setup = new GeneratorSetup( GeneratorSetup setup = new GeneratorSetup();
getPathFromRelativePath("src/test/resources/generator").toFile()); setup.setOutputDirectory(getPathFromRelativePath("src/test/resources/generator").toFile());
setup.setTracing(true); setup.setTracing(true);
TagSchemaGenerator generator = new TagSchemaGenerator(setup); TagSchemaGenerator generator = new TagSchemaGenerator(setup);
Map<String, String> symbolScopeMap = new LinkedHashMap<>(); Map<String, String> symbolScopeMap = new LinkedHashMap<>();
...@@ -85,8 +85,8 @@ public class GeneratorTest { ...@@ -85,8 +85,8 @@ public class GeneratorTest {
@Test @Test
public void testLatencyTag() throws Exception { public void testLatencyTag() throws Exception {
GeneratorSetup setup = new GeneratorSetup( GeneratorSetup setup = new GeneratorSetup();
getPathFromRelativePath("src/test/resources/generator").toFile()); setup.setOutputDirectory(getPathFromRelativePath("src/test/resources/generator").toFile());
setup.setTracing(true); setup.setTracing(true);
TagSchemaGenerator generator = new TagSchemaGenerator(setup); TagSchemaGenerator generator = new TagSchemaGenerator(setup);
Map<String, String> symbolScopeMap = new LinkedHashMap<>(); Map<String, String> symbolScopeMap = new LinkedHashMap<>();
...@@ -99,8 +99,8 @@ public class GeneratorTest { ...@@ -99,8 +99,8 @@ public class GeneratorTest {
@Test @Test
public void testTransCostTag() throws Exception { public void testTransCostTag() throws Exception {
GeneratorSetup setup = new GeneratorSetup( GeneratorSetup setup = new GeneratorSetup();
getPathFromRelativePath("src/test/resources/generator").toFile()); setup.setOutputDirectory(getPathFromRelativePath("src/test/resources/generator").toFile());
setup.setTracing(true); setup.setTracing(true);
TagSchemaGenerator generator = new TagSchemaGenerator(setup); TagSchemaGenerator generator = new TagSchemaGenerator(setup);
Map<String, String> symbolScopeMap = new LinkedHashMap<>(); Map<String, String> symbolScopeMap = new LinkedHashMap<>();
...@@ -113,8 +113,8 @@ public class GeneratorTest { ...@@ -113,8 +113,8 @@ public class GeneratorTest {
@Test @Test
public void testCompPowerTag() throws Exception { public void testCompPowerTag() throws Exception {
GeneratorSetup setup = new GeneratorSetup( GeneratorSetup setup = new GeneratorSetup();
getPathFromRelativePath("src/test/resources/generator").toFile()); setup.setOutputDirectory(getPathFromRelativePath("src/test/resources/generator").toFile());
setup.setTracing(true); setup.setTracing(true);
TagSchemaGenerator generator = new TagSchemaGenerator(setup); TagSchemaGenerator generator = new TagSchemaGenerator(setup);
Map<String, String> symbolScopeMap = new LinkedHashMap<>(); Map<String, String> symbolScopeMap = new LinkedHashMap<>();
......
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