[tests] gradle build for runtime and generator tests

8 files changed, 35 insertions, 49 deletions

diff --git a/runtime/org.eclipse.etrice.modellib.c/build.gradle b/runtime/org.eclipse.etrice.modellib.c/build.gradle
index 23ad8e2b0..b881a7b8b 100644
--- a/runtime/org.eclipse.etrice.modellib.c/build.gradle
+++ b/runtime/org.eclipse.etrice.modellib.c/build.gradle
@@ -2,18 +2,15 @@ plugins {
 	id 'c'
 }
 
-def generator = ':plugins:org.eclipse.etrice.generator.c'
+apply from: etriceGenerator
 
-task generate(type: JavaExec, group: 'build', dependsOn: "$generator:classes") {
-	main = project(generator).mainClassName
-	classpath = project(generator).classpath
-	inputs.dir 'model'
-	outputs.dir 'src-gen'
-	args '-lib', '-msc_instr', '-genDir', 'src-gen',
-		'model/PInterrupt.room',
-		'model/TcpService.room',
-		'model/TimingService.room'
-}
+def models = [
+	'model/PInterrupt.room',
+	'model/TcpService.room',
+	'model/TimingService.room'
+]
+
+createGeneratorTask('generate', 'c', models, 'src-gen', '-lib')
 
 model {
 	components {
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/readme.txt b/runtime/org.eclipse.etrice.modellib.c/src-gen/readme.txt
deleted file mode 100644
index 1dc2b35ab..000000000
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory is an eTrice code generation target.
-It will be erased every time the generator is executed.
-
-DO NOT PLACE OTHER FILES HERE!
diff --git a/runtime/org.eclipse.etrice.modellib.cpp/build.gradle b/runtime/org.eclipse.etrice.modellib.cpp/build.gradle
index 3299defba..efbb01f03 100644
--- a/runtime/org.eclipse.etrice.modellib.cpp/build.gradle
+++ b/runtime/org.eclipse.etrice.modellib.cpp/build.gradle
@@ -2,16 +2,13 @@ plugins {
 	id 'cpp'
 }
 
-def generator = ':plugins:org.eclipse.etrice.generator.cpp'
+apply from: etriceGenerator
 
-task generate(type: JavaExec, group: 'build', dependsOn: "$generator:classes") {
-	main = project(generator).mainClassName
-	classpath = project(generator).classpath
-	inputs.dir 'model'
-	outputs.dir 'src-gen'
-	args '-lib', '-msc_instr', '-genDir', 'src-gen',
-		'model/TimingService.room'
-}
+def models = [
+	'model/TimingService.room'
+]
+
+createGeneratorTask('generate', 'cpp', models, 'src-gen', '-lib')
 
 model {
 	components {
@@ -25,8 +22,8 @@ model {
 				exportedHeaders {
 					srcDirs = ['src-gen']
 				}
-				lib project: ':runtime:org.eclipse.etrice.runtime.c', library: 'etrice_runtime_c', linkage: 'api'
 				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'
 			}
 			binaries {
 				withType(SharedLibraryBinarySpec) { buildable = false }
diff --git a/runtime/org.eclipse.etrice.modellib.cpp/model/GenericPhysical.etphys b/runtime/org.eclipse.etrice.modellib.cpp/model/GenericPhysical.etphys
index caec2ba71..27f442b9c 100644
--- a/runtime/org.eclipse.etrice.modellib.cpp/model/GenericPhysical.etphys
+++ b/runtime/org.eclipse.etrice.modellib.cpp/model/GenericPhysical.etphys
@@ -14,7 +14,7 @@ PhysicalModel room.generic.physical {
 			interval = 100ms
 			prio = 0
 			stacksize = 1024
-			msgblocksize = 128
+			msgblocksize = 64
 			msgpoolsize = 100
 		}
 		
@@ -22,7 +22,7 @@ PhysicalModel room.generic.physical {
 			execmode = blocked
 			prio = 0
 			stacksize = 1024
-			msgblocksize = 128
+			msgblocksize = 64
 			msgpoolsize = 100
 		}
 		
@@ -31,7 +31,7 @@ PhysicalModel room.generic.physical {
 			interval = 100ms
 			prio = 0
 			stacksize = 1024
-			msgblocksize = 128
+			msgblocksize = 64
 			msgpoolsize = 100
 		}
 	}
diff --git a/runtime/org.eclipse.etrice.modellib.cpp/src-gen/readme.txt b/runtime/org.eclipse.etrice.modellib.cpp/src-gen/readme.txt
deleted file mode 100644
index 1dc2b35ab..000000000
--- a/runtime/org.eclipse.etrice.modellib.cpp/src-gen/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory is an eTrice code generation target.
-It will be erased every time the generator is executed.
-
-DO NOT PLACE OTHER FILES HERE!
diff --git a/runtime/org.eclipse.etrice.modellib.java/build.gradle b/runtime/org.eclipse.etrice.modellib.java/build.gradle
index f27641e6f..a458f33bb 100644
--- a/runtime/org.eclipse.etrice.modellib.java/build.gradle
+++ b/runtime/org.eclipse.etrice.modellib.java/build.gradle
@@ -2,18 +2,13 @@ plugins {
 	id 'java'
 }
 
-def generator = ':plugins:org.eclipse.etrice.generator.java'
+apply from: etriceGenerator
 
-task generate(type: JavaExec, group: 'build', dependsOn: "$generator:classes") {
-	main = project(generator).mainClassName
-	classpath = project(generator).classpath
-	inputs.dir 'model'
-	outputs.dir 'src-gen'
-	args '-lib', '-msc_instr', '-genDir', 'src-gen',
-		'model/ALogService.room',
-		'model/TcpService.room',
-		'model/TimingService.room'
-}
+def models = [
+	'model/ALogService.room',
+	'model/TcpService.room',
+	'model/TimingService.room'
+]
 
 dependencies {
 	compile project(':runtime:org.eclipse.etrice.runtime.java')
@@ -27,6 +22,8 @@ sourceSets {
 	}
 }
 
+createGeneratorTask('generate', 'java', models, 'src-gen', '-lib')
+
 compileJava.dependsOn generate
 
 clean.delete 'src-gen'
\ No newline at end of file
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/readme.txt b/runtime/org.eclipse.etrice.modellib.java/src-gen/readme.txt
deleted file mode 100644
index 1dc2b35ab..000000000
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory is an eTrice code generation target.
-It will be erased every time the generator is executed.
-
-DO NOT PLACE OTHER FILES HERE!
diff --git a/runtime/org.eclipse.etrice.runtime.c/build.gradle b/runtime/org.eclipse.etrice.runtime.c/build.gradle
index ce88e15c8..56cad9f53 100644
--- a/runtime/org.eclipse.etrice.runtime.c/build.gradle
+++ b/runtime/org.eclipse.etrice.runtime.c/build.gradle
@@ -1,17 +1,24 @@
+import static org.apache.tools.ant.taskdefs.condition.Os.*
+
 plugins {
 	id 'c'
 }
 
+def platform = ''
+
+if(isFamily(FAMILY_WINDOWS)) { platform = 'MT_WIN_MinGW' }
+else if(isFamily(FAMILY_UNIX)) { platform = 'MT_POSIX_GENERIC_GCC' }
+
 model {
 	components {
 		etrice_runtime_c(NativeLibrarySpec) {
 			sources.c {
 				source {
-					srcDirs = ['src/common', 'src/config', 'src/platforms/MT_WIN_MinGW', 'src/util']
+					srcDirs = ['src/common', 'src/config', "src/platforms/$platform", 'src/util']
 					include '**/*.c'
 				}
 				exportedHeaders {
-					srcDirs = ['src/common', 'src/config', 'src/platforms/MT_WIN_MinGW', 'src/util']
+					srcDirs = ['src/common', 'src/config', "src/platforms/$platform", 'src/util']
 				}
 			}
 			binaries {