Commit 302a1ec8 authored by Georg Graßnick's avatar Georg Graßnick 🤔

Revert changes in build script

parent b36623f8
......@@ -53,22 +53,10 @@ tasks.withType(Test) {
// Copy Braille tables from submodule to working dir
task copyBrailleTables(type: Copy) {
from "$projectDir/third_party/liblouis/tables/"
into "$rootDir/src/main/resources/mapping/liblouis"
//from "$projectDir/third_party/liblouis/tables/"
//into "$rootDir/src/test/resources/mapping/liblouis"
}
// Same for integrationtests
task copyBrailleTablesIntegrationTest(type: Copy) {
from "$projectDir/third_party/liblouis/tables/"
into "$rootDir/src/integrationTest/resources/mapping/liblouis"
}
processResources.dependsOn copyBrailleTables
// Abort if files are missing
gradle.taskGraph.afterTask { copyBrailleTables ->
if(copyBrailleTables.state.noSource){
......@@ -78,9 +66,6 @@ gradle.taskGraph.afterTask { copyBrailleTables ->
// Delete tables on "clean" task
clean {
delete "$rootDir/src/main/resources/mapping/liblouis"
delete "$rootDir/src/integrationTest/resources/mapping/liblouis"
delete "$rootDir/src/test/resources/mapping/liblouis"
}
// Copy native liblouis libraries for major platforms to the resource folder
......@@ -100,8 +85,6 @@ clean {
delete "$rootDir/src/main/resources/native/liblouis"
}
//processResources.dependsOn copyBrailleTables
// Define the main class for the application
mainClassName = 'de.tudresden.inf.mci.brailleplot.App'
......@@ -124,4 +107,3 @@ checkstyleTest {
// Needed for Integrationtests
apply from: "$rootDir/integrationTest.gradle"
integrationTest.dependsOn copyBrailleTablesIntegrationTest
sourceSets {
integrationTest {
java.srcDir 'src/integrationTest'
resources.srcDir 'src/integrationTest/resources'
resources.srcDir 'src/test/resources'
compileClasspath += sourceSets.main.output + configurations.testRuntimeClasspath
runtimeClasspath += output + compileClasspath
}
}
task integrationTest(type: Test) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment