diff options
-rw-r--r-- | MANIFEST.MF | 4 | ||||
-rw-r--r-- | build.gradle | 5 | ||||
-rw-r--r-- | buildSrc/src/main/groovy/refinery-java-conventions.gradle | 5 | ||||
-rw-r--r-- | gradle.properties | 2 | ||||
-rw-r--r-- | language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2 | 6 | ||||
-rw-r--r-- | language-model/src/main/resources/model/problem.genmodel | 4 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/GenerateProblem.mwe2 | 2 |
7 files changed, 16 insertions, 12 deletions
diff --git a/MANIFEST.MF b/MANIFEST.MF new file mode 100644 index 00000000..94efbd74 --- /dev/null +++ b/MANIFEST.MF | |||
@@ -0,0 +1,4 @@ | |||
1 | Manifest-Version: 1.0 | ||
2 | Bundle-SymbolicName: tools.refinery.refinery-language | ||
3 | Bundle-Version: 0.0.0-SNAPSHOT | ||
4 | |||
diff --git a/build.gradle b/build.gradle index 329b1cdb..6c0c8701 100644 --- a/build.gradle +++ b/build.gradle | |||
@@ -2,8 +2,3 @@ plugins { | |||
2 | id 'eclipse' | 2 | id 'eclipse' |
3 | id 'refinery-sonarqube' | 3 | id 'refinery-sonarqube' |
4 | } | 4 | } |
5 | |||
6 | allprojects { | ||
7 | group = 'tools.refinery' | ||
8 | version = '0.0.0-SNAPSHOT' | ||
9 | } | ||
diff --git a/buildSrc/src/main/groovy/refinery-java-conventions.gradle b/buildSrc/src/main/groovy/refinery-java-conventions.gradle index fcdc8ea9..b2efd7e9 100644 --- a/buildSrc/src/main/groovy/refinery-java-conventions.gradle +++ b/buildSrc/src/main/groovy/refinery-java-conventions.gradle | |||
@@ -45,7 +45,10 @@ tasks.register('slowTest', Test) { | |||
45 | 45 | ||
46 | tasks.named('jar') { | 46 | tasks.named('jar') { |
47 | manifest { | 47 | manifest { |
48 | attributes 'Bundle-SymbolicName': project.name | 48 | attributes( |
49 | 'Bundle-SymbolicName': "${project.group}.${project.name}", | ||
50 | 'Bundle-Version': project.version | ||
51 | ) | ||
49 | } | 52 | } |
50 | } | 53 | } |
51 | 54 | ||
diff --git a/gradle.properties b/gradle.properties index 713ba6a4..edfbcdc2 100644 --- a/gradle.properties +++ b/gradle.properties | |||
@@ -1,5 +1,7 @@ | |||
1 | group=tools.refinery | ||
1 | nodeVersion=16.13.0 | 2 | nodeVersion=16.13.0 |
2 | systemProp.sonar.projectKey=graphs4value_refinery | 3 | systemProp.sonar.projectKey=graphs4value_refinery |
3 | systemProp.sonar.organization=graphs4value | 4 | systemProp.sonar.organization=graphs4value |
4 | systemProp.sonar.host.url=https://sonarcloud.io | 5 | systemProp.sonar.host.url=https://sonarcloud.io |
6 | version=0.0.0-SNAPSHOT | ||
5 | yarnVersion=1.22.17 | 7 | yarnVersion=1.22.17 |
diff --git a/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2 b/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2 index c1518b4d..15198d69 100644 --- a/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2 +++ b/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2 | |||
@@ -3,7 +3,7 @@ module tools.refinery.language.model.GenerateProblemModel | |||
3 | Workflow { | 3 | Workflow { |
4 | bean = org.eclipse.emf.mwe.utils.StandaloneSetup { | 4 | bean = org.eclipse.emf.mwe.utils.StandaloneSetup { |
5 | projectMapping = { | 5 | projectMapping = { |
6 | projectName = "refinery-language-model" | 6 | projectName = "tools.refinery.refinery-language-model" |
7 | path = "." | 7 | path = "." |
8 | } | 8 | } |
9 | } | 9 | } |
@@ -14,7 +14,7 @@ Workflow { | |||
14 | 14 | ||
15 | component = org.eclipse.emf.mwe2.ecore.EcoreGenerator { | 15 | component = org.eclipse.emf.mwe2.ecore.EcoreGenerator { |
16 | generateCustomClasses = false | 16 | generateCustomClasses = false |
17 | genModel = "platform:/resource/refinery-language-model/src/main/resources/model/problem.genmodel" | 17 | genModel = "platform:/resource/tools.refinery.refinery-language-model/src/main/resources/model/problem.genmodel" |
18 | srcPath = "platform:/resource/refinery-language-model/src/main/emf-gen" | 18 | srcPath = "platform:/resource/tools.refinery.refinery-language-model/src/main/emf-gen" |
19 | } | 19 | } |
20 | } | 20 | } |
diff --git a/language-model/src/main/resources/model/problem.genmodel b/language-model/src/main/resources/model/problem.genmodel index 3e0ee35e..9ba2274b 100644 --- a/language-model/src/main/resources/model/problem.genmodel +++ b/language-model/src/main/resources/model/problem.genmodel | |||
@@ -1,8 +1,8 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | 2 | <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
3 | xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" | 3 | xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" |
4 | modelDirectory="/refinery-language-model/src/main/emf-gen" creationIcons="false" | 4 | modelDirectory="/tools.refinery.refinery-language-model/src/main/emf-gen" |
5 | editDirectory="/language-edit/src/main/emf-gen" editorDirectory="/org.eclipse.viatra.solver.language.model.editor/src-gen" | 5 | creationIcons="false" editDirectory="/language-edit/src/main/emf-gen" editorDirectory="/org.eclipse.viatra.solver.language.model.editor/src-gen" |
6 | modelPluginID="language-model" modelName="Problem" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" | 6 | modelPluginID="language-model" modelName="Problem" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" |
7 | codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" | 7 | codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" |
8 | copyrightFields="false" operationReflection="true" importOrganizing="true"> | 8 | copyrightFields="false" operationReflection="true" importOrganizing="true"> |
diff --git a/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2 b/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2 index 0d934b68..21ff456e 100644 --- a/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2 +++ b/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2 | |||
@@ -35,7 +35,7 @@ Workflow { | |||
35 | language = StandardLanguage { | 35 | language = StandardLanguage { |
36 | name = 'tools.refinery.language.Problem' | 36 | name = 'tools.refinery.language.Problem' |
37 | fileExtensions = 'problem' | 37 | fileExtensions = 'problem' |
38 | referencedResource = 'platform:/resource/refinery-language-model/model/problem.genmodel' | 38 | referencedResource = 'platform:/resource/tools.refinery.refinery-language-model/model/problem.genmodel' |
39 | serializer = { | 39 | serializer = { |
40 | generateStub = false | 40 | generateStub = false |
41 | } | 41 | } |