diff options
author | Kristóf Marussy <marussy@mit.bme.hu> | 2021-10-01 15:52:11 +0200 |
---|---|---|
committer | Kristóf Marussy <marussy@mit.bme.hu> | 2021-10-01 16:22:14 +0200 |
commit | eec2d3b70442999a879aa673e52c1144eec4e351 (patch) | |
tree | 0f8aaba92d5baa5b118c93d7198b516ff1986e0d /language | |
parent | build: webpack fixes (diff) | |
download | refinery-eec2d3b70442999a879aa673e52c1144eec4e351.tar.gz refinery-eec2d3b70442999a879aa673e52c1144eec4e351.tar.zst refinery-eec2d3b70442999a879aa673e52c1144eec4e351.zip |
feat: skeleton for language to store mapping
Diffstat (limited to 'language')
-rw-r--r-- | language/build.gradle | 22 | ||||
-rw-r--r-- | language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2 | 3 |
2 files changed, 21 insertions, 4 deletions
diff --git a/language/build.gradle b/language/build.gradle index 494d9d08..e9db351f 100644 --- a/language/build.gradle +++ b/language/build.gradle | |||
@@ -1,22 +1,30 @@ | |||
1 | apply plugin: 'java-library' | 1 | apply plugin: 'java-library' |
2 | apply plugin: 'java-test-fixtures' | ||
2 | apply from: "${rootDir}/gradle/xtext-common.gradle" | 3 | apply from: "${rootDir}/gradle/xtext-common.gradle" |
3 | apply from: "${rootDir}/gradle/junit.gradle" | 4 | apply from: "${rootDir}/gradle/junit.gradle" |
4 | apply from: "${rootDir}/gradle/mwe2.gradle" | 5 | apply from: "${rootDir}/gradle/mwe2.gradle" |
5 | apply from: "${rootDir}/gradle/xtend.gradle" | 6 | apply from: "${rootDir}/gradle/xtend.gradle" |
6 | 7 | ||
7 | dependencies { | 8 | dependencies { |
9 | api platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}") | ||
8 | api "org.eclipse.xtext:org.eclipse.xtext:${xtextVersion}" | 10 | api "org.eclipse.xtext:org.eclipse.xtext:${xtextVersion}" |
9 | api "org.eclipse.xtext:org.eclipse.xtext.xbase:${xtextVersion}" | 11 | api "org.eclipse.xtext:org.eclipse.xtext.xbase:${xtextVersion}" |
10 | api "org.eclipse.emf:org.eclipse.emf.ecore:${ecoreVersion}" | 12 | api "org.eclipse.emf:org.eclipse.emf.ecore:${ecoreVersion}" |
11 | api project(':refinery-language-model') | 13 | api project(':refinery-language-model') |
12 | testImplementation "org.eclipse.xtext:org.eclipse.xtext.testing:${xtextVersion}" | 14 | testFixturesApi "org.eclipse.xtext:org.eclipse.xtext.testing:${xtextVersion}" |
13 | testImplementation "org.eclipse.xtext:org.eclipse.xtext.xbase.testing:${xtextVersion}" | ||
14 | mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}" | 15 | mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}" |
15 | mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}" | 16 | mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}" |
16 | mwe2 "org.eclipse.xtext:xtext-antlr-generator:${xtextAntlrGeneratorVersion}" | 17 | mwe2 "org.eclipse.xtext:xtext-antlr-generator:${xtextAntlrGeneratorVersion}" |
17 | mwe2 project(':refinery-language-mwe2') | 18 | mwe2 project(':refinery-language-mwe2') |
18 | } | 19 | } |
19 | 20 | ||
21 | sourceSets { | ||
22 | testFixtures { | ||
23 | java.srcDirs += ['src/testFixtures/xtext-gen'] | ||
24 | resources.srcDirs += ['src/testFixtures/xtext-gen'] | ||
25 | } | ||
26 | } | ||
27 | |||
20 | tasks.named('jar') { | 28 | tasks.named('jar') { |
21 | from(sourceSets.main.allSource) { | 29 | from(sourceSets.main.allSource) { |
22 | include '**/*.xtext' | 30 | include '**/*.xtext' |
@@ -29,7 +37,7 @@ def generateXtextLanguage = tasks.register('generateXtextLanguage', JavaExec) { | |||
29 | inputs.file 'src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2' | 37 | inputs.file 'src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2' |
30 | inputs.file 'src/main/java/org/eclipse/viatra/solver/language/Problem.xtext' | 38 | inputs.file 'src/main/java/org/eclipse/viatra/solver/language/Problem.xtext' |
31 | outputs.dir 'src/main/xtext-gen' | 39 | outputs.dir 'src/main/xtext-gen' |
32 | outputs.dir 'src/test/xtext-gen' | 40 | outputs.dir 'src/testFixtures/xtext-gen' |
33 | outputs.dir '../language-ide/src/main/xtext-gen' | 41 | outputs.dir '../language-ide/src/main/xtext-gen' |
34 | outputs.dir '../language-web/src/main/xtext-gen' | 42 | outputs.dir '../language-web/src/main/xtext-gen' |
35 | outputs.dir '../language-web/build/generated/sources/xtext' | 43 | outputs.dir '../language-web/build/generated/sources/xtext' |
@@ -53,8 +61,14 @@ tasks.named('processResources') { | |||
53 | 61 | ||
54 | tasks.named('clean') { | 62 | tasks.named('clean') { |
55 | delete 'src/main/xtext-gen' | 63 | delete 'src/main/xtext-gen' |
56 | delete 'src/test/xtext-gen' | 64 | delete 'src/testFixtures/xtext-gen' |
57 | delete '../language-ide/src/main/xtext-gen' | 65 | delete '../language-ide/src/main/xtext-gen' |
58 | delete '../language-web/src/main/xtext-gen' | 66 | delete '../language-web/src/main/xtext-gen' |
59 | delete '../language-web/build/generated/sources/xtext' | 67 | delete '../language-web/build/generated/sources/xtext' |
60 | } | 68 | } |
69 | |||
70 | sonarqube.properties { | ||
71 | properties['sonar.exclusions'] += [ | ||
72 | 'src/testFixtures/xtext-gen/**', | ||
73 | ] | ||
74 | } | ||
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2 b/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2 index b8bc5a44..4dfbb242 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2 +++ b/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2 | |||
@@ -15,6 +15,7 @@ Workflow { | |||
15 | rootPath = rootPath | 15 | rootPath = rootPath |
16 | runtimeTest = { | 16 | runtimeTest = { |
17 | enabled = true | 17 | enabled = true |
18 | srcGen = 'src/testFixtures/xtext-gen' | ||
18 | } | 19 | } |
19 | genericIde = { | 20 | genericIde = { |
20 | name = "language-ide" | 21 | name = "language-ide" |
@@ -48,6 +49,8 @@ Workflow { | |||
48 | generateStub = false | 49 | generateStub = false |
49 | } | 50 | } |
50 | junitSupport = { | 51 | junitSupport = { |
52 | generateStub = false | ||
53 | skipXbaseTestingPackage = true | ||
51 | junitVersion = "5" | 54 | junitVersion = "5" |
52 | } | 55 | } |
53 | webSupport = ProblemWebIntegrationFragment { | 56 | webSupport = ProblemWebIntegrationFragment { |