Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.gradle14
-rw-r--r--examples/org.eclipse.etrice.examples.c/build.gradle27
-rw-r--r--examples/org.eclipse.etrice.examples.java/build.gradle13
-rw-r--r--examples/org.eclipse.etrice.template.c/build.gradle11
-rw-r--r--examples/org.eclipse.etrice.template.cpp/build.gradle11
-rw-r--r--examples/org.eclipse.etrice.tutorials.c/build.gradle8
-rw-r--r--examples/org.eclipse.etrice.tutorials.cpp/build.gradle8
-rw-r--r--examples/org.eclipse.etrice.tutorials.java/build.gradle8
-rw-r--r--gradle/etGenerator.gradle46
-rw-r--r--gradle/etTest.gradle71
-rw-r--r--gradle/etUnitConverter.gradle26
-rw-r--r--gradle/scmVersion.gradle11
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin54708 -> 58695 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
-rw-r--r--gradlew51
-rw-r--r--gradlew.bat21
-rw-r--r--plugins/build.gradle4
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend8
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator.contractmonitor/META-INF/generators/etrice-contractmonitor1
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TestInstanceCreator.xtend38
-rw-r--r--releng/org.eclipse.etrice.releng/build.gradle4
-rw-r--r--releng/org.eclipse.etrice.site/build.gradle4
-rw-r--r--runtime/org.eclipse.etrice.modellib.c/build.gradle47
-rw-r--r--runtime/org.eclipse.etrice.modellib.cpp/build.gradle30
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/build.gradle31
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/build.gradle26
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etThread.c81
-rw-r--r--runtime/org.eclipse.etrice.runtime.cpp/build.gradle4
-rw-r--r--runtime/org.eclipse.etrice.runtime.java/build.gradle4
-rw-r--r--settings.gradle18
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/build.gradle10
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/model/sendingDataTest/SendingDataTest.room (renamed from tests/org.eclipse.etrice.generator.c.tests/models/SendingDataTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/model/staticConfigTest/StaticConfigTest.config (renamed from tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.config)0
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/model/staticConfigTest/StaticConfigTest.etmap (renamed from tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.etmap)0
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/model/staticConfigTest/StaticConfigTest.room (renamed from tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/modelpath3
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/build.gradle83
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/GenericPhysical.etphys (renamed from tests/org.eclipse.etrice.generator.common.tests/models/GenericPhysical.etphys)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/actorCommunicationTest/ActorCommunicationTest.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/choicePointTest/ChoicePointTest.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/choicePointTestExtended/ChoicePointTestExtended.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTestExtended.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/compileTest/CompileTest.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/CompileTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/compileTest/ContinuationTransitionTest.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/ContinuationTransitionTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/compileTest/StatemachineInterfaceInheritedTest.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/StatemachineInterfaceInheritedTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/compileTest/StatemachineInterfaceTest.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/StatemachineInterfaceTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/ContractMonitor.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/ContractMonitor.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/ContractMonitorTest.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/ContractMonitorTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitor.LoginProtocolContract.behavior (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitor.LoginProtocolContract.behavior)2
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitor.LoginProtocolContract.structure (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitor.LoginProtocolContract.structure)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ABadClient.behavior (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ABadClient.behavior)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ABadClient.structure (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ABadClient.structure)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ABadClient2.behavior (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ABadClient2.behavior)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ABadClientTestContainer.structure (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ABadClientTestContainer.structure)2
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AProvider.behavior (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AProvider.behavior)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AProvider.structure (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AProvider.structure)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AValidClient.behavior (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AValidClient.behavior)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AValidClient.structure (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AValidClient.structure)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AValidClientTestContainer.structure (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AValidClientTestContainer.structure)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Appl.behavior (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Appl.behavior)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Appl.structure (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Appl.structure)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AxisController.structure (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AxisController.structure)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Client.behavior (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Client.behavior)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Client.structure (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Client.structure)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ContractMonitor_Top.structure (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ContractMonitor_Top.structure)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Controller_ex1.structure (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Controller_ex1.structure)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Provider.structure (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Provider.structure)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ValidClient.behavior (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ValidClient.behavior)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ValidClient.structure (renamed from tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ValidClient.structure)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/dataDrivenTest/DataDrivenTest.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/DataDrivenTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/detailExpressionTest/DetailExpressionEnum.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionEnum.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/detailExpressionTest/DetailExpressionTest.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room)2
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/detailExpressionTest/DetailExpressionTypes.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTypes.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/enumTest/EnumTest.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/EnumTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/handlerTest/HandlerTest.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/noInitialTransitionTest/Bug541775_NoInitialTransition.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/Bug541775_NoInitialTransition.room)2
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/operationInheritanceTest/OperationInheritanceTest.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/OperationInheritanceTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadReplPortTest/PingPongThreadReplPort.etphys57
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadReplPortTest/PingPongThreadReplPortTest.etmap (renamed from tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.etmap)2
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadReplPortTest/PingPongThreadReplPortTest.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadTest/PingPongThread.etphys (renamed from tests/org.eclipse.etrice.generator.common.tests/models/PingPongThread.etphys)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadTest/PingPongThreadTest.etmap (renamed from tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.etmap)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadTest/PingPongThreadTest.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/subSystemUserCodeTest/SubSystemUserCodeTest.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/SubSystemUserCodeTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model/varargsTest/VarargsTest.room (renamed from tests/org.eclipse.etrice.generator.common.tests/models/VarargsTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/modelpath16
-rw-r--r--tests/org.eclipse.etrice.generator.cpp.tests/build.gradle10
-rw-r--r--tests/org.eclipse.etrice.generator.cpp.tests/model/initializationTest/InitializationTest.room (renamed from tests/org.eclipse.etrice.generator.cpp.tests/models/InitializationTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.cpp.tests/model/sendingDataTest/SendingDataTest.room (renamed from tests/org.eclipse.etrice.generator.cpp.tests/models/SendingDataTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.cpp.tests/modelpath3
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/build.gradle40
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest1/DynamicActorTest1.etmap (renamed from tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.etmap)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest1/DynamicActorTest1.room (renamed from tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest2/DynamicActorTest2.etmap (renamed from tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.etmap)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest2/DynamicActorTest2.room (renamed from tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest3/DynamicActorTest3.room (renamed from tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest3.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest4/DynamicActorTest4.room (renamed from tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest4.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest5/DynamicActorTest5.room (renamed from tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest5.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest6/DynamicActorTest6.room (renamed from tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest6.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest7/DynamicActorTest7.etmap (renamed from tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.etmap)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest7/DynamicActorTest7.room (renamed from tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/dynamicConfigTest/DynamicConfigTest.config (renamed from tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.config)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/dynamicConfigTest/DynamicConfigTest.etmap (renamed from tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.etmap)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/dynamicConfigTest/DynamicConfigTest.room (renamed from tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/dynamicConfigTest/DynamicConfigTest.rt-config (renamed from tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.rt-config)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/sendingDataTest/SendingDataTest.room (renamed from tests/org.eclipse.etrice.generator.java.tests/models/SendingDataTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/staticConfigTest/StaticConfigTest.config (renamed from tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.config)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/staticConfigTest/StaticConfigTest.etmap (renamed from tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.etmap)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/staticConfigTest/StaticConfigTest.room (renamed from tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/storeRestoreTest/StoreRestoreTest.room (renamed from tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/model/tcpTest/TCPTest.room (renamed from tests/org.eclipse.etrice.generator.java.tests/models/TCPTest.room)0
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/modelpath2
-rw-r--r--tests/org.eclipse.etrice.runtime.c.tests/build.gradle17
-rw-r--r--tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle17
-rw-r--r--tests/org.eclipse.etrice.runtime.java.tests/build.gradle4
117 files changed, 535 insertions, 377 deletions
diff --git a/build.gradle b/build.gradle
index 0deaf5a02..a2bbaf1d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
plugins {
- id 'org.xtext.xtend' version '2.0.7' apply false
- id 'com.github.dkorotych.gradle-maven-exec' version '2.2.1'
- id 'org.hidetake.ssh' version '2.10.1'
+ id "pl.allegro.tech.build.axion-release"
+ id "de.protos.etrice-base" apply false
+ id "de.protos.etunit-convert" apply false
}
apply from: "$rootDir/gradle/scmVersion.gradle"
@@ -32,8 +32,10 @@ allprojects {
version = scmVersion.version
repositories {
- maven {
- url 'https://repo.eclipse.org/content/repositories/maven_central/'
- }
+ jcenter()
+ // handshake failure??
+ // maven {
+ // url 'https://repo.eclipse.org/content/repositories/maven_central/'
+ // }
}
} \ No newline at end of file
diff --git a/examples/org.eclipse.etrice.examples.c/build.gradle b/examples/org.eclipse.etrice.examples.c/build.gradle
index 432d406ec..7c02641b1 100644
--- a/examples/org.eclipse.etrice.examples.c/build.gradle
+++ b/examples/org.eclipse.etrice.examples.c/build.gradle
@@ -1,30 +1,7 @@
apply plugin: 'c'
-apply from: "$rootDir/gradle/etTest.gradle"
-
-dependencies {
- modelpath_c files('model/Features', 'model/TrafficLight', (1..4).collect { i -> "model/TrafficLight_step${i}" })
-}
-def features = [
- 'ActorClassExamples.room', 'ActorRefs.room', 'Attributes.room',
- 'CommunicationAndExecutionTypes.room', 'DataTypes.room', 'Features.etmap',
- 'Features.room', 'Inheritance.room', 'Multiplicity.room',
- 'Operations.room', 'PortRoles.room', 'ProtocolClasses.room'
-].collect { 'model/features/' + it }
-
-/* Doesn't compile due to classes with same name
-createBuild('c', 'features', [
- 'ActorClassExamples.room', 'ActorRefs.room', 'Attributes.room',
- 'CommunicationAndExecutionTypes.room', 'DataTypes.room', 'Features.etmap',
- 'Features.room', 'Inheritance.room', 'Multiplicity.room',
- 'Operations.room', 'PortRoles.room', 'ProtocolClasses.room'
- ].collect { 'model/features/' + it })
-*/
+apply from: "$rootDir/gradle/etTest.gradle"
1.upto(4) { i ->
- createBuild('c', "trafficLight_step${i}", [
- 'model/TrafficLight/TrafficLight.room',
- "model/TrafficLight_step${i}/TrafficLight_step${i}.etmap",
- "model/TrafficLight_step${i}/TrafficLight_step${i}.room"
- ])
+ createBuild('c', "trafficLight$i", ['model/TrafficLight', "model/TrafficLight_step$i"])
} \ No newline at end of file
diff --git a/examples/org.eclipse.etrice.examples.java/build.gradle b/examples/org.eclipse.etrice.examples.java/build.gradle
index 0a2734c18..e0afc9650 100644
--- a/examples/org.eclipse.etrice.examples.java/build.gradle
+++ b/examples/org.eclipse.etrice.examples.java/build.gradle
@@ -1,14 +1,9 @@
-apply plugin: 'java-base'
-apply from: "$rootDir/gradle/etTest.gradle"
+apply plugin: "java-base"
-dependencies {
- modelpath_java files((1..9).collect { i -> "model/dynamicactors${i}" })
-}
+apply from: "$rootDir/gradle/etTest.gradle"
1.upto(9) { i ->
- createBuild('java', "dynamicactors${i}",
- ["model/dynamicactors${i}/DynAct${i}.etmap", "model/dynamicactors${i}/DynAct${i}.room"],
- ['-persistable', '-storeDataObj'])
+ createBuild("java", "dynamicactors${i}", "model/dynamicactors${i}", ["persistable", "storeDataObj"])
}
-sourceSets.dynamicactors8.java.srcDir 'src' \ No newline at end of file
+sourceSets.dynamicactors8.java.srcDir "src" \ No newline at end of file
diff --git a/examples/org.eclipse.etrice.template.c/build.gradle b/examples/org.eclipse.etrice.template.c/build.gradle
index 5a470ddb8..a18ae4832 100644
--- a/examples/org.eclipse.etrice.template.c/build.gradle
+++ b/examples/org.eclipse.etrice.template.c/build.gradle
@@ -1,13 +1,4 @@
apply plugin: 'c'
apply from: "$rootDir/gradle/etTest.gradle"
-dependencies {
- modelpath_c files('model')
-}
-
-def models = [
- 'model/TemplateMapping.etmap',
- 'model/TemplateModel.room'
-]
-
-createBuild('c', 'template', models) \ No newline at end of file
+createBuild('c', 'template', 'model') \ No newline at end of file
diff --git a/examples/org.eclipse.etrice.template.cpp/build.gradle b/examples/org.eclipse.etrice.template.cpp/build.gradle
index c7a8dea00..03d158770 100644
--- a/examples/org.eclipse.etrice.template.cpp/build.gradle
+++ b/examples/org.eclipse.etrice.template.cpp/build.gradle
@@ -1,13 +1,4 @@
apply plugin: 'cpp'
apply from: "$rootDir/gradle/etTest.gradle"
-dependencies {
- modelpath_cpp files('model')
-}
-
-def models = [
- 'model/TemplateMapping.etmap',
- 'model/TemplateModel.room'
-]
-
-createBuild('cpp', 'template', models) \ No newline at end of file
+createBuild('cpp', 'template', 'model') \ No newline at end of file
diff --git a/examples/org.eclipse.etrice.tutorials.c/build.gradle b/examples/org.eclipse.etrice.tutorials.c/build.gradle
index a7a4fd3c1..10321d7e2 100644
--- a/examples/org.eclipse.etrice.tutorials.c/build.gradle
+++ b/examples/org.eclipse.etrice.tutorials.c/build.gradle
@@ -1,9 +1,5 @@
apply plugin: 'c'
apply from: "$rootDir/gradle/etTest.gradle"
-dependencies {
- modelpath_c files('model/HelloWorld', 'model/PingPong')
-}
-
-createBuild('c', 'helloWorld', ['model/HelloWorld/Mapping.etmap', 'model/HelloWorld/HelloWorld.room'])
-createBuild('c', 'pingPong', ['model/PingPong/Mapping.etmap', 'model/PingPong/PingPong.room']) \ No newline at end of file
+createBuild('c', 'helloWorld', 'model/HelloWorld')
+createBuild('c', 'pingPong', 'model/PingPong') \ No newline at end of file
diff --git a/examples/org.eclipse.etrice.tutorials.cpp/build.gradle b/examples/org.eclipse.etrice.tutorials.cpp/build.gradle
index f96b37bbf..cbc6cb19d 100644
--- a/examples/org.eclipse.etrice.tutorials.cpp/build.gradle
+++ b/examples/org.eclipse.etrice.tutorials.cpp/build.gradle
@@ -1,9 +1,5 @@
apply plugin: 'cpp'
apply from: "$rootDir/gradle/etTest.gradle"
-dependencies {
- modelpath_cpp files('model/HelloWorld', 'model/PingPong')
-}
-
-createBuild('cpp', 'helloWorld', ['model/HelloWorld/Mapping.etmap', 'model/HelloWorld/HelloWorld.room'])
-createBuild('cpp', 'pingPong', ['model/PingPong/Mapping.etmap', 'model/PingPong/PingPong.room']) \ No newline at end of file
+createBuild('cpp', 'helloWorld', 'model/HelloWorld')
+createBuild('cpp', 'pingPong', 'model/PingPong') \ No newline at end of file
diff --git a/examples/org.eclipse.etrice.tutorials.java/build.gradle b/examples/org.eclipse.etrice.tutorials.java/build.gradle
index a4f361688..3941f5af1 100644
--- a/examples/org.eclipse.etrice.tutorials.java/build.gradle
+++ b/examples/org.eclipse.etrice.tutorials.java/build.gradle
@@ -1,9 +1,5 @@
apply plugin: 'java-base'
apply from: "$rootDir/gradle/etTest.gradle"
-dependencies {
- modelpath_java files('model/HelloWorld', 'model/PingPong')
-}
-
-createBuild('java', 'helloWorld', ['model/HelloWorld/Mapping.etmap', 'model/HelloWorld/HelloWorld.room'])
-createBuild('java', 'pingPong', ['model/PingPong/Mapping.etmap', 'model/PingPong/PingPong.room']) \ No newline at end of file
+createBuild('java', 'helloWorld', 'model/HelloWorld')
+createBuild('java', 'pingPong', 'model/PingPong') \ No newline at end of file
diff --git a/gradle/etGenerator.gradle b/gradle/etGenerator.gradle
deleted file mode 100644
index 35cdc1131..000000000
--- a/gradle/etGenerator.gradle
+++ /dev/null
@@ -1,46 +0,0 @@
-configurations {
- etrice_c
- etrice_cpp
- etrice_java
-
- modelpath_c
- modelpath_cpp
- modelpath_java
-}
-
-dependencies {
- etrice_c project(':plugins:org.eclipse.etrice.generator.c')
- etrice_cpp project(':plugins:org.eclipse.etrice.generator.cpp')
- etrice_java project(':plugins:org.eclipse.etrice.generator.java')
-
- etrice_c project(':plugins:org.eclipse.etrice.generator.contractmonitor')
- etrice_cpp project(':plugins:org.eclipse.etrice.generator.contractmonitor')
- etrice_java project(':plugins:org.eclipse.etrice.generator.contractmonitor')
-}
-
-/**
- * Creates an eTrice generator task.
- * @param name the name of the new task
- * @param lang one of the following languages 'c', 'cpp', 'java'
- * @param models a list of models passed to the generator
- * @param genDir the generation directory
- * @param options the eTrice generator options
- * @return the generator task
- */
-ext.createGeneratorTask = { name, lang, models, genDir = 'src-gen', options = [] ->
- return tasks.create(name: name, type: JavaExec) {
- // accessible for later use
- ext.lang = lang
- ext.modelpath = configurations."modelpath_$lang"
-
- main = "org.eclipse.etrice.generator.${lang}.Main"
- classpath = configurations."etrice_$lang"
- args '-clean', '-msc_instr'
- args '-genDir', genDir
- args options
- if(!modelpath.isEmpty()) {
- args '-modelpath', modelpath.asPath
- }
- args models
- }
-} \ No newline at end of file
diff --git a/gradle/etTest.gradle b/gradle/etTest.gradle
index 083d5783d..9d34d58c1 100644
--- a/gradle/etTest.gradle
+++ b/gradle/etTest.gradle
@@ -1,17 +1,63 @@
import static org.apache.tools.ant.taskdefs.condition.Os.*
-apply from: "$rootDir/gradle/etGenerator.gradle"
-apply from: "$rootDir/gradle/etUnitConverter.gradle"
+apply plugin: "de.protos.etrice-base"
+apply plugin: "de.protos.etunit-convert"
+
+configurations {
+ modelpath_c
+ modelpath_cpp
+ modelpath_java
+}
dependencies {
- modelpath_c project(path: ':runtime:org.eclipse.etrice.modellib.c', configuration: 'modelpath_c')
- modelpath_cpp project(path: ':runtime:org.eclipse.etrice.modellib.cpp', configuration: 'modelpath_cpp')
- modelpath_java project(path: ':runtime:org.eclipse.etrice.modellib.java', configuration: 'modelpath_java')
+ generator project(':plugins:org.eclipse.etrice.generator.c')
+ generator project(':plugins:org.eclipse.etrice.generator.cpp')
+ generator project(':plugins:org.eclipse.etrice.generator.java')
+
+ modelpath_c project(path: ':runtime:org.eclipse.etrice.modellib.c', configuration: 'modelpathDir')
+ modelpath_cpp project(path: ':runtime:org.eclipse.etrice.modellib.cpp', configuration: 'modelpathDir')
+ modelpath_java project(path: ':runtime:org.eclipse.etrice.modellib.java', configuration: 'modelpathDir')
+
+ etunitConverter project(":plugins:org.eclipse.etrice.etunit.converter")
}
def outputDir = "$buildDir/log"
def srcGenDir = "$buildDir/src-gen"
+/**
+ * Creates an eTrice generator task.
+ * @param name the name of the new task
+ * @param lang one of the following languages 'c', 'cpp', 'java'
+ * @param modelDirs a list of model directories passed to the generator
+ * @param genDir the generation directory
+ * @param options the eTrice generator options
+ * @return the generator task
+ */
+ext.createGenerateTask = { name, lang, modelDirs, genDir = 'src-gen', options = [] ->
+ return modelSet.create(name) {
+ module = "etrice-$lang"
+ source.srcDir modelDirs
+ source.include '**/*.room', '**/*.etmap', '**/*.etphys', '**/*.config'
+ modelpath.from configurations."modelpath_$lang"
+ genDir = project.layout.projectDirectory.file(genDir)
+ option 'msc_instr'
+ options.each { option it }
+ }.generateTask
+}
+
+/**
+ * Creates a tasks that converts etu files to xml files
+ * @param name: The name of the new task
+ * @param etuFiles: A list of etu files
+ * @param args: The options passed to the converter
+ */
+ext.createEtUnitConverterTask = { name, etuFiles, args = [] ->
+ return etunitConvert.create(name) {
+ source etuFiles
+ options.addAll(args)
+ }
+}
+
def getMainClass(String genDir) {
// search for SubSystemRunner java file
def mainFile = fileTree(genDir, { include '**/*Runner.java' }).getSingleFile()
@@ -29,17 +75,17 @@ def getMainClass(String genDir) {
*
* @param lang the eTrice generator type ('c', 'cpp', 'java')
* @param name the name starting with a lower case letter
- * @param models models that are passed to the eTrice generator
+ * @param modelDirs the model directories
* @param options options that are passed to the eTrice generator
* @return the task to run the application
*/
-ext.createBuild = { lang, name, models, options = [] ->
+ext.createBuild = { lang, name, modelDirs, options = [] ->
def nameCap = name.capitalize()
def genDir = "$srcGenDir/$name"
def workingDir = "$outputDir/$name"
- def generateTask = createGeneratorTask("generate$nameCap", lang, models, genDir, options)
+ def generateTask = createGenerateTask(name, lang, modelDirs, genDir, options)
def runTask
@@ -91,8 +137,8 @@ ext.createBuild = { lang, name, models, options = [] ->
}
dependencies {
- add "${name}Compile", project(':runtime:org.eclipse.etrice.modellib.java')
- add "${name}Compile", project(':runtime:org.eclipse.etrice.runtime.java')
+ add "${name}Implementation", project(':runtime:org.eclipse.etrice.modellib.java')
+ add "${name}Implementation", project(':runtime:org.eclipse.etrice.runtime.java')
}
tasks.getByName("compile${nameCap}Java").dependsOn generateTask
@@ -117,10 +163,9 @@ ext.createBuild = { lang, name, models, options = [] ->
*
* @param lang the eTrice generator type ('c', 'cpp', 'java')
* @param name the test name starting with a lower case letter
- * @param models models that are passed to the eTrice generator
* @param options options that are passed to the eTrice generator
*/
-ext.createTest = { lang, name, models, options = [] ->
+ext.createTest = { lang, name, options = [] ->
def nameCap = name.capitalize()
def langCap = lang.capitalize()
@@ -131,7 +176,7 @@ ext.createTest = { lang, name, models, options = [] ->
def workingDir = "$outputDir/$testName"
def etuFile = "$workingDir/log/${nameCap}.etu"
- def runTask = createBuild(lang, testName, models, options)
+ def runTask = createBuild(lang, testName, "model/$name", options)
def convertTask = createEtUnitConverterTask("convert$testNameCap", [etuFile], ['-suite', suiteName])
convertTask.dependsOn runTask
diff --git a/gradle/etUnitConverter.gradle b/gradle/etUnitConverter.gradle
deleted file mode 100644
index fb4c9ea06..000000000
--- a/gradle/etUnitConverter.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-configurations {
- etunit
-}
-
-dependencies {
- etunit project(':plugins:org.eclipse.etrice.etunit.converter')
-}
-
-/**
- * Creates a tasks that converts etu files to xml files
- * @param name: The name of the new task
- * @param etuFiles: A list of etu files
- * @param options: The options passed to the converter
- */
-ext.createEtUnitConverterTask = { name, etuFiles, options = [] ->
- def xmlFiles = etuFiles.collect { it.replace('.etu', '.xml') }
-
- return tasks.create(name: name, type: JavaExec) {
- main = 'org.eclipse.etrice.etunit.converter.EtUnitReportConverter'
- classpath = configurations.etunit
- args options
- args etuFiles
- inputs.files etuFiles
- outputs.files xmlFiles
- }
-} \ No newline at end of file
diff --git a/gradle/scmVersion.gradle b/gradle/scmVersion.gradle
index 2686f78a1..fe98cd3f3 100644
--- a/gradle/scmVersion.gradle
+++ b/gradle/scmVersion.gradle
@@ -1,14 +1,3 @@
-buildscript {
- repositories {
- mavenCentral()
- }
- dependencies {
- classpath group: 'pl.allegro.tech.build', name: 'axion-release-plugin', version: '1.8.3'
- }
-}
-
-apply plugin: pl.allegro.tech.build.axion.release.ReleasePlugin
-
scmVersion {
tag {
prefix = 'v'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7a3265ee9..f3d88b1c2 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffb597785..a2bf1313b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
diff --git a/gradlew b/gradlew
index cccdd3d51..2fe81a7d9 100644
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
#!/usr/bin/env sh
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
##############################################################################
##
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -138,19 +154,19 @@ if $cygwin ; then
else
eval `echo args$i`="\"$arg\""
fi
- i=$((i+1))
+ i=`expr $i + 1`
done
case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ 0) set -- ;;
+ 1) set -- "$args0" ;;
+ 2) set -- "$args0" "$args1" ;;
+ 3) set -- "$args0" "$args1" "$args2" ;;
+ 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
@@ -159,14 +175,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
-
exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index f9553162f..62bd9b9cc 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
diff --git a/plugins/build.gradle b/plugins/build.gradle
index 8dc6e5c2a..3375c8d67 100644
--- a/plugins/build.gradle
+++ b/plugins/build.gradle
@@ -1,3 +1,7 @@
+plugins {
+ id "org.xtext.xtend" apply false
+}
+
def xtextProjects = [
'org.eclipse.etrice.core.common',
'org.eclipse.etrice.core.config',
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
index f199c8b25..d34f402d9 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
@@ -94,8 +94,8 @@ class ActorClassGen extends GenericActorClassGenerator {
#include "messaging/etMessage.h"
/* include all referenced room classes */
- «FOR rc : (root.getReferencedDataClasses(ac) + root.getReferencedEnumClasses(ac) + root.getReferencedProtocolClasses(ac)).sortBy[name]»
- #include «rc.includePath»
+ «FOR path : (root.getReferencedDataClasses(ac) + root.getReferencedEnumClasses(ac) + root.getReferencedProtocolClasses(ac)).map[includePath].sort»
+ #include «path»
«ENDFOR»
«ac.userCode(1, true)»
@@ -349,8 +349,8 @@ class ActorClassGen extends GenericActorClassGenerator {
#include "etUnit/etUnit.h"
#include "base/etMemory.h"
- «FOR pc : root.getReferencedProtocolClasses(ac)»
- #include «pc.includePath»
+ «FOR path : root.getReferencedProtocolClasses(ac).map[includePath].sort»
+ #include «path»
«ENDFOR»
#include "«ac.getCUtilsFileName»"
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend
index 47ac9fe28..3a0f63d79 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend
@@ -69,8 +69,8 @@ class DataClassGen {
/* include all referenced room classes */
««« TODO: includes only for used DataClasses, also for other models
- «FOR rc : (root.getReferencedDataClasses(dc) + root.getReferencedEnumClasses(dc)).sortBy[name]»
- #include «rc.includePath»
+ «FOR path : (root.getReferencedDataClasses(dc) + root.getReferencedEnumClasses(dc)).map[includePath].sort»
+ #include «path»
«ENDFOR»
«dc.userCode(1)»
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend
index 5d6f3fca7..72cc347fa 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend
@@ -347,8 +347,8 @@ class NodeGen {
#include "messaging/etMessageService.h"
/* include all referenced room classes */
- «FOR dc : (root.getReferencedActorClasses(ssi.subSystemClass) + root.getReferencedProtocolClasses(ssi.subSystemClass)).sortBy[name]»
- #include «dc.includePath»
+ «FOR path : (root.getReferencedActorClasses(ssi.subSystemClass) + root.getReferencedProtocolClasses(ssi.subSystemClass)).map[includePath].sort»
+ #include «path»
«ENDFOR»
/* instantiation of message services and message buffers */
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
index 1b6fde86b..ce215cd2e 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
@@ -79,8 +79,8 @@ class ProtocolClassGen extends GenericProtocolClassGenerator {
«pc.userCode(1)»
/* include all referenced room classes */
- «FOR dc : (root.getReferencedProtocolClasses(pc) + root.getReferencedDataClasses(pc) + root.getReferencedEnumClasses(pc)).sortBy[name]»
- #include «dc.includePath»
+ «FOR path : (root.getReferencedProtocolClasses(pc) + root.getReferencedDataClasses(pc) + root.getReferencedEnumClasses(pc)).map[includePath].sort»
+ #include «path»
«ENDFOR»
«IF pc.commType==CommunicationType::EVENT_DRIVEN»
diff --git a/plugins/org.eclipse.etrice.generator.contractmonitor/META-INF/generators/etrice-contractmonitor b/plugins/org.eclipse.etrice.generator.contractmonitor/META-INF/generators/etrice-contractmonitor
new file mode 100644
index 000000000..4c7b8c4cb
--- /dev/null
+++ b/plugins/org.eclipse.etrice.generator.contractmonitor/META-INF/generators/etrice-contractmonitor
@@ -0,0 +1 @@
+org.eclipse.etrice.generator.contractmonitor.setup.GeneratorModule \ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TestInstanceCreator.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TestInstanceCreator.xtend
index 13bcaa149..87892f84e 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TestInstanceCreator.xtend
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TestInstanceCreator.xtend
@@ -16,6 +16,9 @@ import org.eclipse.etrice.generator.base.logging.ILogger
import org.eclipse.etrice.core.genmodel.fsm.IDiagnostician
import org.eclipse.etrice.core.room.SubSystemClass
import org.eclipse.etrice.core.room.ActorClass
+import org.eclipse.etrice.core.etphys.eTPhys.ETPhysFactory
+import org.eclipse.etrice.core.etphys.eTPhys.ThreadModel
+import org.eclipse.etrice.core.etphys.eTPhys.ExecMode
@FinalFieldsConstructor
class TestInstanceCreator {
@@ -24,6 +27,7 @@ class TestInstanceCreator {
val extension RoomFactory = RoomFactory.eINSTANCE
val extension ETMapFactory = ETMapFactory.eINSTANCE
+ val extension ETPhysFactory = ETPhysFactory.eINSTANCE
// ctor
val ILogger logger
@@ -91,7 +95,10 @@ class TestInstanceCreator {
// get physical system
val List<PhysicalSystem> allPhysSystems = physModels.fold(newArrayList,[list, model|list += model.systems return list])
- if (allPhysSystems.size != 1) {
+ if(allPhysSystems.size == 0) { // add a default physical system if none is present
+ allPhysSystems.add(createDefaultPhysicalSystem)
+ }
+ else if (allPhysSystems.size > 1) {
logger.logError('''TestInstanceCreator: mapping failed, found «allPhysSystems.size» physical systems''')
return null
}
@@ -135,4 +142,33 @@ class TestInstanceCreator {
def protected hasTestAnnotation(StructureClass cls) {
cls.annotations.exists[type.name == ANNOTATION_TYPE_NAME]
}
+
+ def private createDefaultPhysicalSystem() {
+ val runtimeClass = createRuntimeClass => [
+ name = "DefaultRuntimeClass"
+ threadModel = ThreadModel.MULTI_THREADED
+ ]
+ val nodeClass = createNodeClass => [
+ runtime = runtimeClass
+ priomin = 1
+ priomax = 10
+ threads += createPhysicalThread => [
+ name = "DefaultPhysicalThread"
+ ^default = true
+ execmode = ExecMode.MIXED
+ time = 100 * 1000 * 1000 // nanoseconds
+ prio = 5
+ stacksize = 1024
+ msgblocksize = 128
+ msgpoolsize = 100
+ ]
+ ]
+ createPhysicalSystem => [
+ name = "GenericPhysicalSystem"
+ nodeRefs += createNodeRef => [
+ name = "node"
+ type = nodeClass
+ ]
+ ]
+ }
}
diff --git a/releng/org.eclipse.etrice.releng/build.gradle b/releng/org.eclipse.etrice.releng/build.gradle
index 4b2a969e9..3c4b07507 100644
--- a/releng/org.eclipse.etrice.releng/build.gradle
+++ b/releng/org.eclipse.etrice.releng/build.gradle
@@ -1,3 +1,7 @@
+plugins {
+ id "org.hidetake.ssh"
+}
+
configurations {
archives
updates
diff --git a/releng/org.eclipse.etrice.site/build.gradle b/releng/org.eclipse.etrice.site/build.gradle
index 0867a1a06..4596834f8 100644
--- a/releng/org.eclipse.etrice.site/build.gradle
+++ b/releng/org.eclipse.etrice.site/build.gradle
@@ -1,3 +1,7 @@
+plugins {
+ id "com.github.dkorotych.gradle-maven-exec"
+}
+
configurations {
archive
}
diff --git a/runtime/org.eclipse.etrice.modellib.c/build.gradle b/runtime/org.eclipse.etrice.modellib.c/build.gradle
index 6b3733628..ced714fd3 100644
--- a/runtime/org.eclipse.etrice.modellib.c/build.gradle
+++ b/runtime/org.eclipse.etrice.modellib.c/build.gradle
@@ -1,35 +1,32 @@
-apply plugin: 'c'
+plugins {
+ id "c"
+ id "de.protos.etrice-c"
+ id "de.protos.source-publish"
+}
+
apply from: "$rootDir/gradle/publish.gradle"
-apply from: "$rootDir/gradle/etGenerator.gradle"
dependencies {
- modelpath_c files('model')
+ generator project(':plugins:org.eclipse.etrice.generator.c')
}
-def models = [
- 'model/etrice/api/interrupt.room',
- 'model/etrice/api/logger.room',
- 'model/etrice/api/tcp.room',
- 'model/etrice/api/testcontrol.room',
- 'model/etrice/api/timer.room',
- 'model/etrice/api/contracts/monitors.room'
-]
-
-def genDir = "$buildDir/src-gen"
-
-createGeneratorTask('generate', 'c', models, genDir, '-lib')
+modelSet {
+ room {
+ option 'msc_instr'
+ }
+}
model {
components {
etrice_modellib_c(NativeLibrarySpec) {
sources.c {
- builtBy generate
+ builtBy generateRoom
source {
- srcDirs = [genDir]
+ srcDirs = [modelSet.room.genDir]
include '**/*.c'
}
exportedHeaders {
- srcDirs = [genDir]
+ srcDirs = [modelSet.room.genDir]
}
lib project: ':runtime:org.eclipse.etrice.runtime.c', library: 'etrice_runtime_c', linkage: 'api'
}
@@ -42,13 +39,14 @@ model {
}
task syncGenDir(type: Sync, dependsOn: generate) {
- from genDir
+ from modelSet.room.genDir
into 'src-gen'
}
task zipModellib(type: Zip, dependsOn: syncGenDir) {
- archiveName = project.name + "-${version}.zip"
- destinationDir = buildDir
+ archiveBaseName = project.name
+ archiveVersion = project.version
+ destinationDirectory = layout.buildDirectory
from('model') {
exclude '**/diagrams/'
}
@@ -59,9 +57,16 @@ task zipModellib(type: Zip, dependsOn: syncGenDir) {
}
build.dependsOn zipModellib
+zipSource {
+ from(modelSet.room.genDir) {
+ into 'src'
+ }
+}
+
publishing {
publications {
etrice(MavenPublication) {
+ from components.adhoc
artifact zipModellib
}
}
diff --git a/runtime/org.eclipse.etrice.modellib.cpp/build.gradle b/runtime/org.eclipse.etrice.modellib.cpp/build.gradle
index 02172f4d3..0f7087f1f 100644
--- a/runtime/org.eclipse.etrice.modellib.cpp/build.gradle
+++ b/runtime/org.eclipse.etrice.modellib.cpp/build.gradle
@@ -1,30 +1,32 @@
-apply plugin: 'cpp'
-
-apply from: "$rootDir/gradle/etGenerator.gradle"
+plugins {
+ id "cpp"
+ id "de.protos.etrice-base"
+}
dependencies {
- modelpath_cpp files('model')
+ generator project(':plugins:org.eclipse.etrice.generator.cpp')
}
-def models = [
- 'model/etrice/api/timer.room'
-]
-
-def genDir = "$buildDir/src-gen"
-
-createGeneratorTask('generate', 'cpp', models, genDir, '-lib')
+modelSet {
+ room {
+ module = 'etrice-cpp'
+ source.srcDirs = ["model"]
+ source.exclude '**/diagrams'
+ option 'msc_instr'
+ }
+}
model {
components {
etrice_modellib_cpp(NativeLibrarySpec) {
sources.cpp {
- builtBy generate
+ builtBy generateRoom
source {
- srcDirs = [genDir]
+ srcDirs = [modelSet.room.genDir]
include '**/*.cpp'
}
exportedHeaders {
- srcDirs = [genDir]
+ srcDirs = [modelSet.room.genDir]
}
lib project: ':runtime:org.eclipse.etrice.runtime.cpp', library: 'etrice_runtime_cpp', linkage: 'api'
lib project: ':runtime:org.eclipse.etrice.runtime.c', library: 'etrice_runtime_c', linkage: 'api'
diff --git a/runtime/org.eclipse.etrice.modellib.java/build.gradle b/runtime/org.eclipse.etrice.modellib.java/build.gradle
index 9886f40f3..6ce927243 100644
--- a/runtime/org.eclipse.etrice.modellib.java/build.gradle
+++ b/runtime/org.eclipse.etrice.modellib.java/build.gradle
@@ -1,27 +1,25 @@
-apply plugin: 'java'
+plugins {
+ id "java-library"
+ id "de.protos.etrice-java"
+}
apply from: "$rootDir/gradle/publish.gradle"
-apply from: "$rootDir/gradle/etGenerator.gradle"
dependencies {
- modelpath_java files('model')
-
- compile project(':runtime:org.eclipse.etrice.runtime.java')
+ generator project(':plugins:org.eclipse.etrice.generator.java')
+ api project(':runtime:org.eclipse.etrice.runtime.java')
}
-def models = [
- 'model/etrice/api/logger.room',
- 'model/etrice/api/tcp.room',
- 'model/etrice/api/timer.room',
- 'model/etrice/api/contracts/monitors.room'
-]
-
-def genDir = "$buildDir/src-gen"
+modelSet {
+ room {
+ option 'msc_instr'
+ }
+}
sourceSets {
main {
java {
- srcDirs = [genDir]
+ srcDirs = [modelSet.room.genDir]
}
resources {
srcDirs = ['model']
@@ -30,5 +28,6 @@ sourceSets {
}
}
-createGeneratorTask('generate', 'java', models, genDir, '-lib')
-compileJava.dependsOn generate \ No newline at end of file
+compileJava.dependsOn generate
+
+components.java.addVariantsFromConfiguration(configurations.modelpathZip) {} \ No newline at end of file
diff --git a/runtime/org.eclipse.etrice.runtime.c/build.gradle b/runtime/org.eclipse.etrice.runtime.c/build.gradle
index 3b6c34b51..37ea5063c 100644
--- a/runtime/org.eclipse.etrice.runtime.c/build.gradle
+++ b/runtime/org.eclipse.etrice.runtime.c/build.gradle
@@ -1,6 +1,11 @@
import static org.apache.tools.ant.taskdefs.condition.Os.*
-apply plugin: 'c'
+plugins {
+ id "c"
+ id "de.protos.source-publish"
+}
+
+apply from: "$rootDir/gradle/publish.gradle"
def platform = ''
if(isFamily(FAMILY_WINDOWS)) { platform = 'MT_WIN_MinGW' }
@@ -24,4 +29,23 @@ model {
}
}
}
+}
+
+zipSource {
+ def srcDirs =
+ from(['src/common', 'src/config', 'src/util']) {
+ into 'src'
+ }
+ from('src/platforms') {
+ into 'platform'
+ }
+}
+
+publishing {
+ publications {
+ etrice(MavenPublication) {
+ from components.adhoc
+ }
+ }
+ repositories publishRepos
} \ No newline at end of file
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etThread.c b/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etThread.c
index fecbae4ad..8b7af981c 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etThread.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etThread.c
@@ -26,6 +26,7 @@
#include <time.h>
#include <sys/unistd.h>
#include <errno.h>
+#include <limits.h>
typedef void *(*threadFunc)(void *);
void* etThread_execute(etThread* self);
@@ -51,38 +52,99 @@ void etThread_construct(
ET_MSC_LOGGER_SYNC_EXIT
}
+/* TODO: improve this using a logger */
+static void etThread_handleError(int err, const char* msg) {
+ errno = err;
+ perror(msg);
+}
+
void etThread_start(etThread* self) {
ET_MSC_LOGGER_SYNC_ENTRY("etThread", "start")
{
struct sched_param param;
pthread_attr_t attr;
+ int ret;
+ /* set policy round robin */
const int policy = SCHED_RR;
+
+ /* adjust priority if out of range */
int minPriority = sched_get_priority_min(policy);
int maxPriority = sched_get_priority_max(policy);
-
if (self->priority<minPriority)
self->priority = minPriority;
if (self->priority>maxPriority)
self->priority = maxPriority;
+ /* adjust stacksize if too small */
+ if (self->stacksize < PTHREAD_STACK_MIN)
+ self->stacksize = PTHREAD_STACK_MIN;
+
+ /* initialize attributes */
+ ret = pthread_attr_init(&attr);
+ if (ret!=0) {
+ etThread_handleError(ret, "pthread_attr_init");
+ }
+
+ /* initialize parameters */
+ ret = pthread_attr_getschedparam(&attr, &param);
+ if (ret!=0) {
+ etThread_handleError(ret, "pthread_attr_getschedparam");
+ }
param.sched_priority = self->priority;
- pthread_attr_init(&attr);
- pthread_attr_setschedparam(&attr, &param);
- pthread_attr_setschedpolicy(&attr, policy);
- pthread_attr_setstacksize(&attr, self->stacksize);
- pthread_create(&(self->osData), &attr, (threadFunc) etThread_execute, self);
- pthread_attr_destroy(&attr);
+ ret = pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
+ if (ret!=0) {
+ etThread_handleError(ret, "pthread_attr_setinheritsched");
+ }
+ ret = pthread_attr_setschedpolicy(&attr, policy);
+ if (ret!=0) {
+ etThread_handleError(ret, "pthread_attr_setschedpolicy");
+ }
+ ret = pthread_attr_setschedparam(&attr, &param);
+ if (ret!=0) {
+ etThread_handleError(ret, "pthread_attr_setschedparam");
+ }
+ ret = pthread_attr_setstacksize(&attr, self->stacksize);
+ if (ret!=0) {
+ etThread_handleError(ret, "pthread_attr_setstacksize");
+ }
+
+ /* try to create the thread with these settings (note: setting scheduling requires higher privileges) */
+ ret = pthread_create(&(self->osData), &attr, (threadFunc) etThread_execute, self);
+ if (ret!=0) {
+ etThread_handleError(ret, "pthread_create");
+ if (ret==EPERM) {
+ printf("pthread_create failed with insufficient permissions, falling back to inherited scheduling\n");
+ ret = pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED);
+ if (ret!=0) {
+ etThread_handleError(ret, "pthread_attr_setinheritsched");
+ }
+ ret = pthread_create(&(self->osData), &attr, (threadFunc) etThread_execute, self);
+ if (ret!=0) {
+ etThread_handleError(ret, "pthread_create");
+ }
+ }
+ }
+ ret = pthread_attr_destroy(&attr);
+ if (ret!=0) {
+ etThread_handleError(ret, "pthread_attr_destroy");
+ }
}
ET_MSC_LOGGER_SYNC_EXIT
}
void* etThread_execute(etThread* self){
ET_MSC_LOGGER_SYNC_ENTRY("etThread", "execute")
+ int ret;
self->started = ET_TRUE;
+
/* set cancel state, thread must not change to PTHREAD_CANCEL_DISABLE */
- pthread_setcancelstate(PTHREAD_CANCEL_DEFERRED, NULL);
+ ret = pthread_setcancelstate(PTHREAD_CANCEL_DEFERRED, NULL);
+ if (ret!=0) {
+ etThread_handleError(ret, "pthread_setcancelstate");
+ }
+
/* etThread_execute redirects the call from the thread to the execute function in the eTrice runtime to enable correct synchronous MSC logging */
self->threadFunction(self->threadFunctionData);
ET_MSC_LOGGER_SYNC_EXIT
@@ -91,9 +153,8 @@ void* etThread_execute(etThread* self){
void etThread_destruct(etThread* self){
ET_MSC_LOGGER_SYNC_ENTRY("etThread", "destruct")
+ /* Note: thread must not be in state PTHREAD_CANCEL_DISABLE */
if (self->started) {
- self->started = ET_FALSE;
- /* Note: thread must not be in state PTHREAD_CANCEL_DISABLE */
pthread_cancel(self->osData);
pthread_join(self->osData, NULL);
}
diff --git a/runtime/org.eclipse.etrice.runtime.cpp/build.gradle b/runtime/org.eclipse.etrice.runtime.cpp/build.gradle
index f07341997..45992419f 100644
--- a/runtime/org.eclipse.etrice.runtime.cpp/build.gradle
+++ b/runtime/org.eclipse.etrice.runtime.cpp/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'cpp'
+plugins {
+ id "cpp"
+}
model {
components {
diff --git a/runtime/org.eclipse.etrice.runtime.java/build.gradle b/runtime/org.eclipse.etrice.runtime.java/build.gradle
index 3a9666e98..e8ec4e873 100644
--- a/runtime/org.eclipse.etrice.runtime.java/build.gradle
+++ b/runtime/org.eclipse.etrice.runtime.java/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'java'
+plugins {
+ id "java-library"
+}
apply from: "$rootDir/gradle/publish.gradle"
diff --git a/settings.gradle b/settings.gradle
index 807f9201e..51f8ba220 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,21 @@
+pluginManagement {
+ repositories {
+ // mavenLocal()
+ gradlePluginPortal()
+ }
+ plugins {
+ id "org.xtext.xtend" version "2.0.8"
+ id "pl.allegro.tech.build.axion-release" version "1.11.0"
+ id "com.github.dkorotych.gradle-maven-exec" version "2.2.1"
+ id "org.hidetake.ssh" version "2.10.1"
+ id "de.protos.etrice-base" version "2.0.0"
+ id "de.protos.etrice-c" version "2.0.0"
+ id "de.protos.etrice-java" version "2.0.0"
+ id "de.protos.source-publish" version "2.0.0"
+ id "de.protos.etunit-convert" version "2.0.0"
+ }
+}
+
include 'plugins:org.eclipse.etrice.core.common',
'plugins:org.eclipse.etrice.core.fsm',
'plugins:org.eclipse.etrice.core.room',
diff --git a/tests/org.eclipse.etrice.generator.c.tests/build.gradle b/tests/org.eclipse.etrice.generator.c.tests/build.gradle
index add6fc862..4da2f1fce 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.c.tests/build.gradle
@@ -2,11 +2,5 @@ apply plugin: 'c'
apply from: "$rootDir/gradle/etTest.gradle"
-dependencies {
- modelpath_c files('models')
-}
-
-def genericPhysical = '../org.eclipse.etrice.generator.common.tests/models/GenericPhysical.etphys'
-
-createTest('c', 'sendingDataTest', ['models/SendingDataTest.room', genericPhysical])
-createTest('c', 'staticConfigTest', ['models/StaticConfigTest.etmap', 'models/StaticConfigTest.room', 'models/StaticConfigTest.config']) \ No newline at end of file
+createTest('c', 'sendingDataTest')
+createTest('c', 'staticConfigTest') \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.generator.c.tests/models/SendingDataTest.room b/tests/org.eclipse.etrice.generator.c.tests/model/sendingDataTest/SendingDataTest.room
index 46df9f6c0..46df9f6c0 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/models/SendingDataTest.room
+++ b/tests/org.eclipse.etrice.generator.c.tests/model/sendingDataTest/SendingDataTest.room
diff --git a/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.config b/tests/org.eclipse.etrice.generator.c.tests/model/staticConfigTest/StaticConfigTest.config
index 8ce007ba5..8ce007ba5 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.config
+++ b/tests/org.eclipse.etrice.generator.c.tests/model/staticConfigTest/StaticConfigTest.config
diff --git a/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.etmap b/tests/org.eclipse.etrice.generator.c.tests/model/staticConfigTest/StaticConfigTest.etmap
index b20a3beca..b20a3beca 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.etmap
+++ b/tests/org.eclipse.etrice.generator.c.tests/model/staticConfigTest/StaticConfigTest.etmap
diff --git a/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.room b/tests/org.eclipse.etrice.generator.c.tests/model/staticConfigTest/StaticConfigTest.room
index fe886ae5d..fe886ae5d 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.room
+++ b/tests/org.eclipse.etrice.generator.c.tests/model/staticConfigTest/StaticConfigTest.room
diff --git a/tests/org.eclipse.etrice.generator.c.tests/modelpath b/tests/org.eclipse.etrice.generator.c.tests/modelpath
index 6b24a696f..d7cec9231 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/modelpath
+++ b/tests/org.eclipse.etrice.generator.c.tests/modelpath
@@ -1,2 +1,3 @@
-srcDir models
+srcDir model/sendingDataTest
+srcDir model/staticConfigTest
project org.eclipse.etrice.modellib.c \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.generator.common.tests/build.gradle b/tests/org.eclipse.etrice.generator.common.tests/build.gradle
index cdabcaf16..c3339fdd0 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.common.tests/build.gradle
@@ -4,66 +4,57 @@ apply plugin: 'java-base'
apply from: "$rootDir/gradle/etTest.gradle"
-dependencies {
- modelpath_c files('models')
- modelpath_cpp files('models')
- modelpath_java files('models')
- modelpath_c files('model-gen')
- modelpath_cpp files('model-gen')
- modelpath_java files('model-gen')
-}
-
-def genericPhysical = 'models/GenericPhysical.etphys'
-
def tests = [
- actorCommunicationTest: ['models/ActorCommunicationTest.room', genericPhysical],
- choicePointTest: ['models/ChoicePointTest.room', genericPhysical],
- choicePointTestExtended: ['models/ChoicePointTestExtended.room', genericPhysical],
- dataDrivenTest: ['models/DataDrivenTest.room', genericPhysical],
- /* enumTest: ['models/EnumTest.room', genericPhysical], not supported in c++ */
- compileTest: ['models/CompileTest.room', genericPhysical, 'models/StatemachineInterfaceTest.room', 'models/StatemachineInterfaceInheritedTest.room', 'models/StatemachineInterfaceTest.room', 'models/ContinuationTransitionTest.room'],
-
- handlerTest: ['models/HandlerTest.room', genericPhysical],
- operationInheritanceTest: ['models/OperationInheritanceTest.room', genericPhysical],
- pingPongThreadTest: ['models/PingPongThreadTest.etmap', 'models/PingPongThreadTest.room'],
- pingPongThreadReplPortTest: ['models/PingPongThreadReplPortTest.etmap', 'models/PingPongThreadReplPortTest.room'],
- bug541775Test: ['models/Bug541775_NoInitialTransition.room', genericPhysical],
+ 'actorCommunicationTest',
+ 'choicePointTest',
+ 'choicePointTestExtended',
+ 'dataDrivenTest',
+ /* 'enumTest', not supported in c++ */
+ 'compileTest',
+ 'handlerTest',
+ 'operationInheritanceTest',
+ 'pingPongThreadTest',
+ 'pingPongThreadReplPortTest',
+ 'noInitialTransitionTest',
]
-tests.each { name, models ->
- createTest('c', name, models)
- createTest('cpp', name, models)
- createTest('java', name, models)
+tests.each { name ->
+ createTest('c', name)
+ createTest('cpp', name)
+ createTest('java', name)
}
// Enum Test
-createTest('c', 'enumTest', ['models/EnumTest.room', genericPhysical])
-createTest('java', 'enumTest', ['models/EnumTest.room', genericPhysical])
+createTest('c', 'enumTest')
+createTest('java', 'enumTest')
// DetailExpressionCompile Test
-createTest('c', 'detailExpressionCompileTest', [genericPhysical, 'models/DetailExpressionTest.room', 'models/DetailExpressionEnum.room', 'models/DetailExpressionTypes.room'])
-createTest('java', 'detailExpressionCompileTest', [genericPhysical, 'models/DetailExpressionTest.room', 'models/DetailExpressionEnum.room', 'models/DetailExpressionTypes.room'])
+createTest('c', 'detailExpressionTest')
+createTest('java', 'detailExpressionTest')
// VarargsTest
-createTest('c', 'varargsTest', [genericPhysical, 'models/VarargsTest.room'])
-createTest('java', 'varargsTest', [genericPhysical, 'models/VarargsTest.room'])
+createTest('c', 'varargsTest')
+createTest('java', 'varargsTest')
// SubSystemUserCodeTest
-createTest('c', 'subSystemUserCodeTest', ['models/SubSystemUserCodeTest.room', genericPhysical])
+createTest('c', 'subSystemUserCodeTest')
// Contract Monitor Generation
-createTest('c', 'contractMonitorTest', ['models/ContractMonitorTest.room', 'models/ContractMonitor.room', 'model-gen/ContractMonitor_monitors.room', genericPhysical])
-createTest('java', 'contractMonitorTest', ['models/ContractMonitorTest.room', 'models/ContractMonitor.room', 'model-gen/ContractMonitor_monitors.room', genericPhysical])
+createTest('c', 'contractMonitorTest')
+createTest('java', 'contractMonitorTest')
-[generateContractMonitorTestC, generateContractMonitorTestJava].forEach{ genTask ->
- def monitorGen = genTask.name + 'Monitor'
- tasks.register(monitorGen, JavaExec) {
- main = 'org.eclipse.etrice.generator.contractmonitor.Main'
- classpath = genTask.classpath
- args '-modelpath', genTask.modelpath.asPath
- args '-genDir', file('model-gen')
- args file('models/ContractMonitor.room')
- }
- genTask.dependsOn monitorGen
+dependencies {
+ generator project(':plugins:org.eclipse.etrice.generator.contractmonitor')
}
+modelSet {
+ contractMonitor {
+ module = 'etrice-contractmonitor'
+ source.srcDirs = ['model/contractMonitorTest']
+ source.include '**/*.room'
+ modelpath.from configurations.modelpath_c
+ genDir = layout.projectDirectory.dir('model-gen')
+ }
+ contractMonitorTestC.source.srcDir(contractMonitor.genDir)
+ contractMonitorTestJava.source.srcDir(contractMonitor.genDir)
+}
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/GenericPhysical.etphys b/tests/org.eclipse.etrice.generator.common.tests/model/GenericPhysical.etphys
index 27d2d5674..27d2d5674 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/GenericPhysical.etphys
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/GenericPhysical.etphys
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room b/tests/org.eclipse.etrice.generator.common.tests/model/actorCommunicationTest/ActorCommunicationTest.room
index ce652356a..ce652356a 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/actorCommunicationTest/ActorCommunicationTest.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room b/tests/org.eclipse.etrice.generator.common.tests/model/choicePointTest/ChoicePointTest.room
index 9f92417e7..9f92417e7 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/choicePointTest/ChoicePointTest.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTestExtended.room b/tests/org.eclipse.etrice.generator.common.tests/model/choicePointTestExtended/ChoicePointTestExtended.room
index 8e1e7aaf1..8e1e7aaf1 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTestExtended.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/choicePointTestExtended/ChoicePointTestExtended.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/CompileTest.room b/tests/org.eclipse.etrice.generator.common.tests/model/compileTest/CompileTest.room
index 560ca4663..560ca4663 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/CompileTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/compileTest/CompileTest.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ContinuationTransitionTest.room b/tests/org.eclipse.etrice.generator.common.tests/model/compileTest/ContinuationTransitionTest.room
index f96afca9c..f96afca9c 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ContinuationTransitionTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/compileTest/ContinuationTransitionTest.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/StatemachineInterfaceInheritedTest.room b/tests/org.eclipse.etrice.generator.common.tests/model/compileTest/StatemachineInterfaceInheritedTest.room
index e5fbbefb3..e5fbbefb3 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/StatemachineInterfaceInheritedTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/compileTest/StatemachineInterfaceInheritedTest.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/StatemachineInterfaceTest.room b/tests/org.eclipse.etrice.generator.common.tests/model/compileTest/StatemachineInterfaceTest.room
index d5fe952c5..d5fe952c5 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/StatemachineInterfaceTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/compileTest/StatemachineInterfaceTest.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ContractMonitor.room b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/ContractMonitor.room
index 6a84ac665..6a84ac665 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ContractMonitor.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/ContractMonitor.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ContractMonitorTest.room b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/ContractMonitorTest.room
index 0b46da9f9..0b46da9f9 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ContractMonitorTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/ContractMonitorTest.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitor.LoginProtocolContract.behavior b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitor.LoginProtocolContract.behavior
index a3d3d43ad..193bd1fd5 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitor.LoginProtocolContract.behavior
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitor.LoginProtocolContract.behavior
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="room.behavior" name="Behavior of LoginProtocolContract" pictogramLinks="//@link //@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.3/@link //@children.0/@children.4/@link //@children.0/@children.5/@link //@connections.0/@link //@connections.1/@link //@connections.2/@link //@connections.3/@link //@connections.4/@link //@connections.5/@link //@connections.6/@link //@connections.7/@link" verticalGridUnit="10" version="0.16.0">
+<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="room.behavior" name="Behavior of LoginProtocolContract" pictogramLinks="//@link //@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.3/@link //@children.0/@children.4/@link //@children.0/@children.5/@link //@connections.0/@link //@connections.1/@link //@connections.2/@link //@connections.3/@link //@connections.4/@link //@connections.5/@link //@connections.6/@link //@connections.7/@link" verticalGridUnit="10" version="0.14.0">
<graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
<link>
<businessObjects href="../ContractMonitor.room#ActorClass:LoginProtocolContract"/>
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitor.LoginProtocolContract.structure b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitor.LoginProtocolContract.structure
index 2a5447413..2a5447413 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitor.LoginProtocolContract.structure
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitor.LoginProtocolContract.structure
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ABadClient.behavior b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ABadClient.behavior
index c20cd6a68..c20cd6a68 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ABadClient.behavior
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ABadClient.behavior
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ABadClient.structure b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ABadClient.structure
index 0c98bd732..0c98bd732 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ABadClient.structure
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ABadClient.structure
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ABadClient2.behavior b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ABadClient2.behavior
index 567e3f1e5..567e3f1e5 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ABadClient2.behavior
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ABadClient2.behavior
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ABadClientTestContainer.structure b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ABadClientTestContainer.structure
index 650af6c15..b34a52644 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ABadClientTestContainer.structure
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ABadClientTestContainer.structure
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="room.structure" name="Structure of ABadClientTestContainer" pictogramLinks="//@link //@children.0/@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.0/@children.2/@link //@children.0/@children.0/@children.3/@link //@children.0/@children.0/@children.4/@link //@children.0/@children.1/@children.2/@link //@children.0/@children.2/@children.2/@link //@children.0/@children.2/@children.3/@link //@children.0/@children.3/@link //@children.0/@children.4/@link //@connections.0/@link //@connections.1/@link //@connections.2/@link //@connections.3/@link" verticalGridUnit="10" version="0.16.0">
+<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="room.structure" name="Structure of ABadClientTestContainer" pictogramLinks="//@link //@children.0/@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.0/@children.2/@link //@children.0/@children.0/@children.3/@link //@children.0/@children.0/@children.4/@link //@children.0/@children.1/@children.2/@link //@children.0/@children.2/@children.2/@link //@children.0/@children.2/@children.3/@link //@children.0/@children.3/@link //@children.0/@children.4/@link //@connections.0/@link //@connections.1/@link //@connections.2/@link //@connections.3/@link" verticalGridUnit="10" version="0.14.0">
<graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
<link>
<businessObjects href="../ContractMonitorTest.room#ActorClass:ABadClientTestContainer"/>
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AProvider.behavior b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AProvider.behavior
index e6efc5cc6..e6efc5cc6 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AProvider.behavior
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AProvider.behavior
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AProvider.structure b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AProvider.structure
index 87e51bd24..87e51bd24 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AProvider.structure
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AProvider.structure
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AValidClient.behavior b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AValidClient.behavior
index 31cbaeeee..31cbaeeee 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AValidClient.behavior
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AValidClient.behavior
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AValidClient.structure b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AValidClient.structure
index 37707a27e..37707a27e 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AValidClient.structure
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AValidClient.structure
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AValidClientTestContainer.structure b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AValidClientTestContainer.structure
index 8c996d05c..8c996d05c 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AValidClientTestContainer.structure
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AValidClientTestContainer.structure
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Appl.behavior b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Appl.behavior
index bca480b11..bca480b11 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Appl.behavior
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Appl.behavior
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Appl.structure b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Appl.structure
index b28563ac7..b28563ac7 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Appl.structure
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Appl.structure
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AxisController.structure b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AxisController.structure
index 0a07f5b26..0a07f5b26 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.AxisController.structure
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.AxisController.structure
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Client.behavior b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Client.behavior
index cf4ae7bde..cf4ae7bde 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Client.behavior
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Client.behavior
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Client.structure b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Client.structure
index 9055fadec..9055fadec 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Client.structure
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Client.structure
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ContractMonitor_Top.structure b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ContractMonitor_Top.structure
index ace42c3d0..ace42c3d0 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ContractMonitor_Top.structure
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ContractMonitor_Top.structure
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Controller_ex1.structure b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Controller_ex1.structure
index 80f590f85..80f590f85 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Controller_ex1.structure
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Controller_ex1.structure
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Provider.structure b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Provider.structure
index 9af28e846..9af28e846 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.Provider.structure
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.Provider.structure
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ValidClient.behavior b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ValidClient.behavior
index d4287b514..d4287b514 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ValidClient.behavior
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ValidClient.behavior
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ValidClient.structure b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ValidClient.structure
index ba30f7525..ba30f7525 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/diagrams/ContractMonitorTest.ValidClient.structure
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/contractMonitorTest/diagrams/ContractMonitorTest.ValidClient.structure
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/DataDrivenTest.room b/tests/org.eclipse.etrice.generator.common.tests/model/dataDrivenTest/DataDrivenTest.room
index b5889c9f2..b5889c9f2 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/DataDrivenTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/dataDrivenTest/DataDrivenTest.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionEnum.room b/tests/org.eclipse.etrice.generator.common.tests/model/detailExpressionTest/DetailExpressionEnum.room
index e44b02939..e44b02939 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionEnum.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/detailExpressionTest/DetailExpressionEnum.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room b/tests/org.eclipse.etrice.generator.common.tests/model/detailExpressionTest/DetailExpressionTest.room
index ed01c9bd8..cb50e11d9 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/detailExpressionTest/DetailExpressionTest.room
@@ -14,7 +14,7 @@ RoomModel DetailExpressionTest {
Attribute caseId : int32
}
Behavior {
- ctor '''caseId = etUnit_openAll("log", "DetailExpressionCompileTest", "org.eclipse.etrice.generator.common.tests.DetailExpressionCompileTest", "DetailExpressionCompileTest_case");'''
+ ctor '''caseId = etUnit_openAll("log", "DetailExpressionTest", "org.eclipse.etrice.generator.common.tests.DetailExpressionTest", "DetailExpressionTest_case");'''
dtor '''etUnit_closeAll(caseId);'''
StateMachine {
Transition init: initial -> finish
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTypes.room b/tests/org.eclipse.etrice.generator.common.tests/model/detailExpressionTest/DetailExpressionTypes.room
index 308ad3ac8..308ad3ac8 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTypes.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/detailExpressionTest/DetailExpressionTypes.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/EnumTest.room b/tests/org.eclipse.etrice.generator.common.tests/model/enumTest/EnumTest.room
index e82f763ce..e82f763ce 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/EnumTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/enumTest/EnumTest.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room b/tests/org.eclipse.etrice.generator.common.tests/model/handlerTest/HandlerTest.room
index 7bf88bd26..7bf88bd26 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/handlerTest/HandlerTest.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/Bug541775_NoInitialTransition.room b/tests/org.eclipse.etrice.generator.common.tests/model/noInitialTransitionTest/Bug541775_NoInitialTransition.room
index 630944b2f..547e0dfb5 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/Bug541775_NoInitialTransition.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/noInitialTransitionTest/Bug541775_NoInitialTransition.room
@@ -33,7 +33,7 @@ RoomModel Bug541775_NoInitialTransition {
}
Behavior {
ctor '''
- caseId = etUnit_openAll("log", "Bug541775Test", "org.eclipse.etrice.generator.common.tests.Bug541775", "Bug541775_case");
+ caseId = etUnit_openAll("log", "noInitialTransitionTest", "org.eclipse.etrice.generator.common.tests.NoInitialTransitionTest", "NoInitialTransition_case");
'''
dtor '''
etUnit_closeAll(caseId);
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/OperationInheritanceTest.room b/tests/org.eclipse.etrice.generator.common.tests/model/operationInheritanceTest/OperationInheritanceTest.room
index 43af16a0d..43af16a0d 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/OperationInheritanceTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/operationInheritanceTest/OperationInheritanceTest.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadReplPortTest/PingPongThreadReplPort.etphys b/tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadReplPortTest/PingPongThreadReplPort.etphys
new file mode 100644
index 000000000..c6df34eac
--- /dev/null
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadReplPortTest/PingPongThreadReplPort.etphys
@@ -0,0 +1,57 @@
+PhysicalModel PingPongThreadReplPort {
+
+ PhysicalSystem Sys {
+ NodeRef node1: PC
+ }
+
+ NodeClass PC {
+ runtime = PC
+ priomin = 1
+ priomax = 5
+
+ DefaultThread DfltThread {
+ execmode = blocked
+ prio = 5
+ stacksize = 1024
+ msgblocksize = 128
+ msgpoolsize = 32
+ }
+
+ Thread Thread1 {
+ execmode = blocked
+ prio = 5
+ stacksize = 1024
+ msgblocksize = 128
+ msgpoolsize = 32
+ }
+
+ Thread Thread2 {
+ execmode = blocked
+ prio = 5
+ stacksize = 1024
+ msgblocksize = 128
+ msgpoolsize = 32
+ }
+
+ Thread Thread3 {
+ execmode = blocked
+ prio = 5
+ stacksize = 1024
+ msgblocksize = 128
+ msgpoolsize = 32
+ }
+
+ Thread MixedThread {
+ execmode = mixed
+ interval = 100 ms
+ prio = 5
+ stacksize = 1024
+ msgblocksize = 128
+ msgpoolsize = 32
+ }
+ }
+
+ RuntimeClass PC {
+ model = multiThreaded
+ }
+} \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.etmap b/tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadReplPortTest/PingPongThreadReplPortTest.etmap
index daebe5ab8..11428da51 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.etmap
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadReplPortTest/PingPongThreadReplPortTest.etmap
@@ -1,7 +1,7 @@
MappingModel PingPongThreadReplPortTest {
import PingPongThreadReplPortTest.System_PingPongReplPort
- import PingPongThread.Sys
+ import PingPongThreadReplPort.Sys
Mapping System_PingPongReplPort -> Sys {
SubSystemMapping main -> node1 {
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.room b/tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadReplPortTest/PingPongThreadReplPortTest.room
index 669e232be..669e232be 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadReplPortTest/PingPongThreadReplPortTest.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThread.etphys b/tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadTest/PingPongThread.etphys
index 1215b84c6..1215b84c6 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThread.etphys
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadTest/PingPongThread.etphys
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.etmap b/tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadTest/PingPongThreadTest.etmap
index b3798b5e5..b3798b5e5 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.etmap
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadTest/PingPongThreadTest.etmap
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.room b/tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadTest/PingPongThreadTest.room
index 343b9275b..343b9275b 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/pingPongThreadTest/PingPongThreadTest.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/SubSystemUserCodeTest.room b/tests/org.eclipse.etrice.generator.common.tests/model/subSystemUserCodeTest/SubSystemUserCodeTest.room
index ddf1dc258..ddf1dc258 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/SubSystemUserCodeTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/subSystemUserCodeTest/SubSystemUserCodeTest.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/VarargsTest.room b/tests/org.eclipse.etrice.generator.common.tests/model/varargsTest/VarargsTest.room
index e65593f12..e65593f12 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/VarargsTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model/varargsTest/VarargsTest.room
diff --git a/tests/org.eclipse.etrice.generator.common.tests/modelpath b/tests/org.eclipse.etrice.generator.common.tests/modelpath
index 9acb3a0e6..96a301fba 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/modelpath
+++ b/tests/org.eclipse.etrice.generator.common.tests/modelpath
@@ -1,3 +1,17 @@
-srcDir models
+srcDir model/actorCommunicationTest
+srcDir model/choicePointTest
+srcDir model/compileTest
+srcDir model/contractMonitorTest
+srcDir model/dataDrivenTest
+srcDir model/detailExpressionTest
+srcDir model/enumTest
+srcDir model/handlerTest
+srcDir model/noInitialTransitionTest
+srcDir model/operationInheritanceTest
+srcDir model/pingPongThreadReplPortTest
+srcDir model/pingPongThreadTest
+srcDir model/subSystemUserCodeTest
+srcDir model/varargsTest
srcDir model-gen
+
project org.eclipse.etrice.modellib.c \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle b/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle
index 86ab5dbcc..e11f1042b 100644
--- a/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle
@@ -2,11 +2,5 @@ apply plugin: 'cpp'
apply from: "$rootDir/gradle/etTest.gradle"
-dependencies {
- modelpath_cpp files('models')
-}
-
-def genericPhysical = '../org.eclipse.etrice.generator.common.tests/models/GenericPhysical.etphys'
-
-createTest('cpp', 'sendingDataTest', ['models/SendingDataTest.room', genericPhysical])
-createTest('cpp', 'initializationTest', ['models/InitializationTest.room', genericPhysical]) \ No newline at end of file
+createTest('cpp', 'sendingDataTest')
+createTest('cpp', 'initializationTest') \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/models/InitializationTest.room b/tests/org.eclipse.etrice.generator.cpp.tests/model/initializationTest/InitializationTest.room
index bf5912119..bf5912119 100644
--- a/tests/org.eclipse.etrice.generator.cpp.tests/models/InitializationTest.room
+++ b/tests/org.eclipse.etrice.generator.cpp.tests/model/initializationTest/InitializationTest.room
diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/models/SendingDataTest.room b/tests/org.eclipse.etrice.generator.cpp.tests/model/sendingDataTest/SendingDataTest.room
index a753f7e22..a753f7e22 100644
--- a/tests/org.eclipse.etrice.generator.cpp.tests/models/SendingDataTest.room
+++ b/tests/org.eclipse.etrice.generator.cpp.tests/model/sendingDataTest/SendingDataTest.room
diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/modelpath b/tests/org.eclipse.etrice.generator.cpp.tests/modelpath
index 2d9129768..6a7a4528c 100644
--- a/tests/org.eclipse.etrice.generator.cpp.tests/modelpath
+++ b/tests/org.eclipse.etrice.generator.cpp.tests/modelpath
@@ -1,2 +1,3 @@
-srcDir models
+srcDir model/initializationTest
+srcDir model/sendingDataTest
project org.eclipse.etrice.modellib.cpp \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.generator.java.tests/build.gradle b/tests/org.eclipse.etrice.generator.java.tests/build.gradle
index 43292b186..314ee02c1 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.java.tests/build.gradle
@@ -2,35 +2,23 @@ apply plugin: 'java-base'
apply from: "$rootDir/gradle/etTest.gradle"
-dependencies {
- modelpath_java files('models')
-}
-
-def genericPhysical = '../org.eclipse.etrice.generator.common.tests/models/GenericPhysical.etphys'
-
-createTest('java', 'sendingDataTest', ['models/SendingDataTest.room', genericPhysical])
-createTest('java', 'staticConfigTest', ['models/StaticConfigTest.etmap', 'models/StaticConfigTest.room', 'models/StaticConfigTest.config'])
+createTest('java', 'sendingDataTest')
+createTest('java', 'staticConfigTest')
sourceSets.staticConfigTestJava.java.srcDir 'src/staticConfigTest'
-createTest('java', 'dynamicActorTest1', ['models/DynamicActorTest1.etmap', 'models/DynamicActorTest1.room'])
-createTest('java', 'dynamicActorTest2', ['models/DynamicActorTest2.etmap', 'models/DynamicActorTest2.room'])
-createTest('java', 'dynamicActorTest3', ['models/DynamicActorTest3.room', genericPhysical])
-createTest('java', 'dynamicActorTest4', ['models/DynamicActorTest4.room', genericPhysical])
-createTest('java', 'dynamicActorTest5', ['models/DynamicActorTest5.room', genericPhysical])
-createTest('java', 'dynamicActorTest6', ['models/DynamicActorTest6.room', genericPhysical])
+createTest('java', 'dynamicActorTest1')
+createTest('java', 'dynamicActorTest2')
+createTest('java', 'dynamicActorTest3')
+createTest('java', 'dynamicActorTest4')
+createTest('java', 'dynamicActorTest5')
+createTest('java', 'dynamicActorTest6')
-createTest('java', 'tCPTest', ['models/TCPTest.room', genericPhysical])
+createTest('java', 'tcpTest')
-def genOptions = ['-persistable', '-storeDataObj']
-createTest('java', 'dynamicActorTest7', ['models/DynamicActorTest7.etmap', 'models/DynamicActorTest7.room'], genOptions)
+def genOptions = ['persistable', 'storeDataObj']
+createTest('java', 'dynamicActorTest7', genOptions)
sourceSets.dynamicActorTest7Java.java.srcDir 'src/dynamicActorTest7'
-createTest('java', 'dynamicConfigTest', ['models/DynamicConfigTest.etmap', 'models/DynamicConfigTest.room', 'models/DynamicConfigTest.config'], genOptions)
+createTest('java', 'dynamicConfigTest', genOptions)
sourceSets.dynamicConfigTestJava.java.srcDir 'src/dynamicConfigTest'
-createTest('java', 'storeRestoreTest', ['models/StoreRestoreTest.room', genericPhysical], genOptions)
-sourceSets.storeRestoreTestJava.java.srcDir 'src/storeRestoreTest'
-
-task copyRTConfig(type: Copy) {
- from 'models/DynamicConfigTest.rt-config'
- into 'log/dynamicConfigTestJava'
-}
-runDynamicConfigTestJava.dependsOn copyRTConfig \ No newline at end of file
+createTest('java', 'storeRestoreTest', genOptions)
+sourceSets.storeRestoreTestJava.java.srcDir 'src/storeRestoreTest' \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.etmap b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest1/DynamicActorTest1.etmap
index 6e1772412..6e1772412 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.etmap
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest1/DynamicActorTest1.etmap
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.room b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest1/DynamicActorTest1.room
index d9343b18c..d9343b18c 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest1/DynamicActorTest1.room
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.etmap b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest2/DynamicActorTest2.etmap
index ae1a627e6..ae1a627e6 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.etmap
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest2/DynamicActorTest2.etmap
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.room b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest2/DynamicActorTest2.room
index aa6aad1bf..aa6aad1bf 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest2/DynamicActorTest2.room
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest3.room b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest3/DynamicActorTest3.room
index 9c36bcb75..9c36bcb75 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest3.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest3/DynamicActorTest3.room
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest4.room b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest4/DynamicActorTest4.room
index 1314a0cfb..1314a0cfb 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest4.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest4/DynamicActorTest4.room
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest5.room b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest5/DynamicActorTest5.room
index c2558a7b4..c2558a7b4 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest5.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest5/DynamicActorTest5.room
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest6.room b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest6/DynamicActorTest6.room
index fe95b068f..fe95b068f 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest6.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest6/DynamicActorTest6.room
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.etmap b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest7/DynamicActorTest7.etmap
index e53423a3a..e53423a3a 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.etmap
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest7/DynamicActorTest7.etmap
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.room b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest7/DynamicActorTest7.room
index 731adfb7c..731adfb7c 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicActorTest7/DynamicActorTest7.room
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.config b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicConfigTest/DynamicConfigTest.config
index 4dbe9ff45..4dbe9ff45 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.config
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicConfigTest/DynamicConfigTest.config
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.etmap b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicConfigTest/DynamicConfigTest.etmap
index 95f5759ef..95f5759ef 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.etmap
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicConfigTest/DynamicConfigTest.etmap
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.room b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicConfigTest/DynamicConfigTest.room
index 8ee892757..8ee892757 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicConfigTest/DynamicConfigTest.room
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.rt-config b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicConfigTest/DynamicConfigTest.rt-config
index c27ad68cf..c27ad68cf 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.rt-config
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/dynamicConfigTest/DynamicConfigTest.rt-config
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/SendingDataTest.room b/tests/org.eclipse.etrice.generator.java.tests/model/sendingDataTest/SendingDataTest.room
index f1726d37b..f1726d37b 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/SendingDataTest.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/sendingDataTest/SendingDataTest.room
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.config b/tests/org.eclipse.etrice.generator.java.tests/model/staticConfigTest/StaticConfigTest.config
index 8ce007ba5..8ce007ba5 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.config
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/staticConfigTest/StaticConfigTest.config
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.etmap b/tests/org.eclipse.etrice.generator.java.tests/model/staticConfigTest/StaticConfigTest.etmap
index b20a3beca..b20a3beca 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.etmap
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/staticConfigTest/StaticConfigTest.etmap
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.room b/tests/org.eclipse.etrice.generator.java.tests/model/staticConfigTest/StaticConfigTest.room
index 03b26ac9a..03b26ac9a 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/staticConfigTest/StaticConfigTest.room
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room b/tests/org.eclipse.etrice.generator.java.tests/model/storeRestoreTest/StoreRestoreTest.room
index b6db66550..b6db66550 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/storeRestoreTest/StoreRestoreTest.room
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/TCPTest.room b/tests/org.eclipse.etrice.generator.java.tests/model/tcpTest/TCPTest.room
index e9529a8a1..e9529a8a1 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/TCPTest.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/model/tcpTest/TCPTest.room
diff --git a/tests/org.eclipse.etrice.generator.java.tests/modelpath b/tests/org.eclipse.etrice.generator.java.tests/modelpath
index ba607c01f..44afebdaf 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/modelpath
+++ b/tests/org.eclipse.etrice.generator.java.tests/modelpath
@@ -1,2 +1,2 @@
-srcDir models
+srcDir model
project org.eclipse.etrice.modellib.java \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/build.gradle b/tests/org.eclipse.etrice.runtime.c.tests/build.gradle
index 1c9537631..ad6c20e01 100644
--- a/tests/org.eclipse.etrice.runtime.c.tests/build.gradle
+++ b/tests/org.eclipse.etrice.runtime.c.tests/build.gradle
@@ -1,8 +1,13 @@
import static org.apache.tools.ant.taskdefs.condition.Os.*
-apply plugin: 'c'
+plugins {
+ id "c"
+ id "de.protos.etunit-convert"
+}
-apply from: "$rootDir/gradle/etUnitConverter.gradle"
+dependencies {
+ etunitConverter project(":plugins:org.eclipse.etrice.etunit.converter")
+}
model {
components {
@@ -37,7 +42,11 @@ task run(type: Exec, dependsOn: assemble, group: 'verification') {
doFirst { file("$buildDir/log").mkdirs() }
}
-createEtUnitConverterTask('convert', [etuFileRuntimeTest, etuFileEtUnitTest])
-convert.dependsOn run
+etunitConvert {
+ convert {
+ source etuFileRuntimeTest, etuFileEtUnitTest
+ dependsOn run
+ }
+}
check.dependsOn convert \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle b/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle
index cf51adaa3..f56aa5b08 100644
--- a/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle
+++ b/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle
@@ -1,8 +1,13 @@
import static org.apache.tools.ant.taskdefs.condition.Os.*
-apply plugin: 'cpp'
+plugins {
+ id "cpp"
+ id "de.protos.etunit-convert"
+}
-apply from: "$rootDir/gradle/etUnitConverter.gradle"
+dependencies {
+ etunitConverter project(":plugins:org.eclipse.etrice.etunit.converter")
+}
model {
components {
@@ -37,7 +42,11 @@ task run(type: Exec, dependsOn: assemble, group: 'verification') {
doFirst { file("$buildDir/log").mkdirs() }
}
-createEtUnitConverterTask('convert', [etuFile])
-convert.dependsOn run
+etunitConvert {
+ convert {
+ source etuFile
+ dependsOn run
+ }
+}
check.dependsOn convert \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.runtime.java.tests/build.gradle b/tests/org.eclipse.etrice.runtime.java.tests/build.gradle
index 643174f37..35dc35c0c 100644
--- a/tests/org.eclipse.etrice.runtime.java.tests/build.gradle
+++ b/tests/org.eclipse.etrice.runtime.java.tests/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'java'
+plugins {
+ id "java"
+}
dependencies {
testCompile project(':runtime:org.eclipse.etrice.runtime.java')

Back to the top