Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
monticore
EmbeddedMontiArc
languages
Tagging
Commits
db473e8e
Commit
db473e8e
authored
Jun 06, 2018
by
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
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
db473e8e
...
...
@@ -34,9 +34,9 @@
<properties>
<!-- .. 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>
<mc.grammars.assembly.version>
0.0.6
</mc.grammars.assembly.version>
<mc.grammars.assembly.version>
0.0.6
-SNAPSHOT
</mc.grammars.assembly.version>
<!-- .. Libraries .................................................. -->
<guava.version>
18.0
</guava.version>
...
...
@@ -45,7 +45,7 @@
<jscience.version>
4.3.1
</jscience.version>
<!-- .. Plugins ....................................................... -->
<monticore.plugin>
4.5.3
.1
</monticore.plugin>
<monticore.plugin>
4.5.3
-SNAPSHOT
</monticore.plugin>
<assembly.plugin>
2.5.4
</assembly.plugin>
<compiler.plugin>
3.3
</compiler.plugin>
<source.plugin>
2.4
</source.plugin>
...
...
@@ -64,6 +64,12 @@
</properties>
<dependencies>
<dependency>
<groupId>
org.antlr
</groupId>
<artifactId>
antlr4-runtime
</artifactId>
<version>
4.7.1
</version>
</dependency>
<dependency>
<groupId>
de.se_rwth.commons
</groupId>
<artifactId>
se-commons-logging
</artifactId>
...
...
src/main/java/de/monticore/lang/tagging/generator/TagSchemaGenerator.java
View file @
db473e8e
...
...
@@ -31,8 +31,6 @@ import java.util.Map;
import
de.monticore.generating.GeneratorEngine
;
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.tagschema._ast.ASTSimpleTagType
;
import
de.monticore.lang.tagschema._ast.ASTTagSchemaUnit
;
...
...
@@ -48,10 +46,6 @@ import de.se_rwth.commons.logging.Log;
*/
public
class
TagSchemaGenerator
extends
GeneratorEngine
{
public
TagSchemaGenerator
(
GeneratorSetup
generatorSetup
,
ITemplateControllerFactory
templateControllerFactory
,
FileReaderWriter
fileHandler
)
{
super
(
generatorSetup
,
templateControllerFactory
,
fileHandler
);
}
public
TagSchemaGenerator
(
GeneratorSetup
generatorSetup
)
{
super
(
generatorSetup
);
}
...
...
@@ -64,8 +58,8 @@ public class TagSchemaGenerator extends GeneratorEngine {
try
{
GeneratorSetup
setup
=
new
GeneratorSetup
(
getPathFromRelativePath
(
Paths
.
get
(
outputFolder
)).
toFile
());
GeneratorSetup
setup
=
new
GeneratorSetup
(
);
setup
.
setOutputDirectory
(
getPathFromRelativePath
(
Paths
.
get
(
outputFolder
)).
toFile
());
setup
.
setTracing
(
true
);
TagSchemaGenerator
generator
=
new
TagSchemaGenerator
(
setup
);
...
...
src/test/java/de/monticore/lang/tagging/GeneratorTest.java
View file @
db473e8e
...
...
@@ -42,8 +42,8 @@ public class GeneratorTest {
@Test
public
void
testSimpleTagType
()
throws
Exception
{
GeneratorSetup
setup
=
new
GeneratorSetup
(
getPathFromRelativePath
(
"src/test/resources"
).
toFile
());
GeneratorSetup
setup
=
new
GeneratorSetup
(
);
setup
.
setOutputDirectory
(
getPathFromRelativePath
(
"src/test/resources"
).
toFile
());
//getPathFromRelativePath("target/generated-sources/monticore/sourcecode").toFile());
setup
.
setTracing
(
true
);
TagSchemaGenerator
generator
=
new
TagSchemaGenerator
(
setup
);
...
...
@@ -71,8 +71,8 @@ public class GeneratorTest {
b = Unit.valueOf("s").isCompatible(Power.UNIT);
Measure<? extends Number, Power> milliWatt = Measure.valueOf(7, (Unit<Power>)Unit.valueOf("mW"));
System.out.println();*/
GeneratorSetup
setup
=
new
GeneratorSetup
(
getPathFromRelativePath
(
"src/test/resources/generator"
).
toFile
());
GeneratorSetup
setup
=
new
GeneratorSetup
(
);
setup
.
setOutputDirectory
(
getPathFromRelativePath
(
"src/test/resources/generator"
).
toFile
());
setup
.
setTracing
(
true
);
TagSchemaGenerator
generator
=
new
TagSchemaGenerator
(
setup
);
Map
<
String
,
String
>
symbolScopeMap
=
new
LinkedHashMap
<>();
...
...
@@ -85,8 +85,8 @@ public class GeneratorTest {
@Test
public
void
testLatencyTag
()
throws
Exception
{
GeneratorSetup
setup
=
new
GeneratorSetup
(
getPathFromRelativePath
(
"src/test/resources/generator"
).
toFile
());
GeneratorSetup
setup
=
new
GeneratorSetup
(
);
setup
.
setOutputDirectory
(
getPathFromRelativePath
(
"src/test/resources/generator"
).
toFile
());
setup
.
setTracing
(
true
);
TagSchemaGenerator
generator
=
new
TagSchemaGenerator
(
setup
);
Map
<
String
,
String
>
symbolScopeMap
=
new
LinkedHashMap
<>();
...
...
@@ -99,8 +99,8 @@ public class GeneratorTest {
@Test
public
void
testTransCostTag
()
throws
Exception
{
GeneratorSetup
setup
=
new
GeneratorSetup
(
getPathFromRelativePath
(
"src/test/resources/generator"
).
toFile
());
GeneratorSetup
setup
=
new
GeneratorSetup
(
);
setup
.
setOutputDirectory
(
getPathFromRelativePath
(
"src/test/resources/generator"
).
toFile
());
setup
.
setTracing
(
true
);
TagSchemaGenerator
generator
=
new
TagSchemaGenerator
(
setup
);
Map
<
String
,
String
>
symbolScopeMap
=
new
LinkedHashMap
<>();
...
...
@@ -113,8 +113,8 @@ public class GeneratorTest {
@Test
public
void
testCompPowerTag
()
throws
Exception
{
GeneratorSetup
setup
=
new
GeneratorSetup
(
getPathFromRelativePath
(
"src/test/resources/generator"
).
toFile
());
GeneratorSetup
setup
=
new
GeneratorSetup
(
);
setup
.
setOutputDirectory
(
getPathFromRelativePath
(
"src/test/resources/generator"
).
toFile
());
setup
.
setTracing
(
true
);
TagSchemaGenerator
generator
=
new
TagSchemaGenerator
(
setup
);
Map
<
String
,
String
>
symbolScopeMap
=
new
LinkedHashMap
<>();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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