Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'runtime')
-rw-r--r--runtime/org.eclipse.etrice.modellib.c/build.gradle12
-rw-r--r--runtime/org.eclipse.etrice.modellib.cpp/build.txt6
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/build.gradle4
3 files changed, 10 insertions, 12 deletions
diff --git a/runtime/org.eclipse.etrice.modellib.c/build.gradle b/runtime/org.eclipse.etrice.modellib.c/build.gradle
index 11154ec58..6b3733628 100644
--- a/runtime/org.eclipse.etrice.modellib.c/build.gradle
+++ b/runtime/org.eclipse.etrice.modellib.c/build.gradle
@@ -47,10 +47,14 @@ task syncGenDir(type: Sync, dependsOn: generate) {
}
task zipModellib(type: Zip, dependsOn: syncGenDir) {
- archiveName = project.name + "-${version}.zip"
- destinationDir = buildDir
- from projectDir
- include 'src-gen/**', 'model/**/*.room'
+ archiveName = project.name + "-${version}.zip"
+ destinationDir = buildDir
+ from('model') {
+ exclude '**/diagrams/'
+ }
+ from(projectDir) {
+ include 'src-gen/**'
+ }
includeEmptyDirs false
}
build.dependsOn zipModellib
diff --git a/runtime/org.eclipse.etrice.modellib.cpp/build.txt b/runtime/org.eclipse.etrice.modellib.cpp/build.txt
deleted file mode 100644
index e47551f7d..000000000
--- a/runtime/org.eclipse.etrice.modellib.cpp/build.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-../../src-gen/HandlerTest/HandlerUser.cpp: In member function 'int HandlerUser::executeTransitionChain(int, const etRuntime::InterfaceItemBase*, void*)':
-../../src-gen/HandlerTest/HandlerUser.cpp:324:10: warning: unused variable 'p1' [-Wunused-variable]
-../../src-gen/HandlerTest/Tester.cpp: In member function 'virtual void Tester::receiveEvent(etRuntime::InterfaceItemBase*, int, void*)':
-../../src-gen/HandlerTest/Tester.cpp:142:6: warning: unused variable 'trigger' [-Wunused-variable]
-../../src-gen/ChoicePointTest/CPTester.cpp: In member function 'virtual void CPTester::receiveEvent(etRuntime::InterfaceItemBase*, int, void*)':
-../../src-gen/ChoicePointTest/CPTester.cpp:135:6: warning: unused variable 'trigger' [-Wunused-variable]
diff --git a/runtime/org.eclipse.etrice.modellib.java/build.gradle b/runtime/org.eclipse.etrice.modellib.java/build.gradle
index 6d447774a..9886f40f3 100644
--- a/runtime/org.eclipse.etrice.modellib.java/build.gradle
+++ b/runtime/org.eclipse.etrice.modellib.java/build.gradle
@@ -24,8 +24,8 @@ sourceSets {
srcDirs = [genDir]
}
resources {
- srcDirs = [projectDir]
- includes = ['model/*.room']
+ srcDirs = ['model']
+ excludes = ['**/diagrams/']
}
}
}

Back to the top